Adding latest transcode-1.1.0_alpha for testing with new ffmpeg (hardmasked)

Package-Manager: portage-2.1.5_rc3

4 files changed, 270 insertions, 2 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 3cb482f6d040..73796dce1d78 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.205 2008/04/07 22:25:47 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.206 2008/04/14 01:12:18 yngwin Exp $
+
+*transcode-1.1.0_alpha7 (14 Apr 2008)
+
+  14 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch,
+  +transcode-1.1.0_alpha7.ebuild:
+  Adding latest 1.1.0 alpha, which needs more testing/fixing. Patched for
+  new ffmpeg headers layout (bug #214740).
 
   07 Apr 2008; Ben de Groot <yngwin@gentoo.org>
   transcode-1.1.0_alpha4.ebuild:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index dfb2d79e0c4f..7a45b05ea4eb 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,11 +1,14 @@
+AUX transcode-1.1.0_alpha7-new-ffmpeg-headers.patch 5813 RMD160 9e6b58aacf837da0a05b210a881b8aa258f7b163 SHA1 856ba86777eaaf5b570b94586ab21b84b577d0cd SHA256 a93406412689c17089539cde6114d362379adab21e9c66a94aa7c1af43368290
 DIST transcode-1.0.4.tar.bz2 1989649 RMD160 e0a1ee700cfbfe13d343329e84cb09c29a147562 SHA1 2ff8ddf6b63a184d61fd0f840d647aad707aa970 SHA256 61f5fde9b4fcdb61092e438ef20a595a1c7fe668c361fc09dea42016c4fcec73
 DIST transcode-1.0.5.tar.bz2 1989934 RMD160 7f335fa3f3df4f178b82314bfe661aa34f75e693 SHA1 96f8746a8d54c3ed78f0b5eb32ff7c72313e8e6b SHA256 2545d5139c0e0d690b6f09e18005cfd31d63fe3b6e79f48329219aa3c68471c5
 DIST transcode-1.0.6rc1.tar.bz2 1959975 RMD160 6ab9e58f93d1e0bb8e20699f643cfbd4f41e4d38 SHA1 0d40a1d22e46d927400517db5c27fe765f0f1d1b SHA256 5bff57350a34f5cfe3445d90d364c7c30eb83d7a3192a955ae0986053c5c478d
 DIST transcode-1.1.0alpha4.tar.bz2 2330866 RMD160 1c8623f579011e895b6ca5f36424aa6933399079 SHA1 0dc6590d9d7970709e546554dcd5526bcd8d9580 SHA256 4c689838201648c3ff4aca93cbd15e8dd6b584e027edd85561e1b7aac2a9191c
+DIST transcode-1.1.0alpha7.tar.bz2 2038848 RMD160 fc805be1aa95f49feb2a574bc1cfb7d8c8614cab SHA1 0f329d33cf1fcf5d16ea727087740c25a7664ed2 SHA256 f7e380b220f0202c259af4ad794c27c37b98f9a946d0b435eae0296d88ad3ffe
 EBUILD transcode-1.0.4-r2.ebuild 3806 RMD160 e2c73d319bde9dfb7c9da7cd7629b827eb7fb59b SHA1 96ebfd932a5a8d0e9d284f465240ee003e7f0bcc SHA256 0a72b4bb00268a9c52558c307b8fc9bf1a04ba4d1d79474c0ba6f3a063c7a64c
 EBUILD transcode-1.0.4.ebuild 3894 RMD160 ac76be605112438e794cb0a90a95f3f014674bce SHA1 13a243d33b0ce0329ee7461f943e5df6b2456476 SHA256 5d3355b5659232b4c401842188bcf8adfc7f88574adf867377ed4c900e6608bf
 EBUILD transcode-1.0.5-r2.ebuild 3821 RMD160 72c98fb2191943187ddba977f10bc8b463936d07 SHA1 f11c109b101923762fc16faa09fc00a8dcd56deb SHA256 19d0a2687f6c29e8100885930d9a8462b476909229aae443d3ddc4f04f3bcf78
 EBUILD transcode-1.0.6_rc1-r1.ebuild 4136 RMD160 fe637d50886e570e844625dfed7e0dbbf31bd548 SHA1 67c7b282c48505a97328a5956a3416a83c7cf5b4 SHA256 b85cbcb5d784c5a6df413683c03b599ff1c7647bed5a0af2407887c97af28a93
 EBUILD transcode-1.1.0_alpha4.ebuild 3506 RMD160 c3ee5b60855b24abdf29ece8d396ad0347392520 SHA1 60489b85b798f5beb4bf4890eac5ba6a51f6610a SHA256 5593f9b61c725cae12f5b4189930b74e22c4bdbf7648b152fd9ad67afb170e41
-MISC ChangeLog 35692 RMD160 5823a5ef10e133dade32e0269487e84018028fd5 SHA1 a5091a1bc8e2ecf45b4b8ca926c42a428fc2aa3c SHA256 a1745c3acb4593a8de02c13aa1a3ee2c6e0899c1d2aa19333f5598196105710d
+EBUILD transcode-1.1.0_alpha7.ebuild 3797 RMD160 36ead8011f68b0748e20158794d3f6919e73ee74 SHA1 591726a59537f3fdd80a848831724df1f4d3e03c SHA256 e0e12261d9f4cabbe2af982b77723dab569d8071541b0451b27726cb4162c56c
+MISC ChangeLog 35989 RMD160 7d70685972a8da191b27c81ce6a6554a8b3e533a SHA1 2c8ba2ed17a5c6b5b016b8004796dbe404a45991 SHA256 c8fd57e754b4bbbd94e7eda5c6b8e1e0a88ef9040c1a28e0a3b132751f583182
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/transcode/files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch b/media-video/transcode/files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch
new file mode 100644
index 000000000000..5dd98f64f048
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch
@@ -0,0 +1,131 @@
+diff -burN transcode-1.1.0alpha7.orig/configure.in transcode-1.1.0alpha7/configure.in
+--- transcode-1.1.0alpha7.orig/configure.in	2008-01-27 16:22:30.000000000 +0100
++++ transcode-1.1.0alpha7/configure.in	2008-04-14 02:09:54.000000000 +0200
+@@ -598,14 +598,14 @@
+   esac],
+   [enable_libavcodec_static=no])
+ LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS $($PKG_CONFIG --libs libavcodec)"
+-TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/avcodec.h],
++TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [libavcodec/avcodec.h],
+  avcodec, avcodec_thread_init, libavcodec, [http://www.ffmpeg.org/])
+ if test x"$have_libavcodec" = x"yes" ; then
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $LIBAVCODEC_CFLAGS"
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ int
+ main()
+ {
+@@ -625,8 +625,8 @@
+     [LIBAVCODEC_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`"
+       LIBAVCODEC_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"],
+     [AC_MSG_RESULT([failed])
+-     TC_PKG_ERROR(libavcodec, ffmpeg/avcodec.h, required, FFmpeg, [http://www.ffmpeg.org],
+-      [cannot compile ffmpeg/avcodec.h])],
++     TC_PKG_ERROR(libavcodec, libavcodec/avcodec.h, required, FFmpeg, [http://www.ffmpeg.org],
++      [cannot compile libavcodec/avcodec.h])],
+     [AC_MSG_RESULT([cross compiling; assumed OK...])
+       LIBAVCODEC_VERSION=""
+       LIBAVCODEC_BUILD=""])
+@@ -637,7 +637,7 @@
+     save_LIBS="$LIBS"
+     dnl $_w_libavcodec_l comes from TC_PKG_CHECK()
+     LIBS="$LIBS $w_libavcodec_l${deflib}/libavcodec.a $LIBAVCODEC_EXTRA_LIBS"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffmpeg/avcodec.h>],[[
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libavcodec/avcodec.h>],[[
+ AVCodecContext *ctx = (void *)0;
+ avcodec_thread_init(ctx, 0);
+ ]])],
+@@ -665,15 +665,15 @@
+   esac],
+   [enable_libavformat_static=no])
+ LIBAVFORMAT_EXTRA_LIBS="$LIBAVFORMAT_EXTRA_LIBS $($PKG_CONFIG --libs libavformat)"
+-TC_PKG_CHECK(libavformat, required, LIBAVFORMAT, no, [ffmpeg/avformat.h],
++TC_PKG_CHECK(libavformat, required, LIBAVFORMAT, no, [libavformat/avformat.h],
+  avformat, av_register_all, libavformat, [http://www.ffmpeg.org/])
+ if test x"$have_libavformat" = x"yes" ; then
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $LIBAVFORMAT_CFLAGS"
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
+ int
+ main()
+ {
+@@ -693,8 +693,8 @@
+     [LIBAVFORMAT_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`"
+       LIBAVFORMAT_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"],
+     [AC_MSG_RESULT([failed])
+-     TC_PKG_ERROR(libavformat, ffmpeg/avformat.h, required, FFmpeg, [http://www.ffmpeg.org],
+-      [cannot compile ffmpeg/avformat.h])],
++     TC_PKG_ERROR(libavformat, libavformat/avformat.h, required, FFmpeg, [http://www.ffmpeg.org],
++      [cannot compile libavformat/avformat.h])],
+     [AC_MSG_RESULT([cross compiling; assumed OK...])
+       LIBAVCODEC_VERSION=""
+       LIBAVCODEC_BUILD=""])
+@@ -705,7 +705,7 @@
+     save_LIBS="$LIBS"
+     dnl $_w_libavcodec_l comes from TC_PKG_CHECK()
+     LIBS="$LIBS $w_libavcodec_l${deflib}/libavcodec.a $w_libavformat_l${deflib}/libavformat.a $LIBAVFORMAT_EXTRA_LIBS"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffmpeg/avcodec.h>],[[
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libavcodec/avcodec.h>],[[
+ av_register_all();
+ ]])],
+       [LIBAVFORMAT_LIBS="$LIBS $w_libavcodec_l${deflib}/libavcodec.a $w_libavformat_l${deflib}/libavformat.a $LIBAVFORMAT_EXTRA_LIBS"],
+diff -burN transcode-1.1.0alpha7.orig/export/ffmpeg_cfg.h transcode-1.1.0alpha7/export/ffmpeg_cfg.h
+--- transcode-1.1.0alpha7.orig/export/ffmpeg_cfg.h	2006-04-17 17:48:43.000000000 +0200
++++ transcode-1.1.0alpha7/export/ffmpeg_cfg.h	2008-04-14 02:10:29.000000000 +0200
+@@ -2,7 +2,7 @@
+ #define __FFMPEG_CFG_H
+
+ #include "libtc/cfgfile.h"
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+
+ //char *lavc_param_vcodec = "mpeg4";
+ //extern int lavc_param_vbitrate;
+diff -burN transcode-1.1.0alpha7.orig/filter/filter_resample.c transcode-1.1.0alpha7/filter/filter_resample.c
+--- transcode-1.1.0alpha7.orig/filter/filter_resample.c	2007-06-06 22:37:16.000000000 +0200
++++ transcode-1.1.0alpha7/filter/filter_resample.c	2008-04-14 02:12:20.000000000 +0200
+@@ -37,7 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcmodule-plugin.h"
+
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+
+ typedef struct
+ {
+diff -burN transcode-1.1.0alpha7.orig/libtc/tcavcodec.h transcode-1.1.0alpha7/libtc/tcavcodec.h
+--- transcode-1.1.0alpha7.orig/libtc/tcavcodec.h	2007-08-08 19:53:33.000000000 +0200
++++ transcode-1.1.0alpha7/libtc/tcavcodec.h	2008-04-14 02:13:42.000000000 +0200
+@@ -27,9 +27,9 @@
+ #include "config.h"
+ #endif
+
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avutil.h>
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavutil/avutil.h>
+
+ /*************************************************************************/
+
+diff -burN transcode-1.1.0alpha7.orig/configure.in transcode-1.1.0alpha7/configure.in
+--- transcode-1.1.0alpha7.orig/configure.in     2008-04-14 02:27:10.000000000 +0200
++++ transcode-1.1.0alpha7/configure.in  2008-04-14 02:32:52.000000000 +0200
+@@ -822,7 +822,7 @@
+ dnl libpostproc
+ dnl
+ LIBPOSTPROC_EXTRA_LIBS="$LIBPOSTPROC_EXTRA_LIBS $($PKG_CONFIG --libs libpostproc)"
+-TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, [postproc/postprocess.h],
++TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, [libpostproc/postprocess.h],
+   postproc, pp_postprocess, libpostproc, [http://www.ffmpeg.org/])
+ TC_PKG_HAVE(libpostproc, LIBPOSTPROC)
+
diff --git a/media-video/transcode/transcode-1.1.0_alpha7.ebuild b/media-video/transcode/transcode-1.1.0_alpha7.ebuild
new file mode 100644
index 000000000000..e937e471a9de
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.0_alpha7.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.0_alpha7.ebuild,v 1.1 2008/04/14 01:12:18 yngwin Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.10"
+
+inherit libtool flag-o-matic eutils multilib autotools
+
+MY_PV=${PV/_alpha/alpha}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="video stream processing tool"
+HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode"
+SRC_URI="http://fromani.exit1.org/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X 3dnow a52 aac alsa altivec dv dvdread iconv imagemagick jpeg lzo mjpeg mp3 mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l2 vorbis x264 xvid xml"
+
+RDEPEND="a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvdread? ( media-libs/libdvdread )
+	xvid? ( media-libs/xvid )
+	mjpeg? ( media-video/mjpegtools )
+	lzo? ( >=dev-libs/lzo-2 )
+	imagemagick? ( media-gfx/imagemagick )
+	mp3? ( media-sound/lame )
+	sdl? ( media-libs/libsdl )
+	quicktime? ( >=media-libs/libquicktime-0.9.3 )
+	vorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libogg )
+	theora? ( media-libs/libtheora )
+	jpeg? ( media-libs/jpeg )
+	truetype? ( >=media-libs/freetype-2 )
+	>=media-video/ffmpeg-0.4.9_p20080326
+	|| ( sys-libs/glibc dev-libs/libiconv )
+	media-libs/libmpeg2
+	x264? ( media-libs/x264 )
+	xml? ( dev-libs/libxml2 )
+	X? ( x11-libs/libXpm
+		x11-libs/libXaw
+		x11-libs/libXv )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	dosed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
+		"${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
+		"${S}"/docs/release-notes/Makefile.am
+
+	# patch for new ffmpeg headers outlay, bug #214740
+	epatch "${FILESDIR}"/${P}-new-ffmpeg-headers.patch
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -maltivec -mabi=altivec -momit-leaf-frame-pointer
+	#145849
+	use amd64 && filter-flags -fweb
+
+	if use ppc || use ppc64 ; then
+		append-flags -U__ALTIVEC__
+	fi
+
+	append-flags -DDCT_YUV_PRECISION=1
+
+	use xvid && myconf="${myconf} --with-default-xvid=xvid4"
+	# NuppelVideo is supported only on x86 platform yet
+	# TODO: mask nuv useflag for all other arches
+	use x86 && myconf="${myconf} $(use_enable nuv)"
+	# TODO: these two need work
+	#	$(use_enable postproc libpostproc) - compile error
+	#	$(use_enable imagemagick) - can't find header
+	myconf="${myconf} \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable altivec) \
+		$(use_enable v4l2 v4l) \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable truetype freetype2) \
+		$(use_enable mp3 lame) \
+		$(use_enable x264) \
+		$(use_enable xvid) \
+		$(use_enable ogg) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable dvdread libdvdread) \
+		$(use_enable dv libdv) \
+		$(use_enable quicktime libquicktime) \
+		$(use_enable lzo) \
+		$(use_enable a52) \
+		$(use_enable aac faac) \
+		$(use_enable xml libxml2) \
+		$(use_enable mjpeg mjpegtools) \
+		$(use_enable sdl) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable iconv) \
+		$(use_with X x) \
+		--with-mod-path=/usr/$(get_libdir)/transcode \
+		--with-libpostproc-libs=/usr/$(get_libdir)"
+		econf ${myconf} || die "econf failed"
+
+	emake all || die "emake all failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -fr "${D}/usr/share/doc/transcode"
+
+	dodoc AUTHORS ChangeLog README TODO STYLE
+	dodoc docs/*
+	dohtml docs/html/*
+}