Fixes bugs #46900, #47761, #48891, and hopefully #51080.

4 files changed, 20 insertions, 15 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 2ebde090c9c4..9c411858457a 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.123 2004/05/14 04:13:09 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.124 2004/05/31 07:45:35 eradicator Exp $
+
+*xmms-1.2.10-r3 (31 May 2004)
+
+  31 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r2.ebuild, xmms-1.2.10-r3.ebuild:
+  Fixes bugs #46900, #47761, #48891, and hopefully #51080.
 
   14 May 2004; Stephen P. Becker <geoman@gentoo.org> xmms-1.2.8-r4.ebuild:
   Stable on mips.
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 5b259870e826..ba117638d446 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,11 +1,11 @@
 MD5 416a789e0189833067bae050151b5aba xmms-1.2.9-r2.ebuild 5677
-MD5 5751d7617a3e4573b1108757101e1096 xmms-1.2.10-r2.ebuild 5178
 MD5 685b9082c3a6d6aaaf4c4a7e950d0342 xmms-1.2.8-r4.ebuild 5302
 MD5 4e39a7ee8ee0cc787653c952d8ca29c2 xmms-1.2.10-r1.ebuild 5204
-MD5 0b60b9bd29cbc21d5fc73bf7ac8ac526 ChangeLog 23316
+MD5 e79a8d84f07cb0d8623c02e4de5e2e04 xmms-1.2.10-r3.ebuild 5254
+MD5 939e63c9e9972536fd3433dfc3ec6d94 ChangeLog 23516
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
 MD5 5c7a4199a52efbde90cefb1087dbbb57 files/digest-xmms-1.2.10-r1 219
-MD5 b05077ae2543b55ef25bd9a1685e6de1 files/digest-xmms-1.2.10-r2 219
+MD5 bc3bda4450fc4c6856a63339fab8cd0c files/digest-xmms-1.2.10-r3 219
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 4834fcc733a030e0b0681cebff54fb81 files/digest-xmms-1.2.9-r2 217
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r2 b/media-sound/xmms/files/digest-xmms-1.2.10-r3
index 283a3f43dfe0..a50839a91615 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r2
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r3
@@ -1,3 +1,3 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 f1476bc9eda2504a4253ee466c369fa6 xmms-1.2.10-gentoo-patches-0.4.tar.bz2 102732
+MD5 88e01e4c009b761ee276adac8e1fcbc3 xmms-1.2.10-gentoo-patches-0.5.tar.bz2 144088
diff --git a/media-sound/xmms/xmms-1.2.10-r2.ebuild b/media-sound/xmms/xmms-1.2.10-r3.ebuild
index 4b2110ca1c97..5f88c90e4cfe 100644
--- a/media-sound/xmms/xmms-1.2.10-r2.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r2.ebuild,v 1.5 2004/04/12 17:17:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r3.ebuild,v 1.1 2004/05/31 07:45:35 eradicator Exp $
 
 inherit flag-o-matic eutils libtool
 
-PATCHVER="0.4"
+PATCHVER="0.5"
 
 MY_P=${P/_pre/-pre}
 S=${WORKDIR}/${MY_P}
@@ -47,7 +47,8 @@ src_unpack() {
 
 	# Add dynamic taste detection patch...
 	# goto http://bugs.xmms.org/show_bug.cgi?id=756 to vote for its inclusion in mainline xmms
-	epatch ${PATCHDIR}/${P}-dtd.patch
+	# This patch is no longer included in gentoo xmms due to problems with later versions of glib.
+	# epatch ${PATCHDIR}/${P}-dtd.patch
 
 	# id3v2 editing support in mpg123 plugin
 	epatch ${PATCHDIR}/${P}-id3v2edit.patch
@@ -64,7 +65,9 @@ src_unpack() {
 		epatch ${PATCHDIR}/${P}-mpg123j.patch
 	else
 		# add recode patch http://sourceforge.net/projects/rusxmms/
+		# epatch ${PATCHDIR}/${P}-recode-csa27.3.dtd.patch
 		epatch ${PATCHDIR}/${P}-recode-csa27.3.patch
+		epatch ${PATCHDIR}/${P}-recode-csa27.3.regressionFix.patch
 	fi
 
 	# Add /usr/local/share/xmms/Skins to the search path for skins
@@ -86,6 +89,9 @@ src_unpack() {
 	# Bug #45720 ... bugfix when unpausing with alsa
 	epatch ${PATCHDIR}/${P}-alsa-pause.patch
 
+	# Bug #47761 ... Patch to enable seeking in HTTP streams
+	epatch ${PATCHDIR}/${P}-stream-seek.patch
+
 	if [ ! -f ${S}/config.rpath ] ; then
 		touch ${S}/config.rpath
 		chmod +x ${S}/config.rpath
@@ -184,10 +190,3 @@ src_install() {
 	dodoc ${WORKDIR}/README
 }
 
-pkg_postinst() {
-	echo
-	einfo "If you enjoy the dtd (Dynamic Taste Detection) patch, please"
-	einfo "visit the url below and vote for this patch's inclusion in"
-	einfo "main-line xmms."
-	einfo "http://bugs.xmms.org/show_bug.cgi?id=756"
-}