avifile updates

6 files changed, 46 insertions, 89 deletions

diff --git a/media-video/drip/ChangeLog b/media-video/drip/ChangeLog
index 2ab3a85391ae..62e3ca4af4d5 100644
--- a/media-video/drip/ChangeLog
+++ b/media-video/drip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/drip
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.4 2002/05/19 19:03:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.5 2002/05/26 14:05:33 azarah Exp $
+
+*drip-0.8.1-r3 (26 May 2002)
+
+  26 May 2002; M.Schlemmer <azarah@gentoo.org> drip-0.8.1-r3.ebuild :
+
+  Make it depend on latest avifile, and remove the patches for
+  the suffix that was added to avifile-config.
 
 *drip-0.8.1-r2 (19 May 2002)
 
diff --git a/media-video/drip/drip-0.8.1-r1.ebuild b/media-video/drip/drip-0.8.1-r3.ebuild
index 26b4eeccf642..e119e3a30a71 100644
--- a/media-video/drip/drip-0.8.1-r1.ebuild
+++ b/media-video/drip/drip-0.8.1-r3.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer:  Martin Schlemmer <azarah@cvs.gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r1.ebuild,v 1.2 2002/05/19 10:20:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r3.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
 
+AF_MINOR_VER="$(avifile-config --data-dir | cut -d. -f2)"
 S=${WORKDIR}/${P}
 DESCRIPTION="Drip - A DVD to DIVX convertor frontend"
 SRC_URI="${SRC_URI} http://drip.sourceforge.net/files/${P}.tar.gz"
 HOMEPAGE="http://drip.sourceforge.net/"
 
 RDEPEND="gnome-base/gnome-libs
-	=media-video/avifile-0.6.0*
-	media-libs/libdvdcss
-	media-libs/libdvdread
+	>=media-video/avifile-0.7.4.20020426-r2
+	>=media-libs/a52dec-0.7.3
+	>=media-libs/libdvdcss-1.1.1
+	>=media-libs/libdvdread-0.9.2
 	media-libs/gdk-pixbuf"
 	
 DEPEND="${RDEPEND}
@@ -23,26 +25,53 @@ src_unpack() {
 
 	unpack ${A}
 
+	# Fix hardcoded path of plugins
 	cd ${S}
 	cp encoder/plugin-loader.cpp encoder/plugin-loader.cpp.orig
 	sed -e "s:/usr/local/lib:/usr/lib:g" \
 		encoder/plugin-loader.cpp.orig >encoder/plugin-loader.cpp
+
+	# Fixup to work with avifile-0.${AF_MINOR_VER}
+	cd ${S}/encoder
+	for x in encoder.hh main.hh encoder.cpp external.cpp
+	do
+		cp ${x} ${x}.orig
+		sed -e "s:AVIFILE_MINOR_VERSION==6:AVIFILE_MINOR_VERSION==${AF_MINOR_VER}:g" \
+			${x}.orig >${x}
+	done
+
+	# Fix it to work with the suffix the new avifile introduces.
+#	cd ${S}
+#	for x in $(find . -name 'Makefile.am') configure.in
+#	do
+#		cp ${x} ${x}.orig
+#		sed -e "s:avifile-config:avifile-config0.${AF_MINOR_VER}:g" \
+#			${x}.orig >${x}
+#	done
+
+	cd ${S}
+	export WANT_AUTOMAKE_1_5=1
+	aclocal -I macros
+	automake --add-missing
+	autoconf
 }
 
 src_compile() {
 
-	libtoolize --copy --force
+	export WANT_AUTOMAKE_1_5=1
 
 	local myconf
 	use nls || myconf="--disable-nls"
 
+	CFLAGS= \
+	CXXFLAGS= \
 	./configure --host=${CHOST} \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var/lib \
 		--sysconfdir=/etc \
-		$myconf || die
+		${myconf} || die
 			
 	emake || die
 }
