svn commit: r452211 - head/multimedia/ffmpeg/files

[Jan Beich]

Author: jbeich
Date: Mon Oct 16 17:35:19 2017
New Revision: 452211
URL: https://svnweb.freebsd.org/changeset/ports/452211

Log:
  multimedia/ffmpeg: fix opencv-core autodetection in some cases
  
  post-patch already adds -core suffix to pkg-config search
  
  Pointy hat to:	mat (r448475)

Modified:
  head/multimedia/ffmpeg/files/patch-configure   (contents, props changed)

Modified: head/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- head/multimedia/ffmpeg/files/patch-configure	Mon Oct 16 17:03:46 2017	(r452210)
+++ head/multimedia/ffmpeg/files/patch-configure	Mon Oct 16 17:35:19 2017	(r452211)
@@ -23,12 +23,7 @@
  cpu="generic"
  intrinsics="none"
  
-@@ -5803,10 +5800,14 @@ 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 +5804,10 @@ 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 ||