Fixing ffmpeg depend. version bumped.

6 files changed, 145 insertions, 8 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index a9bd5fc1f6b3..f84cfc422830 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.34 2003/03/17 00:36:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.35 2003/04/16 15:01:59 mholzer Exp $
+
+*transcode-0.6.4.20030409 (16 Apr 2003)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.4.20030311.ebuild,
+  transcode-0.6.4.20030409.ebuild:
+  updating ffmpeg dependency. version bumped.
 
 *transcode-0.6.4.20030311 (24 Feb 2003)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 86fd53ebb814..b46806803728 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,8 +1,8 @@
-MD5 9106a26fad8b43bbb8b56ed3864819dd ChangeLog 7875
+MD5 0d41e849114de32dd1a865190eb60a1b ChangeLog 7875
 MD5 df648b9270825d3e3a34a1837dc21306 transcode-0.6.2.ebuild 3120
-MD5 eabc6fdcc13ab5dd87dd216176efd525 transcode-0.6.4_pre20030409.ebuild 3328
+MD5 15439c8f98abf6323915d5843208876e transcode-0.6.4_pre20030409.ebuild 3331
 MD5 d5980a6ab3d57f2dbbd6d3fdc4bbac73 transcode-0.6.3.ebuild 3060
-MD5 eabc6fdcc13ab5dd87dd216176efd525 transcode-0.6.4_pre20030311.ebuild 3328
+MD5 b270f721e5820163ff633faa7fb5b2bf transcode-0.6.4_pre20030311.ebuild 3331
 MD5 03629a858586307611c7d7c2a2dc1505 files/digest-transcode-0.6.2 68
 MD5 225a843999c440c3060e96b9fe6fca35 files/digest-transcode-0.6.3 68
 MD5 1df31254b872ebb1740a8b5cbcd67dab files/ogg.patch 338
diff --git a/media-video/transcode/files/digest-transcode-0.6.4.20030311 b/media-video/transcode/files/digest-transcode-0.6.4_pre20030311
index 0b8a7a7643d0..0b8a7a7643d0 100644
--- a/media-video/transcode/files/digest-transcode-0.6.4.20030311
+++ b/media-video/transcode/files/digest-transcode-0.6.4_pre20030311
diff --git a/media-video/transcode/files/digest-transcode-0.6.4_pre20030409 b/media-video/transcode/files/digest-transcode-0.6.4_pre20030409
new file mode 100644
index 000000000000..bdfd7f9438ad
--- /dev/null
+++ b/media-video/transcode/files/digest-transcode-0.6.4_pre20030409
@@ -0,0 +1 @@
+MD5 b4b294861065dce78784fd1575893fb9 transcode-0.6.4.20030409.tar.gz 2667037
diff --git a/media-video/transcode/transcode-0.6.4.20030311.ebuild b/media-video/transcode/transcode-0.6.4_pre20030311.ebuild
index 8aa7a44a39ae..391390b33be8 100644
--- a/media-video/transcode/transcode-0.6.4.20030311.ebuild
+++ b/media-video/transcode/transcode-0.6.4_pre20030311.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.4.20030311.ebuild,v 1.1 2003/03/17 00:34:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.4_pre20030311.ebuild,v 1.1 2003/04/16 15:01:59 mholzer Exp $
 
 inherit libtool flag-o-matic
 
@@ -10,10 +10,12 @@ filter-flags -fPic
 
 filter-flags "-maltivec -mabi=altivec"
 
+MY_P="${P/_pre/.}"
+S=${WORKDIR}/${MY_P}
 IUSE="sdl mmx mpeg sse encode X quicktime avi altivec"
 DESCRIPTION="video stream processing tool"
-SRC_URI="http://www.zebra.fh-weingarten.de/~transcode/pre/${P}.tar.gz"
-HOMEPAGE="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode"
+SRC_URI="http://www.zebra.fh-weingarten.de/~transcode/pre/${MY_P}.tar.gz"
+HOMEPAGE="http://zebra.fh-weingarten.de/~transcode/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
@@ -22,7 +24,7 @@ DEPEND=">=media-libs/a52dec-0.7.3
 	x86? ( >=dev-lang/nasm-0.98.34 )
 	>=media-libs/libdvdread-0.9.0
 	>=media-video/mplayer-0.90_pre10
-	>=media-video/ffmpeg-0.4.0
+	>=media-video/ffmpeg-0.4.6
 	>=media-libs/xvid-0.9.0
 	>=media-video/mjpegtools-1.6.0
 	>=dev-libs/lzo-1.08
diff --git a/media-video/transcode/transcode-0.6.4_pre20030409.ebuild b/media-video/transcode/transcode-0.6.4_pre20030409.ebuild
new file mode 100644
index 000000000000..c029f19b5a6c
--- /dev/null
+++ b/media-video/transcode/transcode-0.6.4_pre20030409.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2003 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.4_pre20030409.ebuild,v 1.1 2003/04/16 15:01:59 mholzer Exp $
+
+inherit libtool flag-o-matic
+
+# Don't build with -mfpmath=sse || -fPic or it will break. (Bug #14920)
+filter-flags -mfpmath=sse 
+filter-flags -fPic
+
+filter-flags "-maltivec -mabi=altivec"
+
+MY_P="${P/_pre/.}"
+S=${WORKDIR}/${MY_P}
+IUSE="sdl mmx mpeg sse encode X quicktime avi altivec"
+DESCRIPTION="video stream processing tool"
+SRC_URI="http://www.zebra.fh-weingarten.de/~transcode/pre/${MY_P}.tar.gz"
+HOMEPAGE="http://zebra.fh-weingarten.de/~transcode/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+DEPEND=">=media-libs/a52dec-0.7.3
+	>=media-libs/libdv-0.9.5
+	x86? ( >=dev-lang/nasm-0.98.34 )
+	>=media-libs/libdvdread-0.9.0
+	>=media-video/mplayer-0.90_pre10
+	>=media-video/ffmpeg-0.4.6
+	>=media-libs/xvid-0.9.0
+	>=media-video/mjpegtools-1.6.0
+	>=dev-libs/lzo-1.08
+	>=media-libs/libfame-0.9.0
+	>=media-gfx/imagemagick-5.4.9.0
+	media-libs/netpbm
+	X? ( virtual/x11 )
+	avi? (	>=media-video/avifile-0.7.25 )
+	mpeg? ( media-libs/libmpeg3 )
+	encode? ( >=media-sound/lame-3.89 )
+	sdl? ( media-libs/libsdl )
+	quicktime? ( media-libs/quicktime4linux media-libs/openquicktime )"
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version  '>=media-libs/netpbm-9.13'
+	then
+		einfo "New netbpm (>9.12)..."
+		cp ${S}/contrib/subrip/Makefile ${S}/contrib/subrip/Makefile.orig
+		sed -e 's:-lppm:-lnetpbm:' \
+			${S}/contrib/subrip/Makefile.orig > ${S}/contrib/subrip/Makefile
+	else
+		einfo "Old netbpm (<=9.12)..."
+	fi
+}
+
+src_compile() {
+	# fix invalid paths in .la files of plugins
+	elibtoolize
+
+	local myconf=
+	myconf="--with-dvdread"
+
+	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 altivec \
+		&& myconf="${myconf} --enable-altivec" \
+		|| myconf="${myconf} --disable-altivec"
+
+	use avi \
+		&& myconf="${myconf} --with-avifile-mods --enable-avifile6" \
+		|| myconf="${myconf} --without-avifile-mods --disable-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} --with-qt --with-openqt" \
+		|| 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} CFLAGS="${CFLAGS} -DDCT_YUV_PRECISION=1" || die
+
+	# Do not use emake !!
+	# export CFLAGS="${CFLAGS} -DDCT_YUV_PRECISION=1" 
+	
+	make all || die
+
+	# subrip stuff
+	cd contrib/subrip
+	make || die
+}
+
+src_install () {
+
+	make \
+		DESTDIR=${D} \
+		install || die
+
+	dodoc AUTHORS COPYING ChangeLog README TODO
+
+	# subrip stuff
+	cd contrib/subrip
+	dobin pgm2txt srttool subtitle2pgm subtitle2vobsub
+	einfo ""
+	einfo "This ebuild uses subtitles !!!"
+	einfo ""
+}