avifile updates

8 files changed, 38 insertions, 221 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 44f09b51bdc5..d8c8cb840ea1 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2002/05/19 19:03:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.11 2002/05/26 14:05:33 azarah Exp $
+
+*xmms-1.2.7-r6 (19 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r6.ebuild :
+
+  Change it to depend on latest avifile, and drop the suffix patch
+  for avifile-config.
 
 *xmms-1.2.7-r5 (19 May 2002)
 
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r4 b/media-sound/xmms/files/digest-xmms-1.2.7-r4
deleted file mode 100644
index bd6731115e58..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r5 b/media-sound/xmms/files/digest-xmms-1.2.7-r5
deleted file mode 100644
index bd6731115e58..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r3 b/media-sound/xmms/files/digest-xmms-1.2.7-r6
index bd6731115e58..bd6731115e58 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r3
+++ b/media-sound/xmms/files/digest-xmms-1.2.7-r6
diff --git a/media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch b/media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch
new file mode 100644
index 000000000000..d30e86e4220b
--- /dev/null
+++ b/media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch
@@ -0,0 +1,12 @@
+--- xmms-1.2.7.original/xmms/Makefile.am	Sun Mar 24 21:35:58 2002
++++ xmms-1.2.7/xmms/Makefile.am	Fri Mar 15 21:47:01 2002
+@@ -6,7 +6,8 @@
+ 
+ xmms_LDFLAGS = -export-dynamic
+ xmms_LDADD += @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
+-@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@
++@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@ \
++-laviplay -lstdc++
+ 
+ INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ -I$(top_builddir)/intl
+ 
diff --git a/media-sound/xmms/xmms-1.2.7-r3.ebuild b/media-sound/xmms/xmms-1.2.7-r3.ebuild
deleted file mode 100644
index 3ac836c81e88..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r3.ebuild
+++ /dev/null
@@ -1,104 +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.7-r3.ebuild,v 1.4 2002/05/23 06:50:14 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-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="=x11-libs/gtk+-1.2*
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	opengl? ( virtual/opengl )
-	avi? ( >=media-video/avifile-0.6 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.4 )
-	sdl? ( media-libs/libsdl )"
-	
-
-RDEPEND="${DEPEND}
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	cp configure configure.orig
-	sed -e "s:-m486::" configure.orig > configure
-	
-	use avi	\
-		&& unpack plover-xmms127.tar.gz	\
-		&& patch -p1 < plover-xmms127.diff	\
-		&& touch stamp-h1.in xmms/stamp-h2.in
-}
-
-src_compile() {
-
-	libtoolize --copy --force
-	aclocal
-
-	local myopts
-
-	use gnome	\
-		&& myopts="${myopts} --with-gnome"	\
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow	\
-		&& myopts="${myopts} --enable-3dnow"	\
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd	\
-		&& myopts="${myopts} --enable-esd"	\
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl	\
-		&& myopts="${myopts} --enable-opengl"	\
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis	\
-		&& myopts="${myopts} --with-ogg --with-vorbis"	\
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use nls	\
-		|| myopts="${myopts} --disable-nls --without-libintl-prefix"
-
-	
-	./configure	\
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-one-plugin-dir	\
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr 						\
-	     mandir=${D}/usr/share/man					\
-	     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
-
-	use gnome	\
-		&& 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
-}
diff --git a/media-sound/xmms/xmms-1.2.7-r4.ebuild b/media-sound/xmms/xmms-1.2.7-r4.ebuild
deleted file mode 100644
index 861884be417a..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r4.ebuild
+++ /dev/null
@@ -1,100 +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.7-r4.ebuild,v 1.5 2002/05/23 06:50:14 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-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/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.6 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	
-	use avi	\
-		&& cp xmms/Makefile.am xmms/Makefile.am.orig	\
-		&& sed -e "s:\(@INTLLIBS@\):\1 -laviplay -lstdc++:" \
-			xmms/Makefile.am.orig > xmms/Makefile.am
-}
-
-src_compile() {
-	local myopts
-
-	use gnome	\
-		&& myopts="${myopts} --with-gnome"	\
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow	\
-		&& myopts="${myopts} --enable-3dnow"	\
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd	\
-		&& myopts="${myopts} --enable-esd"	\
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl	\
-		&& myopts="${myopts} --enable-opengl"	\
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis	\
-		&& myopts="${myopts} --with-ogg --with-vorbis"	\
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use xml	\
-		|| myopts="${myopts} --disable-cdindex"
-
-	use nls	\
-		|| myopts="${myopts} --disable-nls"
-
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr 						\
-	     mandir=${D}/usr/share/man					\
-	     sysconfdir=${D}/etc					\
-	     sysdir=${D}/usr/share/applets/Multimedia 			\
-	     GNOME_SYSCONFDIR=${D}/etc					\
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
-	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.7-r5.ebuild b/media-sound/xmms/xmms-1.2.7-r6.ebuild
index 229a8056f6c2..6b6c8c8b34c6 100644
--- a/media-sound/xmms/xmms-1.2.7-r5.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r6.ebuild
@@ -1,18 +1,19 @@
 # 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.7-r5.ebuild,v 1.2 2002/05/23 06:50:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r6.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
 
 PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz
-	avi? ( http://www.openface.ca/~nephtes/plover-xmms${PLO_VER}.tar.gz )"
+SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
+# This if for the Plover patch
+#	avi? ( http://www.openface.ca/~nephtes/plover-xmms${PLO_VER}.tar.gz )"
 HOMEPAGE="http://www.xmms.org/"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.7.4.20020426 )
+	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
 	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
@@ -27,14 +28,19 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	
-	use avi	&& (\
-		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
-		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
-		sed -e "s:avifile-config:avifile-config0.7:g" \
-			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
-		patch -p1 <plover-xmms${PLO_VER}.diff || die
-	)
+
+	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
+	# and libstdcxx.
+	use avi && patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
+
+# This is for the Plover patch
+#	use avi	&& (\
+#		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
+#		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
+#		sed -e "s:avifile-config:avifile-config0.7:g" \
+#			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
+#		patch -p1 <plover-xmms${PLO_VER}.diff || die
+#	)
 }
 
 src_compile() {