diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-04-05 13:35:58 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-04-05 13:35:58 -0700 |
| commit | 97b7134f41b48963345ef3d6bdf950c8d569d43d (patch) | |
| tree | ce2538582a8c15a6cfb568209e8577fe3f61af52 /ports/ffmpeg/configure_opencv.patch | |
| parent | bdf903a991c3f187e59d6ee8056dc1600f060f3b (diff) | |
| parent | a141b603b93cce21f67733e649fbd076ade74393 (diff) | |
| download | vcpkg-97b7134f41b48963345ef3d6bdf950c8d569d43d.tar.gz vcpkg-97b7134f41b48963345ef3d6bdf950c8d569d43d.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5702
Diffstat (limited to 'ports/ffmpeg/configure_opencv.patch')
| -rw-r--r-- | ports/ffmpeg/configure_opencv.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ports/ffmpeg/configure_opencv.patch b/ports/ffmpeg/configure_opencv.patch index 66678661e..ac5c82797 100644 --- a/ports/ffmpeg/configure_opencv.patch +++ b/ports/ffmpeg/configure_opencv.patch @@ -1,11 +1,11 @@ --- a/configure
+++ b/configure
-@@ -5804,7 +5804,7 @@
+@@ -6110,7 +6110,7 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
- 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; } ||
+ enabled libopencv && { check_headers opencv2/core/core_c.h &&
+ { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
+- require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+ require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core341 -lopencv_imgproc341; } ||
- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- 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; } ||
+ require_pkg_config libopencv opencv 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 ||
|