@@ -58,6 +87,9 @@ src_install() {
 		drip_pixmapdir=${D}/usr/share/pixmaps \
 		install || die
 
+	# Remove liba52.so.* as ac52dec provides this
+	rm ${D}/usr/lib/liba52*
+
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
 	insinto /usr/share/pixmaps
diff --git a/media-video/drip/drip-0.8.1.ebuild b/media-video/drip/drip-0.8.1.ebuild
deleted file mode 100644
index a2f9cc40b221..000000000000
--- a/media-video/drip/drip-0.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer:  Martin Schlemmer <azarah@cvs.gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1.ebuild,v 1.1 2002/03/30 01:48:21 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Drip - A DVD to DIVX convertor frontend for GNOME"
-SRC_URI="${SRC_URI} http://drip.sourceforge.net/files/${P}.tar.gz"
-HOMEPAGE="http://drip.sourceforge.net/"
-
-RDEPEND="gnome-base/gnome-libs
-	>=media-video/avifile-0.6
-	media-libs/libdvdcss
-	media-libs/libdvdread
-	media-libs/gdk-pixbuf
-	oggvorbis? ( media-libs/libvorbis )"
-	
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-
-src_compile() {
-
-	local myconf
-	use nls || myconf="--disable-nls"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/lib \
-		--sysconfdir=/etc \
-		$myconf || die
-			
-	emake || die
-}
-
-src_install() {
-	
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		localstatedir=${D}/var/lib \
-		sysconfdir=${D}/etc \
-		drip_helpdir=${D}/usr/share/gnome/help/drip/C \
-		drip_pixmapdir=${D}/usr/share/pixmaps \
-		install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-	insinto /usr/share/pixmaps
-	newins ${S}/pixmaps/drip_logo.jpg drip.jpg
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/drip.desktop
-}
-
diff --git a/media-video/drip/files/digest-drip-0.8.1-r1 b/media-video/drip/files/digest-drip-0.8.1-r1
deleted file mode 100644
index 53af5b8fffdc..000000000000
--- a/media-video/drip/files/digest-drip-0.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b88e9731f7266f0e0b9ff412c13a3624 drip-0.8.1.tar.gz 603487
diff --git a/media-video/drip/files/digest-drip-0.8.1 b/media-video/drip/files/digest-drip-0.8.1-r3
index 53af5b8fffdc..53af5b8fffdc 100644
--- a/media-video/drip/files/digest-drip-0.8.1
+++ b/media-video/drip/files/digest-drip-0.8.1-r3
diff --git a/media-video/drip/files/drip-0.8.0-automake.diff b/media-video/drip/files/drip-0.8.0-automake.diff
deleted file mode 100644
index 2c8aa94d8ba2..000000000000
--- a/media-video/drip/files/drip-0.8.0-automake.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig	Sun Dec 16 18:00:21 2001
-+++ configure	Sun Dec 16 18:01:20 2001
-@@ -6767,14 +6767,14 @@
-      ;;
- esac
- 
--echo $ac_n "checking for automake version 1.5""... $ac_c" 1>&6
--echo "configure:6772: checking for automake version 1.5" >&5
--AUTOMAKEVERSION=`$HASAUTOMAKE --version | head -n 1 | $AWK '{printf($4)}'`
--if (test "$AUTOMAKEVERSION" = "1.5"); then
--    echo "$ac_t""found" 1>&6
--else
--    { echo "configure: error: automake 1.5 is requiered. " 1>&2; exit 1; }
--fi
-+#echo $ac_n "checking for automake version 1.5""... $ac_c" 1>&6
-+#echo "configure:6772: checking for automake version 1.5" >&5
-+#AUTOMAKEVERSION=`$HASAUTOMAKE --version | head -n 1 | $AWK '{printf($4)}'`
-+#if (test "$AUTOMAKEVERSION" = "1.5"); then
-+#    echo "$ac_t""found" 1>&6
-+#else
-+#    { echo "configure: error: automake 1.5 is requiered. " 1>&2; exit 1; }
-+#fi
- 
- 
- # Extract the first word of "avifile-config", so it can be a program name with args.