[ffmpeg/f24] fix patch

Leigh Scott leigh123linux at rpmfusion.org
Sat Oct 22 11:37:29 CEST 2016


commit becfd5e0a02ee3f6a0030a4b0c3eb854c6003968
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 22 10:37:22 2016 +0100

    fix patch

 0001-configure-add-direct-detection-of-libopencv.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/0001-configure-add-direct-detection-of-libopencv.patch b/0001-configure-add-direct-detection-of-libopencv.patch
index 237b0a3..bc09049 100644
--- a/0001-configure-add-direct-detection-of-libopencv.patch
+++ b/0001-configure-add-direct-detection-of-libopencv.patch
@@ -24,7 +24,7 @@ diff --git a/configure b/configure
 index f4b821a..f28aa8f 100755
 --- a/configure
 +++ b/configure
-@@ -5566,7 +5566,8 @@ enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
+@@ -5482,7 +5482,8 @@ enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
  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_header opencv2/core/core_c.h &&
@@ -33,7 +33,7 @@ index f4b821a..f28aa8f 100755
 +                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                 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 ||
+ enabled libopenjpeg       && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 -- 
 2.7.4
 


More information about the rpmfusion-commits mailing list