rpms/gstreamer-plugins-base/F-12 gstreamer-plugins-base.spec, 1.92, 1.93 pulsesink-disable-old-version-hack.patch, 1.1, 1.2 gstpb-fix-missing-plugins.patch, 1.2, NONE gstpb-no-subtitle-errors.patch, 1.1, NONE gstpb-playbin-proxy-volume.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32358

Modified Files:
	gstreamer-plugins-base.spec 
	pulsesink-disable-old-version-hack.patch 
Removed Files:
	gstpb-fix-missing-plugins.patch gstpb-no-subtitle-errors.patch 
	gstpb-playbin-proxy-volume.patch 
Log Message:
* Wed Nov 11 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25.1-1
- Update to snapshot
- Fix text subtitles causing hangs on startup
- Fix missing plugins installation requiring a restart



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/gstreamer-plugins-base.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- gstreamer-plugins-base.spec	3 Nov 2009 12:27:08 -0000	1.92
+++ gstreamer-plugins-base.spec	11 Nov 2009 15:54:25 -0000	1.93
@@ -2,14 +2,22 @@
 %define         majorminor      0.10
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.25
-Release:  	5%{?dist}
+Version: 	0.10.25.1
+Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
 License: 	LGPLv2+
 URL:		http://gstreamer.freedesktop.org/
-Source:		http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
+# Tarfile created using git
+# git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-base
+# git reset --hard %{gitversion}
+# ./autogen.sh --enable-gtk-doc && make all dist
+# mv gstreamer-%{version}.tar.gz gstreamer-%{version}-%{gitdate}.tar.gz
+#Source:	http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
+%define gitdate 20091111
+%define git_version 1da5a3f
+Source:		gst-plugins-base-%{version}-%{gitdate}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{gstreamer} >= %{version}
@@ -33,17 +41,11 @@ BuildRequires:  gtk2-devel
 BuildRequires:  pkgconfig
 Obsoletes:	gstreamer-plugins
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=587704
-Patch0:		gstpb-no-subtitle-errors.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=591677
-Patch1:		gstpb-fix-missing-plugins.patch
 # Revert http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=35cddfb1e3ddc6513c7daca093d72151a13e9342
 # We have a new enough pulsesink
 # https://bugzilla.gnome.org/show_bug.cgi?id=599105
-Patch2:		pulsesink-disable-old-version-hack.patch
+Patch1:		pulsesink-disable-old-version-hack.patch
 Conflicts:	gstreamer-plugins-good < 0.10.16-3
-# https://bugzilla.gnome.org/show_bug.cgi?id=596164#c12
-Patch3:		gstpb-playbin-proxy-volume.patch
 
 # documentation
 BuildRequires:  gtk-doc >= 1.3
@@ -61,10 +63,7 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
-%patch0 -p1 -b .subtitle-errors
-%patch1 -p1 -b .missing-plugins
-%patch2 -p1 -R -b .old-pulsesink
-%patch3 -p1 -b .volume-notify
+%patch1 -p1 -b .old-pulsesink
 
 %build
 %configure \
@@ -260,6 +259,11 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Nov 11 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25.1-1
+- Update to snapshot
+- Fix text subtitles causing hangs on startup
+- Fix missing plugins installation requiring a restart
+
 * Tue Nov 03 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-5
 - Update volume notification patch
 

pulsesink-disable-old-version-hack.patch:
 gstbaseaudiosink.c |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

Index: pulsesink-disable-old-version-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/pulsesink-disable-old-version-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pulsesink-disable-old-version-hack.patch	27 Oct 2009 01:11:51 -0000	1.1
+++ pulsesink-disable-old-version-hack.patch	11 Nov 2009 15:54:25 -0000	1.2
@@ -1,94 +1,82 @@
-From 35cddfb1e3ddc6513c7daca093d72151a13e9342 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wim.taymans at collabora.co.uk>
-Date: Thu, 10 Sep 2009 10:38:16 +0000
-Subject: baseaudiosink: add ugly backward compat hack
-
-Check for pulsesink < 0.10.17 because it includes code that is now included in
-baseaudiosink. Disable that code in baseaudiosink to be compatible with the
-older version.
----
 diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
-index afa62c3..23fde25 100644
+index d84c6f6..70393a0 100644
 --- a/gst-libs/gst/audio/gstbaseaudiosink.c
 +++ b/gst-libs/gst/audio/gstbaseaudiosink.c
-@@ -56,6 +56,8 @@ struct _GstBaseAudioSinkPrivate
-   gboolean sync_latency;
+@@ -57,7 +57,6 @@ struct _GstBaseAudioSinkPrivate
  
    GstClockTime eos_time;
