[packages/gstreamer0.10-plugins-bad] - added directfb patch to fix __no_instrument_function__ conflict between current glib and DirectFB

[qboosh]

commit 3e05cbb9bac8960e2c27d73b7615082ac37e78f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Oct 6 09:25:19 2012 +0200

    - added directfb patch to fix __no_instrument_function__ conflict between current glib and DirectFB
    - added opencv patch to accept opencv 2.4.x

 gstreamer-plugins-bad-directfb.patch | 25 +++++++++++++++++++++++++
 gstreamer-plugins-bad-opencv.patch   | 11 +++++++++++
 gstreamer0.10-plugins-bad.spec       |  8 ++++++--
 3 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer0.10-plugins-bad.spec b/gstreamer0.10-plugins-bad.spec
index c9557f7..13a894c 100644
--- a/gstreamer0.10-plugins-bad.spec
+++ b/gstreamer0.10-plugins-bad.spec
@@ -42,6 +42,8 @@ Patch2:		gstreamer-plugins-bad-timidity.patch
 Patch3:		gstreamer-plugins-bad-nas.patch
 Patch4:		glib2_32.patch
 Patch5:		docs-voamrwbenc.patch
+Patch6:		gstreamer-plugins-bad-directfb.patch
+Patch7:		gstreamer-plugins-bad-opencv.patch
 URL:		http://gstreamer.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
@@ -116,7 +118,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
@@ -549,7 +551,7 @@ Summary:	GStreamer OpenCV plugin
 Summary(pl.UTF-8):	Wtyczka OpenCV do GStreamera
 Group:		Libraries
 Requires:	gstreamer0.10 >= %{gst_req_ver}
-Requires:	opencv >= 2.2.0
+Requires:	opencv >= 1:2.2.0
 
 %description -n gstreamer0.10-opencv
 GStreamer OpenCV plugin. It contains the following elements:
@@ -817,6 +819,8 @@ Wtyczka do GStreamera skanująca kody kreskowe.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
diff --git a/gstreamer-plugins-bad-directfb.patch b/gstreamer-plugins-bad-directfb.patch
new file mode 100644
index 0000000..3ca000a
--- /dev/null
+++ b/gstreamer-plugins-bad-directfb.patch
@@ -0,0 +1,25 @@
+--- gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c.orig	2011-12-11 19:49:11.000000000 +0100
++++ gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c	2012-10-06 07:35:52.391061571 +0200
+@@ -1,5 +1,9 @@
+ 
+ #include <directfb.h>
++/* defined by directfb.h to __attribute__((__no_instrument_function__)), glib expects it to be undefined */
++#ifdef __no_instrument_function__
++#  undef __no_instrument_function__
++#endif
+ #include <stdio.h>
+ #include <gst/gst.h>
+ 
+--- gst-plugins-bad-0.10.23/tests/examples/directfb/gstdfb.c.orig	2011-12-11 19:49:22.000000000 +0100
++++ gst-plugins-bad-0.10.23/tests/examples/directfb/gstdfb.c	2012-10-06 07:59:46.691031676 +0200
+@@ -36,6 +36,10 @@
+ #include <time.h>
+ 
+ #include <directfb.h>
++/* defined by directfb.h to __attribute__((__no_instrument_function__)), glib expects it to be undefined */
++#ifdef __no_instrument_function__
++#  undef __no_instrument_function__
++#endif
+ #include <gst/gst.h>
+ #include <string.h>
+ 
diff --git a/gstreamer-plugins-bad-opencv.patch b/gstreamer-plugins-bad-opencv.patch
new file mode 100644
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10-plugins-bad.git/commitdiff/3e05cbb9bac8960e2c27d73b7615082ac37e78f2