Attachment 204177 Details for Bug 237135 – ffmpeg port update regarding opencv 3.4.6 update

[patch] ffmpeg port update regarding opencv 3.4.6 update

ffmpeg-ver2.diff (text/plain), 3.36 KB, created by Hiroo Ono on 2019-05-03 00:46:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroo Ono

Created: 2019-05-03 00:46:19 UTC

Size: 3.36 KB

patch

obsolete

>Index: multimedia/ffmpeg/Makefile
>===================================================================
>--- multimedia/ffmpeg/Makefile	(revision 500577)
>+++ multimedia/ffmpeg/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ffmpeg
> PORTVERSION=	4.1.3
>-PORTREVISION=	4
>+PORTREVISION=	5
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	https://ffmpeg.org/releases/
>@@ -328,7 +328,9 @@
> OPENCL_CONFIGURE_ENABLE=	opencl
> 
> # opencv
>-OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:graphics/opencv-core
>+# OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:graphics/opencv-core
>+OPENCV_BUILD_DEPENDS=	${LOCALBASE}/lib/opencv3.4/libopencv_imgproc.so:graphics/opencv3-core
>+OPENCV_RUN_DEPENDS=	${LOCALBASE}/lib/opencv3.4/libopencv_imgproc.so:graphics/opencv3-core
> OPENCV_CONFIGURE_ENABLE=	libopencv
> 
> # opengl
>@@ -592,12 +594,6 @@
> CONFIGURE_ENV+=	${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}}
> CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}_${ARCH}}
> 
>-post-patch:
>-# {C,LD}FLAGS safeness
>-	@${REINPLACE_CMD} -E \
>-		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-
> post-install:
> 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
> 		"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
>Index: multimedia/ffmpeg/files/patch-opencv3-configure
>===================================================================
>--- multimedia/ffmpeg/files/patch-opencv3-configure	(nonexistent)
>+++ multimedia/ffmpeg/files/patch-opencv3-configure	(working copy)
>@@ -0,0 +1,16 @@
>+--- configure.orig	2019-04-19 14:19:44.624090000 +0000
>++++ configure	2019-04-19 14:25:19.707180000 +0000
>+@@ -6106,10 +6106,10 @@
>+                                die "ERROR: libnpp not found"; }
>+ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
>+ enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
>+-enabled libopencv         && { check_headers opencv2/core/core_c.h &&
>+-                               { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
>++enabled libopencv         && { check_headers opencv2/core/core_c.h -I${prefix}/include/opencv3.4 &&
>++                               { check_pkg_config libopencv opencv3-core opencv2/core/core_c.h cvCreateImageHeader ||
>+                                  require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
>+-                               require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
>++                               require_pkg_config libopencv opencv3-core opencv/cxcore.h cvCreateImageHeader; }
>+ enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
>+ enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
>+                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
>
>Property changes on: multimedia/ffmpeg/files/patch-opencv3-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 237135: 203513 | 203655 | 203694 | 203713 | 203820 | 203992 | 203993 | 204176 | 204177 | 204178 | 204201 | 204284 | 204540 | 204541 | 220712 | 220713 | 220746