Attachment #204177 for bug #237135

Lines 3-9 Link Here

(-)multimedia/ffmpeg/Makefile (-8 / +4 lines)
3		3
4	PORTNAME= ffmpeg	4	PORTNAME= ffmpeg
5	PORTVERSION= 4.1.3	5	PORTVERSION= 4.1.3
6	PORTREVISION= 4	6	PORTREVISION= 5
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= multimedia audio ipv6 net	8	CATEGORIES= multimedia audio ipv6 net
9	MASTER_SITES= https://ffmpeg.org/releases/	9	MASTER_SITES= https://ffmpeg.org/releases/
Lines 328-334 Link Here
328	OPENCL_CONFIGURE_ENABLE= opencl	328	OPENCL_CONFIGURE_ENABLE= opencl
329		329
330	# opencv	330	# opencv
331	OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core	331	# OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core
		332	OPENCV_BUILD_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_imgproc.so:graphics/opencv3-core
		333	OPENCV_RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_imgproc.so:graphics/opencv3-core
332	OPENCV_CONFIGURE_ENABLE= libopencv	334	OPENCV_CONFIGURE_ENABLE= libopencv
333		335
334	# opengl	336	# opengl
Lines 592-603 Link Here
592	CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}}	594	CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}}
593	CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}_${ARCH}}	595	CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}_${ARCH}}
594		596
595	post-patch:
596	# {C,LD}FLAGS safeness
597	@${REINPLACE_CMD} -E \
598	-e 's\|require_pkg_config opencv\|require_pkg_config opencv-core\|g' \
599	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
600
601	post-install:	597	post-install:
602	(cd ${WRKSRC} && ${COPYTREE_SHARE} \	598	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
603	"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})	599	"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})




--- 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; } }

Return to bug 237135

Line 0 Link Here

(-)multimedia/ffmpeg/files/patch-opencv3-configure (+16 lines)
	1	--- configure.orig 2019-04-19 14:19:44.624090000 +0000
	2	+++ configure 2019-04-19 14:25:19.707180000 +0000
	3	@@ -6106,10 +6106,10 @@
	4	die "ERROR: libnpp not found"; }
	5	enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
	6	enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
	7	-enabled libopencv && { check_headers opencv2/core/core_c.h &&
	8	- { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader \|\|
	9	+enabled libopencv && { check_headers opencv2/core/core_c.h -I${prefix}/include/opencv3.4 &&
	10	+ { check_pkg_config libopencv opencv3-core opencv2/core/core_c.h cvCreateImageHeader \|\|
	11	require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } \|\|
	12	- require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
	13	+ require_pkg_config libopencv opencv3-core opencv/cxcore.h cvCreateImageHeader; }
	14	enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
	15	enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version \|\|
	16	{ require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }