Big commit cause avifile.0.7.25 breaks all transcode packages

11 files changed, 58 insertions, 242 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 98c67ff02c06..084c5f22a34a 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.18 2002/12/11 15:56:19 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.19 2003/01/19 00:44:52 mholzer Exp $
+
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> 
+  Big commit cause avifile.0.7.25 breaks all transcode packages
 
 *transcode-0.6.3.20021205 (11 Dec 2002)
 
@@ -37,6 +40,10 @@
 
 *transcode-0.6.0 (28 Aug 2002)
 
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.0.ebuild
+  transcode-0.6.0-PP_QUALITY_MAX.patch :
+  Added mplayer dependency, downported PP_QUALITY_MAX patch
+
   11 Sep 2002; Mark Guertin <gerk@gentoo.org> :
 
   set nasm as x86 only dependancy
diff --git a/media-video/transcode/files/digest-transcode-0.6.0_pre5-r2 b/media-video/transcode/files/digest-transcode-0.6.0_pre5-r2
deleted file mode 100644
index 0553a057e068..000000000000
--- a/media-video/transcode/files/digest-transcode-0.6.0_pre5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f791b1aac090312459e3e9cec2d1fd6e transcode-0.6.0pre5.tgz 2042189
diff --git a/media-video/transcode/files/digest-transcode-0.6.1 b/media-video/transcode/files/digest-transcode-0.6.1
deleted file mode 100644
index 941a6d2d4bac..000000000000
--- a/media-video/transcode/files/digest-transcode-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac9a66cff7cab3e52b089723e4b77ca7 transcode-0.6.1.tgz 2272803
diff --git a/media-video/transcode/files/transcode-0.6.0-PP_QUALITY_MAX.patch b/media-video/transcode/files/transcode-0.6.0-PP_QUALITY_MAX.patch
new file mode 100644
index 000000000000..e4d3a2fae632
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.0-PP_QUALITY_MAX.patch
@@ -0,0 +1,24 @@
+diff -ru transcode-0.6.1/filter/filter_pp.c transcode-0.6.1-r1/filter/filter_pp.c
+--- transcode-0.6.1/filter/filter_pp.c	2002-06-16 08:30:53.000000000 +0200
++++ transcode-0.6.1-r1/filter/filter_pp.c	2002-11-15 13:26:09.000000000 +0100
+@@ -154,7 +154,7 @@
+                   pp_page, vob->ex_v_width,
+                   vob->ex_v_width, vob->ex_v_height,
+                   NULL, 0,
+-                  GET_PP_QUALITY_MAX);    
++                  PP_QUALITY_MAX);    
+     }
+   }
+   
+diff -ru transcode-0.6.1/filter/filter_ppcvs.c transcode-0.6.1-r1/filter/filter_ppcvs.c
+--- transcode-0.6.1/filter/filter_ppcvs.c	2002-06-16 08:30:53.000000000 +0200
++++ transcode-0.6.1-r1/filter/filter_ppcvs.c	2002-11-15 13:26:20.000000000 +0100
+@@ -160,7 +160,7 @@
+                   pp_page, vob->ex_v_width,
+                   vob->ex_v_width, vob->ex_v_height,
+                   NULL, 0,
+-                  GET_PP_QUALITY_MAX);    
++                  PP_QUALITY_MAX);    
+     }
+   }
+   
diff --git a/media-video/transcode/transcode-0.6.0.ebuild b/media-video/transcode/transcode-0.6.0.ebuild
index 612edbe45233..07d88bde67d1 100644
--- a/media-video/transcode/transcode-0.6.0.ebuild
+++ b/media-video/transcode/transcode-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0.ebuild,v 1.8 2002/10/05 18:13:22 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0.ebuild,v 1.9 2003/01/19 00:44:52 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -20,21 +20,22 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-DEPEND=">=media-libs/a52dec-0.7.3
+DEPEND=">=media-video/mplayer-0.90_pre10
+	>=media-libs/a52dec-0.7.3
 	>=media-libs/libdv-0.9.5
 	x86? ( dev-lang/nasm )
 	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
