svn commit: r452212 - branches/2017Q4/multimedia/ffmpeg/files
Jan Beich
jbeich at FreeBSD.org
Mon Oct 16 17:39:08 UTC 2017
Author: jbeich
Date: Mon Oct 16 17:39:06 2017
New Revision: 452212
URL: https://svnweb.freebsd.org/changeset/ports/452212
Log:
MFH: r452211
multimedia/ffmpeg: fix opencv-core autodetection in some cases
post-patch already adds -core suffix to pkg-config search
Pointy hat to: mat (r448475)
Approved by: ports-secteam blanket
Modified:
branches/2017Q4/multimedia/ffmpeg/files/patch-configure
Directory Properties:
branches/2017Q4/ (props changed)
Modified: branches/2017Q4/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- branches/2017Q4/multimedia/ffmpeg/files/patch-configure Mon Oct 16 17:35:19 2017 (r452211)
+++ branches/2017Q4/multimedia/ffmpeg/files/patch-configure Mon Oct 16 17:39:06 2017 (r452212)
@@ -22,12 +22,7 @@
cpu="generic"
intrinsics="none"
-@@ -5803,10 +5799,12 @@ enabled libopencore_amrwb && require lib
- enabled libopencv && { check_header opencv2/core/core_c.h &&
- { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
- require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
-+ require_pkg_config opencv-core-core opencv/cxcore.h cvCreateImageHeader; }
+@@ -5807,6 +5803,8 @@ enabled libopencv && { check_header opencv2/co
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
enabled libopenjpeg && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
More information about the svn-ports-all
mailing list