Removed old version of xmms, and added a patch to xmms which uses avifile-0.6 directly with no external plugins required, making avi playing a native aspect of XMMS.

6 files changed, 18 insertions, 102 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index bc2572cf1f85..6cca1c6db0a1 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.3 2002/03/05 19:49:54 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.4 2002/03/19 09:48:25 seemant Exp $
+
+*xmms-1.2.7-r1 (19 Mar 2002)
+
+  19 Mar 2002; Seemant Kulleen <seemant@gentoo.org> : added a patch to make
+  xmms use avifile-0.6, which removes the necessity of having a separate
+  avi-xmms module until that module can support avifile-0.6
 
 *xmms-1.2.7 (05 Mar 2002)
 
diff --git a/media-sound/xmms/files/digest-xmms-1.2.6-r1 b/media-sound/xmms/files/digest-xmms-1.2.6-r1
deleted file mode 100644
index cc26433ccea1..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a2d68ce07e4c30bc8b028a5d537930d xmms-1.2.6.tar.gz 2855872
diff --git a/media-sound/xmms/files/digest-xmms-1.2.6-r2 b/media-sound/xmms/files/digest-xmms-1.2.6-r2
deleted file mode 100644
index cc26433ccea1..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a2d68ce07e4c30bc8b028a5d537930d xmms-1.2.6.tar.gz 2855872
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r1 b/media-sound/xmms/files/digest-xmms-1.2.7-r1
new file mode 100644
index 000000000000..bd6731115e58
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.7-r1
@@ -0,0 +1,2 @@
+MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
+MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
diff --git a/media-sound/xmms/xmms-1.2.6-r1.ebuild b/media-sound/xmms/xmms-1.2.6-r1.ebuild
deleted file mode 100644
index e09fad79b224..000000000000
--- a/media-sound/xmms/xmms-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.6-r1.ebuild,v 1.1 2002/01/13 12:58:37 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp configure configure.orig
-	sed -e "s:-m486::" configure.orig > configure
-}
-
-src_compile() {
-	local myopts
-
-	if [ -n "`use gnome`" ]
-	then
-		myopts="--with-gnome"
-	else
-		myopts="--without-gnome"
-	fi
-
-	if [ "`use 3dnow`" ] ; then
-		myopts="$myopts --enable-3dnow"
-	else
-		myopts="$myopts --disable-3dnow"
-	fi
-
-	if [ "`use ogg`" ] ; then
-		myopts="$myopts --with-ogg"
-	else
-		myopts="$myopts --disable-ogg-test"
-	fi
-
-	if [ "`use vorbis`" ] ; then
-		myopts="$myopts --with-vorbis"
-	else
-		myopts="$myopts --disable-vorbis-test"
-	fi
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr 						\
-	     sysconfdir=${D}/etc					\
-	     sysdir=${D}/usr/share/applets/Multimedia 			\
-	     GNOME_SYSCONFDIR=${D}/etc					\
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	insinto /usr/share/pixmaps/
-	donewins gnomexmms/gnomexmms.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/gnome/apps/Multimedia
-		doins xmms/xmms.desktop
-		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
-			/usr/share/gnome/apps/Multimedia/xmms.desktop
-	fi
-}
diff --git a/media-sound/xmms/xmms-1.2.6-r2.ebuild b/media-sound/xmms/xmms-1.2.7-r1.ebuild
index bc652342b75a..eb6fd60af674 100644
--- a/media-sound/xmms/xmms-1.2.6-r2.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.6-r2.ebuild,v 1.1 2002/02/28 07:25:37 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r1.ebuild,v 1.1 2002/03/19 09:48:26 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
+SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz http://www.openface.ca/~nephtes/plover-xmms127.tar.gz"
 HOMEPAGE="http://www.xmms.org/"
 
 DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
@@ -15,7 +15,8 @@ DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	opengl? ( virtual/opengl )
 	nls? ( dev-util/intltool )
-	>=x11-libs/gtk+-1.2.10-r4"
+	>=x11-libs/gtk+-1.2.10-r4
+	>=media-video/avifile-0.6"
 
 RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
 	>=dev-libs/libxml-1.8.15
@@ -26,11 +27,15 @@ RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
 	>=x11-libs/gtk+-1.2.10-r4"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${P}.tar.gz
 
 	cd ${S}
 	cp configure configure.orig
 	sed -e "s:-m486::" configure.orig > configure
+	
+	unpack plover-xmms127.tar.gz
+	patch -p1 < plover-xmms127.diff
+	touch stamp-h1.in xmms/stamp-h2.in
 }
 
 src_compile() {