+	avi? (	<=media-video/avifile-0.7.22
+		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
+	<=media-video/avifile-0.7.22
 	>=media-video/avifile-0.7.4
 	media-libs/libdvdread"
-# Dont want to build without these currently
-#	avi? ( >=media-video/avifile-0.7.4 )
-#	dvd? ( media-libs/libdvdread )"
+
 
 src_unpack() {
 	unpack ${A}
@@ -45,6 +46,9 @@ src_unpack() {
 		cd ${S}
 		patch -p1 < ${FILESDIR}/transcode-0.6.0_pre5.diff || die
 	fi
+
+	# Fix GET_PP_QUALITY_MAX error
+	cd ${S}; patch -p1 <  ${FILESDIR}/${MY_P}-PP_QUALITY_MAX.patch || die
 }
 
 src_compile() {
@@ -64,15 +68,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-sse" \
 		|| myconf="${myconf} --disable-sse"
 
-#	use avi \
-#		&& myconf="${myconf} --with-avifile-mods --enable-avifile6" \
-#		|| myconf="${myconf} --without-avifile-mods --disable-avifile6"
-#
-#	use dvd \
-#		&& myconf="${myconf} --with-dvdread" \
-#		|| myconf="${myconf} --without-dvdread"
-#
-# Dont currently want to build without these
 	myconf="${myconf} --with-dvdread --with-avifile-mods --enable-avifile6"   
 
 	use encode \
diff --git a/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild b/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild
deleted file mode 100644
index a5fd6bd34901..000000000000
--- a/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.0_pre5-r2.ebuild,v 1.6 2002/10/05 05:39:16 drobbins Exp $
-
-IUSE="sse mpeg avi dvd encode X quicktime mmx"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="video stream processing tool"
-SRC_URI="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/${MY_P}.tgz"
-HOMEPAGE="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode"
-
-# Note: transcode can use pretty much any media-related package ever written as
-# a plugin. An exhaustive dep list would make me add about 20-30 packages to 
-# portage. perhaps another time :-)
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/a52dec-0.7.3
-	=media-libs/libdv-0.9.5*
-	media-libs/libsdl
-	dev-lang/nasm
-	=x11-libs/gtk+-1.2*
-	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
-	dvd? ( media-libs/libdvdread )
-	mpeg? ( media-libs/libmpeg3 )
-	encode? ( >=media-sound/lame-3.89 )
-	quicktime? ( media-libs/quicktime4linux )
-	>=media-video/avifile-0.7.4
-	media-libs/libdvdread"
-# Dont want to build without these currently
-#	avi? ( >=media-video/avifile-0.7.4 )
-#	dvd? ( media-libs/libdvdread )"
-
-src_unpack() {
-	unpack ${A}
-
-	[ -z "${CC}" ] && CC="gcc"
-	if [ "`${CC} --version | cut -f1 -d.`" = "3" ];
-	then
-		patch -p0 < ${FILESDIR}/${P}.diff || die
-	fi
-}
-
-src_compile() {
-
-	# fix invalid paths in .la files of plugins
-	libtoolize --copy --force
-
-	local myconf=""
-
-	use mmx \
-		&& myconf="${myconf} --enable-mmx"
-	use mmx || ( use 3dnow || use sse ) \
-		|| myconf="${myconf} --disable-mmx"
-	# Dont disable mmx if 3dnow or sse are requested.
-
-	use sse \
-		&& myconf="${myconf} --enable-sse" \
-		|| myconf="${myconf} --disable-sse"
-
-#	use avi \
-#		&& myconf="${myconf} --enable-avifile6" \
-#		|| myconf="${myconf} --disable-avifile6"
-#
-#	use dvd \
-#		&& myconf="${myconf} --enable-dvdread" \
-#		|| myconf="${myconf} --disable-dvdread"
-# Dont currently want to build without these
-	myconf="${myconf} --enable-dvdread --enable-avifile6"	
-	use encode \
-		&& myconf="${myconf} --with-lame" \
-		|| myconf="${myconf} --without-lame"
-	
-	use mpeg \
-		&& myconf="${myconf} --with-libmpeg3" \
-		|| myconf="${myconf} --without-libmpeg3"
-
-	use quicktime \
-		|| myconf="${myconf} --without-qt --without-openqt"
-
-	use X \
-		&& myconf="${myconf} --enable-x" \
-		|| myconf="${myconf} --disable-x"
-	
-	econf ${myconf} || die
-
-	emake all || die
-
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		install || die
-	
-	dodoc AUTHORS COPYING ChangeLog README TODO
-}
-
diff --git a/media-video/transcode/transcode-0.6.1-r1.ebuild b/media-video/transcode/transcode-0.6.1-r1.ebuild
index 5a8185801e2b..aea2ecf256ee 100644
--- a/media-video/transcode/transcode-0.6.1-r1.ebuild
+++ b/media-video/transcode/transcode-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.1-r1.ebuild,v 1.1 2002/11/15 20:56:13 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.1-r1.ebuild,v 1.2 2003/01/19 00:44:52 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -25,17 +25,16 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	>=media-video/mplayer-0.90_pre10
 	x86? ( dev-lang/nasm )
 	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
+	avi? (	<=media-video/avifile-0.7.22 	
+		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
+	<=media-video/avifile-0.7.22 
 	>=media-video/avifile-0.7.4
 	media-libs/libdvdread"
-# Dont want to build without these currently
-#	avi? ( >=media-video/avifile-0.7.4 )
-#	dvd? ( media-libs/libdvdread )"
 
 src_unpack() {
 
@@ -63,15 +62,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-sse" \
 		|| myconf="${myconf} --disable-sse"
 
-#	use avi \
-#		&& myconf="${myconf} --with-avifile-mods --enable-avifile6" \
-#		|| myconf="${myconf} --without-avifile-mods --disable-avifile6"
-#
-#	use dvd \
-#		&& myconf="${myconf} --with-dvdread" \
-#		|| myconf="${myconf} --without-dvdread"
-#
-# Dont currently want to build without these
 	myconf="${myconf} --with-dvdread --with-avifile-mods --enable-avifile6"   
 
 	use encode \
diff --git a/media-video/transcode/transcode-0.6.1.ebuild b/media-video/transcode/transcode-0.6.1.ebuild
deleted file mode 100644
index 842ef67568e5..000000000000
--- a/media-video/transcode/transcode-0.6.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.1.ebuild,v 1.1 2002/10/29 16:53:43 phoenix Exp $
-
-IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
-
-inherit libtool
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="video stream processing tool"
-SRC_URI="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/${MY_P}.tgz"
-HOMEPAGE="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode"
-
-# Note: transcode can use pretty much any media-related package ever written as
-# a plugin. An exhaustive dep list would make me add about 20-30 packages to 
-# portage. perhaps another time :-)
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=media-libs/a52dec-0.7.3
-	>=media-libs/libdv-0.9.5
-	x86? ( dev-lang/nasm )
-	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
-	dvd? ( media-libs/libdvdread )
-	mpeg? ( media-libs/libmpeg3 )
-	encode? ( >=media-sound/lame-3.89 )
-	sdl? ( media-libs/libsdl )
-	quicktime? ( media-libs/quicktime4linux )
-	>=media-video/avifile-0.7.4
-	media-libs/libdvdread"
-# Dont want to build without these currently
-#	avi? ( >=media-video/avifile-0.7.4 )
-#	dvd? ( media-libs/libdvdread )"
-
-src_compile() {
-
-	# fix invalid paths in .la files of plugins
-	elibtoolize
-
-	local myconf=""
-
-	use mmx \
-		&& myconf="${myconf} --enable-mmx"
-	use mmx || ( use 3dnow || use sse ) \
-		|| myconf="${myconf} --disable-mmx"
-	# Dont disable mmx if 3dnow or sse are requested.
-
-	use sse \
-		&& myconf="${myconf} --enable-sse" \
-		|| myconf="${myconf} --disable-sse"
-
-#	use avi \
-#		&& myconf="${myconf} --with-avifile-mods --enable-avifile6" \
-#		|| myconf="${myconf} --without-avifile-mods --disable-avifile6"
-#
-#	use dvd \
-#		&& myconf="${myconf} --with-dvdread" \
-#		|| myconf="${myconf} --without-dvdread"
-#
-# Dont currently want to build without these
-	myconf="${myconf} --with-dvdread --with-avifile-mods --enable-avifile6"   
-
-	use encode \
-		&& myconf="${myconf} --with-lame" \
-		|| myconf="${myconf} --without-lame"
-	
-	use mpeg \
-		&& myconf="${myconf} --with-libmpeg3" \
-		|| myconf="${myconf} --without-libmpeg3"
-
-	use quicktime \
-		|| myconf="${myconf} --without-qt --without-openqt"
-
-	use X \
-		&& myconf="${myconf} --enable-x" \
-		|| myconf="${myconf} --disable-x"
-
-	# Use the MPlayer libpostproc if present
-	[ -f ${ROOT}/usr/lib/libpostproc.a ] && \
-	[ -f ${ROOT}/usr/include/postprocess.h ] && \
-		myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/lib"
-	
-	econf ${myconf} || die
-
-	# Do not use emake !!
-	make all || die
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		install || die
-	
-	dodoc AUTHORS COPYING ChangeLog README TODO
-}
-
diff --git a/media-video/transcode/transcode-0.6.2.20021114.ebuild b/media-video/transcode/transcode-0.6.2.20021114.ebuild
index 7866697aba21..00f82ba8b78a 100644
--- a/media-video/transcode/transcode-0.6.2.20021114.ebuild
+++ b/media-video/transcode/transcode-0.6.2.20021114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.2.20021114.ebuild,v 1.1 2002/11/17 09:38:03 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.2.20021114.ebuild,v 1.2 2003/01/19 00:44:52 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -24,12 +24,14 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	>=media-libs/libdv-0.9.5
 	x86? ( dev-lang/nasm )
 	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
+	avi? ( <=media-video/avifile-0.7.22
+		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
+	<=media-video/avifile-0.7.22
 	>=media-video/avifile-0.7.4
 	media-libs/libdvdread
 	>=media-video/mplayer-0.90_pre10"
diff --git a/media-video/transcode/transcode-0.6.2.ebuild b/media-video/transcode/transcode-0.6.2.ebuild
index b7716968b135..eef3e74ffc6d 100644
--- a/media-video/transcode/transcode-0.6.2.ebuild
+++ b/media-video/transcode/transcode-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.2.ebuild,v 1.2 2003/01/07 10:53:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.2.ebuild,v 1.3 2003/01/19 00:44:52 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -24,12 +24,14 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	>=media-libs/libdv-0.9.5
 	>=dev-lang/nasm-0.98.34
 	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
+	avi? ( <=media-video/avifile-0.7.22
+		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
+	<=media-video/avifile-0.7.22
 	>=media-video/avifile-0.7.4
 	media-libs/libdvdread
 	>=media-video/mplayer-0.90_pre10"
diff --git a/media-video/transcode/transcode-0.6.3.20021205.ebuild b/media-video/transcode/transcode-0.6.3.20021205.ebuild
index f04c92b995f4..66e44e8434f8 100644
--- a/media-video/transcode/transcode-0.6.3.20021205.ebuild
+++ b/media-video/transcode/transcode-0.6.3.20021205.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.3.20021205.ebuild,v 1.1 2002/12/11 15:56:19 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.3.20021205.ebuild,v 1.2 2003/01/19 00:44:52 mholzer Exp $
 
 IUSE="sdl mmx mpeg sse dvd encode X quicktime avi"
 
@@ -24,12 +24,14 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	>=media-libs/libdv-0.9.5
 	>=dev-lang/nasm-0.98.34
 	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.4 )
+	avi? ( <=media-video/avifile-0.7.22
+		>=media-video/avifile-0.7.4 )
 	dvd? ( media-libs/libdvdread )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.89 )
 	sdl? ( media-libs/libsdl )
 	quicktime? ( media-libs/quicktime4linux )
+	<=media-video/avifile-0.7.22
 	>=media-video/avifile-0.7.4
 	media-libs/libdvdread
 	>=media-video/mplayer-0.90_pre10"