- fix building with opencv 2.4

diff --git a/ffmpeg-opencv24.patch b/ffmpeg-opencv24.patch
new file mode 100644 (file)
index 0000000..a510f24
--- /dev/null
+++ b/ffmpeg-opencv24.patch
@@ -0,0 +1,11 @@
+--- configure.orig     2012-07-09 07:30:07.231478952 +0200
++++ configure  2012-07-09 08:46:38.701177339 +0200
+@@ -3222,7 +3222,7 @@
+ 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  && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
++enabled libopencv  && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect -lgcrypt
+ enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
+ enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
+ enabled librtmp    && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 918c2ab5b0d1848aa95fb7791d5bd0271cffdb6c..43285440851866b6c946948352baa6b2a6405db9 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -23,7 +23,7 @@ Summary:      FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
 Version:       0.11.1
-Release:       2
+Release:       3
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
@@ -35,6 +35,7 @@ Source1:      ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-gsm.patch
+Patch1:                %{name}-opencv24.patch
 URL:           http://www.ffmpeg.org/
 %{?with_openal:BuildRequires:  OpenAL-devel}
 BuildRequires: SDL-devel >= 1.2.1
@@ -248,6 +249,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -312,9 +314,9 @@ EOF
        --libdir=%{_libdir} \
        --shlibdir=%{_libdir} \
        --mandir=%{_mandir} \
-       --cc="%{__cc}" \
        --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}" \
        --extra-ldflags="%{rpmcflags} %{rpmldflags}" \
+       --cc="%{__cc}" \
        --disable-debug \
        --disable-optimizations \
        --disable-stripping \