Hello community, here is the log from the commit of package schroedinger for openSUSE:Factory checked in at Fri Aug 28 22:09:47 CEST 2009. -------- --- schroedinger/schroedinger.changes 2009-07-21 21:49:45.000000000 +0200 +++ schroedinger/schroedinger.changes 2009-08-27 18:30:44.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 16:29:11 UTC 2009 - mseben@novell.com + +- added gstreamer-conflict.patch to fix build :rename function, + which conflicts with gstreamer + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- schroedinger-gstreamer-conflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schroedinger.spec ++++++ --- /var/tmp/diff_new_pack.8189zK/_old 2009-08-28 22:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.8189zK/_new 2009-08-28 22:09:14.000000000 +0200 @@ -26,12 +26,14 @@ 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 @@ %setup -q -n schroedinger-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure\ @@ -147,7 +150,7 @@ %{__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 ++++++ schroedinger-gstreamer-conflict.patch ++++++ --- 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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org