Bug#596125: unblock: mpg123/1.12.1-3

[Daniel Kobras <kobras@debian.org>]

Package: release.debian.org
Severity: normal

Hi!

mpg123 1.12.1-3 fixes a problem playing mp3 streams from the web, leading to
choppy or corrupted output. No Debian bug was filed, but I consider the fix
important enough to make it into the next stable release. The patch is taken
from upstream version 1.12.3, the small debdiff to the version in testing is
attached. Please unblock.

Regards,

Daniel.

diff -u mpg123-1.12.1/debian/changelog mpg123-1.12.1/debian/changelog
--- mpg123-1.12.1/debian/changelog
+++ mpg123-1.12.1/debian/changelog
@@ -1,3 +1,10 @@
+mpg123 (1.12.1-3) unstable; urgency=low
+
+  * src/libmpg123/readers.c: Fix fast reading of ICY streams via http.
+    Patch from upstream version 1.12.3.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon, 30 Aug 2010 20:05:09 +0200
+
 mpg123 (1.12.1-2) unstable; urgency=low
 
   * configure.ac, src/libmpg123/frame.c: Apply backport of upstream patch
only in patch2:
unchanged:
--- mpg123-1.12.1.orig/src/libmpg123/readers.c
+++ mpg123-1.12.1/src/libmpg123/readers.c
@@ -120,7 +120,7 @@
 			if(fr->icy.next > 0)
 			{
 				cut_pos = fr->icy.next;
-				ret = fr->rdat.fdread(fr,buf,cut_pos);
+				ret = fr->rdat.fdread(fr,buf+cnt,cut_pos);
 				if(ret < 1)
 				{
 					if(ret == 0) break; /* Just EOF. */
@@ -128,7 +128,8 @@
 
 					return READER_ERROR;
 				}
-				fr->rdat.filepos += ret;
+
+				if(!(fr->rdat.flags & READER_BUFFERED)) fr->rdat.filepos += ret;
 				cnt += ret;
 				fr->icy.next -= ret;
 				if(fr->icy.next > 0)