Date: Mon, 16 Oct 2017 17:39:07 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r452212 - branches/2017Q4/multimedia/ffmpeg/files Message-ID: <201710161739.v9GHd7uJ029250@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710161739.v9GHd7uJ029250>