- rel 5; fix build with opencv 2.3

Changed files:
    gstreamer-plugins-bad-opencv.patch -> 1.3
    gstreamer-plugins-bad.spec -> 1.97

diff --git a/gstreamer-plugins-bad-opencv.patch b/gstreamer-plugins-bad-opencv.patch
new file mode 100644 (file)
index 0000000..58c343b
--- /dev/null
+++ b/gstreamer-plugins-bad-opencv.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-bad-0.10.22/configure.ac~      2012-01-28 18:34:04.000000000 +0100
++++ gst-plugins-bad-0.10.22/configure.ac       2012-01-28 18:44:04.146216129 +0100
+@@ -1279,7 +1279,7 @@
+   dnl a new version and the no-backward-compatibility define. (There doesn't
+   dnl seem to be a switch to suppress the warnings the cvcompat.h header
+   dnl causes.)
+-  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv <= 2.2.0 , [
++  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv < 2.4.0 , [
+     AC_PROG_CXX
+     AC_LANG_CPLUSPLUS
+     OLD_CPPFLAGS=$CPPFLAGS

diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index f3d8e440e0264a92649d6dfba2289f5851908f97..17e417ebeb0a048d74245684644c3a2a777785d4 100644 (file)
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -31,7 +31,7 @@ Summary:      Bad GStreamer Streaming-media framework plugins
 Summary(pl.UTF-8):     Złe wtyczki do środowiska obróbki strumieni GStreamer
 Name:          gstreamer-plugins-bad
 Version:       0.10.22
-Release:       4
+Release:       5
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.bz2
@@ -39,6 +39,7 @@ Source0:      http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{versi
 Patch0:                %{name}-bashish.patch
 Patch1:                %{name}-libdts.patch
 Patch2:                %{name}-divx4linux.patch
+Patch3:                %{name}-opencv.patch
 Patch4:                %{name}-timidity.patch
 Patch5:                %{name}-nas.patch
 Patch6:                %{name}-modplug_stereofix.patch
@@ -114,7 +115,10 @@ BuildRequires:     libx264-devel >= 0.1.2
 %{?with_mjpegtools:BuildRequires:      mjpegtools-devel >= 1.9.0}
 BuildRequires: nas-devel
 %{?with_neon:BuildRequires:    neon-devel >= 0.27.0}
-%{?with_opencv:BuildRequires:  opencv-devel >= 2.2.0}
+%if %{with opencv}
+BuildRequires: opencv-devel >= 1:2.2.0
+BuildRequires: opencv-devel < 1:2.4.0
+%endif
 BuildRequires: openssl-devel >= 0.9.5
 BuildRequires: schroedinger-devel >= 1.0.7
 BuildRequires: slv2-devel >= 0.6.6
@@ -728,6 +732,7 @@ Wtyczka do GStreamera skanująca kody kreskowe.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1