Added a patch to fix an infinite loop if a button (stop,pause,next,prev,etc) was pressed during a song change. Fixes Bug #127270. Patch by Thomas Cort <tcort@gentoo.org>.

(Portage version: 2.0.54-r2)

5 files changed, 60 insertions, 12 deletions

diff --git a/media-plugins/xmms-mad/ChangeLog b/media-plugins/xmms-mad/ChangeLog
index afa730e1fd0b..a2fdaf2ee892 100644
--- a/media-plugins/xmms-mad/ChangeLog
+++ b/media-plugins/xmms-mad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/xmms-mad
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/ChangeLog,v 1.40 2005/12/05 22:32:21 metalgod Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/ChangeLog,v 1.41 2006/05/24 03:29:34 tcort Exp $
+
+*xmms-mad-0.8-r2 (23 May 2006)
+
+  23 May 2006; Thomas Cort <tcort@gentoo.org>
+  +files/xmms-mad-0.8-song_change.patch, +xmms-mad-0.8-r2.ebuild:
+  Added a patch to fix an infinite loop if a button (stop,pause,next,prev,etc)
+  was pressed during a song change. Fixes Bug #127270. Patch by Thomas Cort
+  <tcort@gentoo.org>.
 
 *xmms-mad-0.8-r1 (05 Dec 2005)
 
diff --git a/media-plugins/xmms-mad/Manifest b/media-plugins/xmms-mad/Manifest
index ea80a055a823..de761cc1b725 100644
--- a/media-plugins/xmms-mad/Manifest
+++ b/media-plugins/xmms-mad/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 956b6d1a64abf23ad88a364d7ac2ee06 ChangeLog 5974
 MD5 fd47546527740710d5314aff9bc28f6e files/digest-xmms-mad-0.8 64
 MD5 fd47546527740710d5314aff9bc28f6e files/digest-xmms-mad-0.8-r1 64
+MD5 fd47546527740710d5314aff9bc28f6e files/digest-xmms-mad-0.8-r2 64
 MD5 a67a8be5b9a6f622f7edea90002e7bf7 files/xmms-mad-0.5.6-mp3header.patch 448
 MD5 302fc0b4331d282a51ef5d1bcbbcecf9 files/xmms-mad-0.8-mp3-header.patch 1547
+MD5 0d73404fc01811eac2ce000c6c876cd2 files/xmms-mad-0.8-song_change.patch 472
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
 MD5 7413f67be71f917f01f5eaf2924b51dc xmms-mad-0.8-r1.ebuild 830
+MD5 86c103b16e9dbecc3c786fe73de6e531 xmms-mad-0.8-r2.ebuild 873
 MD5 5c64e095db682235fe51b946799dc0f2 xmms-mad-0.8.ebuild 822
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDlL+IwUpWvClEHQoRAlXVAJ9DG+9lL7ctFhE9HXbgfyf38D+DgQCfctqA
-TM8IrhBcWGeY7igsYprPLLE=
-=pNbr
------END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-mad/files/digest-xmms-mad-0.8-r2 b/media-plugins/xmms-mad/files/digest-xmms-mad-0.8-r2
new file mode 100644
index 000000000000..41b5b0cfeece
--- /dev/null
+++ b/media-plugins/xmms-mad/files/digest-xmms-mad-0.8-r2
@@ -0,0 +1 @@
+MD5 9013cd4d924209ce74a682dda771d087 xmms-mad-0.8.tar.gz 315069
diff --git a/media-plugins/xmms-mad/files/xmms-mad-0.8-song_change.patch b/media-plugins/xmms-mad/files/xmms-mad-0.8-song_change.patch
new file mode 100644
index 000000000000..b38fc24e66df
--- /dev/null
+++ b/media-plugins/xmms-mad/files/xmms-mad-0.8-song_change.patch
@@ -0,0 +1,12 @@
+diff -urN xmms-mad-0.8.orig/src/decoder.c xmms-mad-0.8/src/decoder.c
+--- xmms-mad-0.8.orig/src/decoder.c	2006-04-03 22:07:29.000000000 -0400
++++ xmms-mad-0.8/src/decoder.c	2006-04-03 22:33:46.000000000 -0400
+@@ -493,7 +493,7 @@
+     {
+       mad_plugin.output->buffer_free ();
+       mad_plugin.output->buffer_free ();
+-      while (mad_plugin.output->buffer_playing ())
++      while (mad_plugin.output->buffer_playing () && !info->stop)
+         usleep (10000);
+     }
+ 
diff --git a/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild b/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild
new file mode 100644
index 000000000000..e86c0ba8a5ec
--- /dev/null
+++ b/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/xmms-mad-0.8-r2.ebuild,v 1.1 2006/05/24 03:29:34 tcort Exp $
+
+inherit eutils
+
+DESCRIPTION="A XMMS plugin for MAD"
+HOMEPAGE="http://xmms-mad.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmms-mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-sound/xmms
+	 media-libs/libid3tag
+	 media-libs/libmad"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mp3-header.patch
+	epatch ${FILESDIR}/${P}-song_change.patch
+	touch configure
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe src/.libs/libxmmsmad.so || die
+	dodoc AUTHORS ChangeLog NEWS README
+}