Update version. Also fix bug #30877 properly.

4 files changed, 197 insertions, 3 deletions

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 82969b81462a..1d4fdd357d95 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,7 +1,7 @@
 MD5 14237dfabcd8e09cda2baea2b81f450d transcode-0.6.10.ebuild 3777
-MD5 8bce3a80b72d96b67abc8f2afc71298f ChangeLog 10595
-MD5 1790689d31e626d10942d9c1a80101c7 transcode-0.6.11.ebuild 3678
+MD5 d3f63bac83d9792a882201b96c5766e5 ChangeLog 10861
+MD5 5907494be5c302f066b2484e22a8286b transcode-0.6.11.ebuild 3678
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 bc1cb5a39d56ce5216c803c74e73545d files/digest-transcode-0.6.11 69
 MD5 ef79fbe94405505c11c537e07b25c669 files/digest-transcode-0.6.10 69
-MD5 073902a6a601ccebe91ffa24c84ca1a3 files/transcode-0.6.11-no-mmx.patch 896
+MD5 3b957eef288ce095a2ff0a256aec7c93 files/transcode-0.6.11-no-mmx.patch 1491
diff --git a/media-video/transcode/files/digest-transcode-0.6.11 b/media-video/transcode/files/digest-transcode-0.6.11
new file mode 100644
index 000000000000..e77ea69d4515
--- /dev/null
+++ b/media-video/transcode/files/digest-transcode-0.6.11
@@ -0,0 +1 @@
+MD5 f57c9cc96d2c120aaebea67c7f0de83d transcode-0.6.11.tar.gz 3306196
diff --git a/media-video/transcode/files/transcode-0.6.11-no-mmx.patch b/media-video/transcode/files/transcode-0.6.11-no-mmx.patch
new file mode 100644
index 000000000000..12a69f41b9ab
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.11-no-mmx.patch
@@ -0,0 +1,52 @@
+diff -urpN transcode-0.6.11/config.h.in transcode-0.6.11.az/config.h.in
+--- transcode-0.6.11/config.h.in	2003-11-06 22:00:11.037925040 +0200
++++ transcode-0.6.11.az/config.h.in	2003-11-06 21:53:14.481251280 +0200
+@@ -1,3 +1,6 @@
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ 
+ /* Define if your CPU is PPC */
+@@ -390,3 +393,5 @@
+ 
+ /* Define to `unsigned' if <sys/types.h> does not define. */
+ #undef size_t
++
++#endif /* __CONFIG_H */
+diff -urpN transcode-0.6.11/ffmpeg/av_config.h transcode-0.6.11.az/ffmpeg/av_config.h
+--- transcode-0.6.11/ffmpeg/av_config.h	2003-11-06 22:00:11.038924888 +0200
++++ transcode-0.6.11.az/ffmpeg/av_config.h	2003-11-06 22:04:33.472028992 +0200
+@@ -1,4 +1,12 @@
+ /* Map transcode configure defines to libavcodecs */
++#ifndef __AV_CONFIG_H
++#define __AV_CONFIG_H
++
++/* Kludge to see if we had HAVE_MMX defined before we included
++ * config.h - see below ... */
++#ifndef HAVE_MMX
++#define HAD_MMX_FALSE
++#endif
+ 
+ #include "config.h"
+ 
+@@ -15,6 +23,13 @@
+ #  define ARCH_POWERPC
+ #endif
+ 
++/* We use HAVE_MMX, but for ffmpeg the Makefile's set it, so
++ * unset it here, else ffmpeg use MMX constructs, even if we
++ * have --disable-mmx */
++#if defined(HAD_MMX_FALSE) && defined(HAVE_MMX)
++#undef HAVE_MMX
++#endif
++
+ #ifdef HAVE_DLOPEN
+ #  define CONFIG_HAVE_DLOPEN 1
+ #endif
+@@ -44,3 +59,5 @@
+ #define CONFIG_ZLIB 1
+ #define SIMPLE_IDCT 1
+ #define restrict __restrict__
++
++#endif /* __AV_CONFIG_H */
diff --git a/media-video/transcode/transcode-0.6.11.ebuild b/media-video/transcode/transcode-0.6.11.ebuild
new file mode 100644
index 000000000000..85de87bcad04
--- /dev/null
+++ b/media-video/transcode/transcode-0.6.11.ebuild
@@ -0,0 +1,141 @@
+# 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.11.ebuild,v 1.1 2003/11/06 20:30:35 azarah Exp $
+
+inherit libtool flag-o-matic eutils
+# Don't build with -mfpmath=sse || -fPic or it will break. (Bug #14920)
+filter-mfpmath sse
+filter-flags -fPIC
+filter-flags -maltivec -mabi=altivec
+
+MY_P="${P/_pre/.}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="video stream processing tool"
+HOMEPAGE="http://zebra.fh-weingarten.de/~transcode/"
+SRC_URI="http://www.zebra.fh-weingarten.de/~transcode/pre/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="sdl mmx mpeg sse 3dnow encode X quicktime avi altivec"
+
+DEPEND=">=media-libs/a52dec-0.7.4
+	>=media-libs/libdv-0.99
+	x86? ( >=dev-lang/nasm-0.98.36 )
+	>=media-libs/libdvdread-0.9.0
+	>=media-video/ffmpeg-0.4.6
+	>=media-libs/xvid-0.9.1
+	>=media-video/mjpegtools-1.6.0
+	>=dev-libs/lzo-1.08
+	>=media-libs/libfame-0.9.0
+	>=media-gfx/imagemagick-5.5.6.0
+	media-libs/netpbm
+	X? ( virtual/x11 )
+	avi? (	>=media-video/avifile-0.7.38 )
+	avi? ( x86? ( >=media-libs/divx4linux-20030428 ) )
+	mpeg? ( media-libs/libmpeg3 )
+	encode? ( >=media-sound/lame-3.93 )
+	sdl? ( media-libs/libsdl )
+	quicktime? ( virtual/quicktime )"
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version  '>=media-libs/netpbm-9.13'
+	then
+		einfo "New netbpm (>9.12)..."
+		sed -i 's:-lppm:-lnetpbm:' \
+			${S}/contrib/subrip/Makefile
+	else
+		einfo "Old netbpm (<=9.12)..."
+	fi
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-no-mmx.patch
+}
+
+src_compile() {
+	local myconf="--with-dvdread"
+
+	# fix invalid paths in .la files of plugins
+	elibtoolize
+
+	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 3dnow \
+		&& myconf="${myconf} --enable-3dnow" \
+		|| myconf="${myconf} --disable-3dnow"
+
+	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"
+
+	if [ "`use quicktime`" ]; then
+		has_version 'media-libs/openquicktime' \
+			&& myconf="${myconf} --with-openqt --without-qt" \
+			|| myconf="${myconf} --without-openqt --with-qt"
+	fi
+
+	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/postproc/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"
+
+	# workaround for including avifile haders, which are expected
+	# in an directory named "avifile"
+	use avi \
+		&& avi_inc=$(avifile-config --cflags | sed -e "s|^-I||") \
+		&& [ -d "$avi_inc" ] \
+		&& [ "$(basename "$avi_inc")" != "avifile" ] \
+		&& ln -s "$avi_inc" avifile
+
+	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 ""
+}