[SCM] ices2/master: Add patch 1001 to allow 'allow-repeats' setting when checking ogg serial. Closes: bug#463351. Thanks to C. Chad Wallace.

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Jan 1 20:04:27 UTC 2011


The following commit has been merged in the master branch:
commit dab7756aa6ce48fb8ee90708a856bb5116faf14d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 1 20:58:07 2011 +0100

    Add patch 1001 to allow 'allow-repeats' setting when checking ogg serial. Closes: bug#463351. Thanks to C. Chad Wallace.

diff --git a/debian/patches/1001_allow_repeat.patch b/debian/patches/1001_allow_repeat.patch
new file mode 100644
index 0000000..8e7f2da
--- /dev/null
+++ b/debian/patches/1001_allow_repeat.patch
@@ -0,0 +1,15 @@
+Description: allow 'allow-repeats' setting when checking ogg serial
+Author: C. Chad Wallace <cwallace at lodgingcompany.com>
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=463351#10
+Bug-Debian: http://bugs.debian.org/463351
+--- a/src/im_playlist.c
++++ b/src/im_playlist.c
+@@ -166,7 +166,7 @@
+         {
+             if (ogg_page_bos (&og))
+             {
+-               if (ogg_page_serialno (&og) == pl->current_serial)
++               if (!pl->allow_repeat && ogg_page_serialno (&og) == pl->current_serial)
+                    LOG_WARN1 ("detected duplicate serial number reading \"%s\"", pl->filename);
+ 
+                pl->current_serial = ogg_page_serialno (&og);
diff --git a/debian/patches/series b/debian/patches/series
index 04e5e1e..9898905 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_sync_20090819.patch
+1001_allow_repeat.patch

-- 
ices2 packaging



More information about the pkg-multimedia-commits mailing list