added patch to disable xmms. closes 45356

4 files changed, 36 insertions, 18 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c57d3df46995..c36225f81ec7 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.113 2004/03/22 03:28:03 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.114 2004/03/23 16:27:29 mholzer Exp $
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r2.ebuild,
+  files/mplayer-1.0_pre3-xmms.patch:
+  added patch to disable xmms. closes 45356
 
   21 Mar 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre3-r2.ebuild:
   Added ~sparc keyword.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5234853a9b89..af734733dd8c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,24 +1,25 @@
-MD5 e41cd90e94f9572c08545db4d5ee5399 ChangeLog 19115
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 6ef8b4233f81e3c47276ad6f220e21fb mplayer-0.92.ebuild 11770
+MD5 de6cfa3a8d9b38831705a6438d0c6c6e mplayer-1.0_pre3-r2.ebuild 11240
 MD5 2d23c2a645687d95406c6a7227ab67a3 mplayer-1.0_pre1-r1.ebuild 11452
+MD5 fba3cddc229a860ee10243c57a9e7bcb mplayer-1.0_pre3-r1.ebuild 12055
 MD5 7283c56dd4492e77d4cb57fcdbfc5073 mplayer-1.0_pre2.ebuild 11644
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 8bd733777b9c595d8c9b0b378c655822 ChangeLog 19277
 MD5 c85675a19ef8ffca4ad0ef4871071998 mplayer-1.0_pre3.ebuild 11750
-MD5 fba3cddc229a860ee10243c57a9e7bcb mplayer-1.0_pre3-r1.ebuild 12055
-MD5 df442c90d1fd65464e20c0bdbe4a3407 mplayer-1.0_pre3-r2.ebuild 11157
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 6ef8b4233f81e3c47276ad6f220e21fb mplayer-0.92.ebuild 11770
+MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92 355
-MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
-MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
-MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r1 358
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r2 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3 358
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
 MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r2 358
+MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r1 358
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
diff --git a/media-video/mplayer/files/mplayer-1.0_pre3-xmms.patch b/media-video/mplayer/files/mplayer-1.0_pre3-xmms.patch
new file mode 100644
index 000000000000..36340bd78c57
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre3-xmms.patch
@@ -0,0 +1,10 @@
+--- configure	2004-03-22 12:49:44.866704864 +0000
++++ configure	2004-03-22 12:50:00.397343848 +0000
+@@ -1294,6 +1294,7 @@
+   --enable-external-faad)	_faad_external=yes	_faad_internal=no	;;
+   --disable-external-faad)	_faad_external=no	;;
+   --enable-xmms)	_xmms=yes	;;
++  --disable-xmms)	_xmms=no	;;
+   --enable-flac)	_flac=yes	;;
+   --disable-flac)	_flac=no	;;
+   --enable-external-flac)	_external_flac=yes	;;
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
index 7b4a82865ac2..0092d71417be 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild,v 1.4 2004/03/22 03:28:03 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild,v 1.5 2004/03/23 16:27:29 mholzer Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick theora"
 
@@ -105,6 +105,9 @@ src_unpack() {
 	# Fix mencoder segfaulting with bad arguments
 	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
 
+	# Fix to diable xmms support. Closes 45356
+	epatch ${FILESDIR}/${P}-xmms.patch
+
 	#Fix libmatroska 
 	if has_version '>=libmatroska-0.6.3'
 	then