[Pkg-gstreamer-commits] [SCM] GStreamer Base Plugins 0.10 Packaging branch, master, updated. debian/0.10.36-1-1-g9989c80

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 9989c8034a3053e13c93d2b127a7fc871f574393
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue Dec 4 12:09:07 2012 +0100

    Non-maintainer upload.
    
    * Non-maintainer upload.
      + debian/patches/98_fix-ogg-flac-transition.patch:
        - Fixes ogg->flac transition hangs (Closes: #668109)
          Taken from upstream git.

diff --git a/debian/changelog b/debian/changelog
index 7fa583d..1f77fa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gst-plugins-base0.10 (0.10.36-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+    + debian/patches/98_fix-ogg-flac-transition.patch:
+      - Fixes ogg->flac transition hangs (Closes: #668109)
+        Taken from upstream git.
+
+ -- Christoph Reiter <reiter.christoph at gmail.com>  Tue, 04 Dec 2012 11:07:40 +0100
+
 gst-plugins-base0.10 (0.10.36-1) unstable; urgency=low
 
   * New upstream stable release, "Better":
diff --git a/debian/patches/98_fix-ogg-flac-transition.patch b/debian/patches/98_fix-ogg-flac-transition.patch
new file mode 100644
index 0000000..d0e07f4
--- /dev/null
+++ b/debian/patches/98_fix-ogg-flac-transition.patch
@@ -0,0 +1,27 @@
+From: Edward Hervey <edward.hervey at collabora.co.uk>
+Subject: baseaudiosink: Resync when ringbuffer resets
+
+When the ringbuffer gets restarted (like in setcaps), we *will* have to 
+resync against the new values. Without this we end up blindly assuming the 
+new samples align to the old ones.
+
+Origin: upstream, http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=969fe8c0b97ae4ac58aacf7530ca1bfbc2b5969a
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=680252
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668109
+Index: gst-plugins-base0.10-0.10.36/gst-libs/gst/audio/gstbaseaudiosink.c
+===================================================================
+--- gst-plugins-base0.10-0.10.36.orig/gst-libs/gst/audio/gstbaseaudiosink.c	2011-12-30 14:29:13.000000000 +0100
++++ gst-plugins-base0.10-0.10.36/gst-libs/gst/audio/gstbaseaudiosink.c	2012-12-04 11:02:39.294066822 +0100
+@@ -921,6 +921,12 @@
+   if (!gst_ring_buffer_acquire (sink->ringbuffer, spec))
+     goto acquire_error;
+ 
++  /* We need to resync since the ringbuffer restarted */
++  sink->priv->avg_skew = -1;
++  sink->next_sample = -1;
++  sink->priv->eos_time = -1;
++  sink->priv->discont_time = -1;
++
+   if (bsink->pad_mode == GST_ACTIVATE_PUSH) {
+     GST_DEBUG_OBJECT (sink, "activate ringbuffer");
+     gst_ring_buffer_activate (sink->ringbuffer, TRUE);
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch
index 73f5f2f..efe6565 100644
--- a/debian/patches/99_ltmain_as-needed.patch
+++ b/debian/patches/99_ltmain_as-needed.patch
@@ -1,8 +1,8 @@
-diff --git a/ltmain.sh b/ltmain.sh
-index c7d06c3..7bc27f2 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -5800,6 +5800,11 @@ func_mode_link ()
+Index: gst-plugins-base0.10-0.10.36/ltmain.sh
+===================================================================
+--- gst-plugins-base0.10-0.10.36.orig/ltmain.sh	2012-12-04 11:22:23.710301877 +0100
++++ gst-plugins-base0.10-0.10.36/ltmain.sh	2012-12-04 11:23:37.102314806 +0100
+@@ -5800,6 +5800,11 @@
  	arg=$func_stripname_result
  	;;
  
@@ -14,7 +14,7 @@ index c7d06c3..7bc27f2 100644
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -6163,6 +6168,15 @@ func_mode_link ()
+@@ -6163,6 +6168,15 @@
  	lib=
  	found=no
  	case $deplib in
diff --git a/debian/patches/series b/debian/patches/series
index c6af81d..9463cbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_gnome-vfs-dav-url.patch
+98_fix-ogg-flac-transition.patch
 99_ltmain_as-needed.patch

-- 
GStreamer Base Plugins 0.10 Packaging