Accepting request 19091 from multimedia:apps

Copy from multimedia:apps/schroedinger based on submit request 19091 from user mseben

OBS-URL: https://build.opensuse.org/request/show/19091
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/schroedinger?expand=0&rev=6

schroedinger-gstreamer-conflict.patch

@@ -0,0 +1,44 @@
+--- schroedinger-1.0.7/gst/gstschrodec.c
++++ schroedinger-1.0.7/gst/gstschrodec.c
+@@ -547,7 +547,7 @@
+ 
+   n_available -= 3;
+ 
+-  return gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
++  return schro_gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
+       offset, MIN (n, n_available - 3));
+ }
+ 
+--- schroedinger-1.0.7/gst/gstschroparse.c
++++ schroedinger-1.0.7/gst/gstschroparse.c
+@@ -305,7 +305,7 @@
+ 
+   n_available -= 3;
+ 
+-  return gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
++  return schro_gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
+       offset, MIN (n, n_available - 3));
+ }
+ 
+--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c
++++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c
+@@ -231,7 +231,7 @@
+ 
+ 
+ int
+-gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
++schro_gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
+     guint32 pattern, guint32 mask, int offset, int n)
+ {
+   GSList *g;
+--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h
++++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h
+@@ -84,7 +84,7 @@
+ GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
+     int frame_number);
+ 
+-int gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
++int schro_gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
+     guint32 pattern, guint32 mask, int offset, int n);
+ GstBuffer *gst_adapter_get_buffer (GstAdapter *adapter);
+

schroedinger.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 27 16:29:11 UTC 2009 - mseben@novell.com
+
+- added gstreamer-conflict.patch to fix build :rename function, 
+  which conflicts with gstreamer
+
 -------------------------------------------------------------------
 Tue Jul 21 21:46:09 CEST 2009 - dominique-obs@leuenberger.net
 

schroedinger.spec

@@ -26,12 +26,14 @@ Url:            http://schrodinger.sourceforge.net/
 Group:          Productivity/Multimedia/Other
 License:        GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar)
 Version:        1.0.7
-Release:        2
+Release:        3
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM schroedinger-am111.patch taken from git, 154148 -- Do not install headers twice
 Patch0:         schroedinger-am111.patch
 # PATCH-FIX-UPSTREAM schroedinger-strict-aliasing.patch 7831a506bc6714b3db40e31584e61ccaa71d78d9 sbrabec@suse.cz -- Fix strict aliasing.
 Patch1:         %{name}-strict-aliasing.patch
+# PATCH-FIX-UPSTREAM schroedinger-gstreamer-conflict.patch rename function, which conflicts with gstreamer
+Patch2:         %{name}-gstreamer-conflict.patch
 AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gstreamer-0_10-devel >= %{min_gst_version} gstreamer-0_10-plugins-base-devel >= %{min_gst_version} gtk-doc liboil-devel >= %{min_oil_version} pkg-config
@@ -136,6 +138,7 @@ Authors:
 %setup -q -n schroedinger-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure\
@@ -147,7 +150,7 @@ Authors:
 %{__install} -d $RPM_BUILD_ROOT%{_bindir}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %post -n libschroedinger-1_0-0 -p /sbin/ldconfig