-+
-+  gboolean do_time_offset;
- };
  
- /* BaseAudioSink signals and args */
-@@ -231,12 +233,15 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
+-  gboolean do_time_offset;
+   /* number of microseconds we alow timestamps or clock slaving to drift
+    * before resyncing */
+   guint64 drift_tolerance;
+@@ -255,15 +254,12 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
     * thread-safety in GObject */
    g_type_class_ref (GST_TYPE_AUDIO_CLOCK);
    g_type_class_ref (GST_TYPE_RING_BUFFER);
-+
+-
  }
  
  static void
  gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
      GstBaseAudioSinkClass * g_class)
  {
-+  GstPluginFeature *feature;
-+
+-  GstPluginFeature *feature;
+-
    baseaudiosink->priv = GST_BASE_AUDIO_SINK_GET_PRIVATE (baseaudiosink);
  
    baseaudiosink->buffer_time = DEFAULT_BUFFER_TIME;
-@@ -253,6 +258,24 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
+@@ -281,24 +277,6 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
    /* install some custom pad_query functions */
    gst_pad_set_query_function (GST_BASE_SINK_PAD (baseaudiosink),
        GST_DEBUG_FUNCPTR (gst_base_audio_sink_query_pad));
-+
-+  baseaudiosink->priv->do_time_offset = TRUE;
-+
-+  /* check the factory, pulsesink < 0.10.17 does the timestamp offset itself so
-+   * we should not do ourselves */
-+  feature =
-+      GST_PLUGIN_FEATURE_CAST (GST_ELEMENT_CLASS (g_class)->elementfactory);
-+  GST_DEBUG ("created from factory %p", feature);
-+
-+  /* HACK for old pulsesink that did the time_offset themselves */
-+  if (feature) {
-+    if (strcmp (gst_plugin_feature_get_name (feature), "pulsesink") == 0) {
-+      if (!gst_plugin_feature_check_version (feature, 0, 10, 17)) {
-+        /* we're dealing with an old pulsesink, we need to disable time corection */
-+        baseaudiosink->priv->do_time_offset = FALSE;
-+      }
-+    }
-+  }
+-
+-  baseaudiosink->priv->do_time_offset = TRUE;
+-
+-  /* check the factory, pulsesink < 0.10.17 does the timestamp offset itself so
+-   * we should not do ourselves */
+-  feature =
+-      GST_PLUGIN_FEATURE_CAST (GST_ELEMENT_CLASS (g_class)->elementfactory);
+-  GST_DEBUG ("created from factory %p", feature);
+-
+-  /* HACK for old pulsesink that did the time_offset themselves */
+-  if (feature) {
+-    if (strcmp (gst_plugin_feature_get_name (feature), "pulsesink") == 0) {
+-      if (!gst_plugin_feature_check_version (feature, 0, 10, 17)) {
+-        /* we're dealing with an old pulsesink, we need to disable time corection */
+-        baseaudiosink->priv->do_time_offset = FALSE;
+-      }
+-    }
+-  }
  }
  
  static void
-@@ -1409,16 +1432,18 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
+@@ -1458,18 +1436,16 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
    }
  
    /* bring to position in the ringbuffer */
--  time_offset =
--      GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
--  if (render_start > time_offset)
--    render_start -= time_offset;
--  else
--    render_start = 0;
--  if (render_stop > time_offset)
--    render_stop -= time_offset;
--  else
--    render_stop = 0;
-+  if (sink->priv->do_time_offset) {
-+    time_offset =
-+        GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
-+    if (render_start > time_offset)
-+      render_start -= time_offset;
-+    else
-+      render_start = 0;
-+    if (render_stop > time_offset)
-+      render_stop -= time_offset;
-+    else
-+      render_stop = 0;
-+  }
+-  if (sink->priv->do_time_offset) {
+-    time_offset =
+-        GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
+-    if (render_start > time_offset)
+-      render_start -= time_offset;
+-    else
+-      render_start = 0;
+-    if (render_stop > time_offset)
+-      render_stop -= time_offset;
+-    else
+-      render_stop = 0;
+-  }
++  time_offset =
++      GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
++  if (render_start > time_offset)
++    render_start -= time_offset;
++  else
++    render_start = 0;
++  if (render_stop > time_offset)
++    render_stop -= time_offset;
++  else
++    render_stop = 0;
  
    /* and bring the time to the rate corrected offset in the buffer */
    render_start = gst_util_uint64_scale_int (render_start,
---
-cgit v0.8.2


--- gstpb-fix-missing-plugins.patch DELETED ---


--- gstpb-no-subtitle-errors.patch DELETED ---


--- gstpb-playbin-proxy-volume.patch DELETED ---