packages: gstreamer-plugins-bad/gstreamer-plugins-bad.spec, gstreamer-plugi...

[arekm]

Author: arekm                        Date: Sat Jan 28 18:03:13 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; fix build with opencv 2.3

---- Files affected:
packages/gstreamer-plugins-bad:
   gstreamer-plugins-bad.spec (1.96 -> 1.97) , gstreamer-plugins-bad-opencv.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
diff -u packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.96 packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.97
--- packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.96	Sat Jan 14 09:47:44 2012
+++ packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec	Sat Jan 28 19:03:07 2012
@@ -32,7 +32,7 @@
 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
@@ -40,6 +40,7 @@
 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
@@ -115,7 +116,10 @@
 %{?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
@@ -729,6 +733,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -1134,6 +1139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2012/01/28 18:03:07  arekm
+- rel 5; fix build with opencv 2.3
+
 Revision 1.96  2012/01/14 08:47:44  arekm
 - release 4
 

================================================================
Index: packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch
diff -u /dev/null packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch:1.3
--- /dev/null	Sat Jan 28 19:03:13 2012
+++ packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch	Sat Jan 28 19:03:07 2012
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec?r1=1.96&r2=1.97&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch?r1=1.2&r2=1.3&f=u