- added opencv patch to accept opencv 2.4.x

diff --git a/gstreamer-plugins-bad-opencv.patch b/gstreamer-plugins-bad-opencv.patch
new file mode 100644 (file)
index 0000000..ceb598d
--- /dev/null
+++ b/gstreamer-plugins-bad-opencv.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-bad-0.10.23/configure.ac.orig  2012-10-06 08:00:31.847697403 +0200
++++ gst-plugins-bad-0.10.23/configure.ac       2012-10-06 08:29:02.444328416 +0200
+@@ -1372,7 +1372,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.3.1 , [
++  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv < 2.5.0 , [
+     AC_PROG_CXX
+     AC_LANG_CPLUSPLUS
+     OLD_CPPFLAGS=$CPPFLAGS

diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index 6fa970638b64bc74586990a2b05f9df0cf7e046a..bd633cd7766e67e63996a8513172dd6d24787d19 100644 (file)
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -38,6 +38,7 @@ Source0:      http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{versi
 Patch0:                %{name}-libdts.patch
 Patch1:                %{name}-timidity.patch
 Patch2:                %{name}-nas.patch
+Patch3:                %{name}-opencv.patch
 URL:           http://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
@@ -110,7 +111,7 @@ BuildRequires:      nas-devel
 %{?with_neon:BuildRequires:    neon-devel >= 0.27.0}
 %if %{with opencv}
 BuildRequires: opencv-devel >= 1:2.2.0
-BuildRequires: opencv-devel < 1:2.4.0
+BuildRequires: opencv-devel < 1:2.5.0
 %endif
 BuildRequires: openssl-devel >= 0.9.5
 BuildRequires: opus-devel >= 0.9.4
@@ -531,7 +532,7 @@ Summary:    GStreamer OpenCV plugin
 Summary(pl.UTF-8):     Wtyczka OpenCV do GStreamera
 Group:         Libraries
 Requires:      gstreamer >= %{gst_req_ver}
-Requires:      opencv >= 2.2.0
+Requires:      opencv >= 1:2.2.0
 
 %description -n gstreamer-opencv
 GStreamer OpenCV plugin. It contains the following elements:
@@ -784,6 +785,7 @@ Wtyczka do GStreamera skanująca kody kreskowe.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}