Fix building with media-video/ffmpeg >= 0.10 and USE="postproc" wrtt #401287 by Olaf Freyer

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 150 insertions, 7 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 1a837d6dd6d7..cb0ab7e9c216 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.294 2012/01/04 18:08:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.295 2012/01/30 21:34:18 ssuominen Exp $
+
+*transcode-1.1.7-r1 (30 Jan 2012)
+
+  30 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +transcode-1.1.7-r1.ebuild, +files/transcode-1.1.7-ffmpeg-0.10.patch:
+  Fix building with media-video/ffmpeg >= 0.10 and USE="postproc" wrtt #401287
+  by Olaf Freyer
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> transcode-1.1.7.ebuild:
   x86 stable wrt bug #395729
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 4a450ebf8c8b..7bfa10b298b5 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX transcode-1.0.6-imagemagick.patch 672 RMD160 2d1ab8cf8ca9846c8ca5de24033b358985050f85 SHA1 e2e2890f9217c068755d094fd1f656d8c344a69c SHA256 bd4d8aa5577fabac5becb03539db1e547e72cd2e4748cd53c62e8032acaf41ac
 AUX transcode-1.1.4-x264.patch 1837 RMD160 6ec8925ca714f688df06f5df229c741ca2076708 SHA1 6f54bbebc996e4576e31f16d22863f23de2ce2d9 SHA256 f1746212a2b2f2bfc01cce0e26c83c2392dbd776878a76e627f7ec809f5da0a9
 AUX transcode-1.1.5-ffmpeg.patch 6128 RMD160 7c21b8daf99b599f0b3005cd2b08ae5c894c4552 SHA1 2d3bb4486394ee55540e772f134e193874e5c2b4 SHA256 a0246b84d12d289a940468a289ad5471c29d7a35c8317293a0dc0c7428445487
 AUX transcode-1.1.5-jpeg-7.patch 460 RMD160 2e5f96ff0700890814e1af2338fe0d7dde147f04 SHA1 9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977 SHA256 f4807d5f598e387a7056c41bc0fefd29f61b75dcf946e2894c783481f6a627bd
 AUX transcode-1.1.5-mpa.patch 583 RMD160 6500b698ff0f46e2eeae47acd1d4e4c4c2f1cd4d SHA1 6f45d9167c3aa15a83cb29545749f55eb1f1e5a2 SHA256 9b31976d3104e024c3fd339d501575c48d3cbadc99bb3121e5934d48bc6fc193
+AUX transcode-1.1.7-ffmpeg-0.10.patch 402 RMD160 bf22b44f38e3191d24c9483c9d354b57e06ac8ea SHA1 3b1590f30f8f32350444f668584ec31be6e8e614 SHA256 5df30ce0bdaee1d61a5dd94d242ce010dc043305553519a1532c33b2628ec308
 AUX transcode-1.1.7-ffmpeg.patch 2274 RMD160 9873bd9a8ba3336948336a508551ca3dd0ceaabd SHA1 cc81c190db51d8a64623e2eea3b327ec7eb7ec57 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61
 DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009
 DIST transcode-1.1.7.tar.bz2 2183627 RMD160 faa854acbbfd52faaa216505176f94d756d77841 SHA1 e35df68b960eb56ef0a59a4cdbed1491be56aee6 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92
 EBUILD transcode-1.1.5-r2.ebuild 4068 RMD160 28a0702c2d17db840b4914e679436103bcc0e32b SHA1 c6151bb2cab015e00ea8af9bcb08f3909e96ce18 SHA256 270250fe0f65571ed21827260ebed39e4430d0a442458c0bdece21281b190841
+EBUILD transcode-1.1.7-r1.ebuild 3143 RMD160 96048c7c2cfc6cce79e5d976dd0098557a6a014a SHA1 f42de5013c51110f57023347147db12b8987040a SHA256 771692ac4118108bea53ed199a6e668a0718ab0bbfc012b2efe22d85685eb59f
 EBUILD transcode-1.1.7.ebuild 3093 RMD160 84e9a39c93be9199466bd5a138692a79c954468d SHA1 9384eb4b3733f51b0e71173b5d8d6a9e8e05a589 SHA256 203c46cc2ba899b9530186816971fe6940deb42714658b4d6f27345ef89cca61
-MISC ChangeLog 48858 RMD160 a9236ee701ef163476a5a851eeb3a09b84670c61 SHA1 1f3ea622d9bef437e00abd2f248a079b141f2bc4 SHA256 dda82128cd3d42acc74e2913f41b2649ff7878155b05e8703e542c4f7c584f75
+MISC ChangeLog 49115 RMD160 e9969f6e0d0664315b874420d901f451467209a5 SHA1 d8e5c29187f476448bcfe6e9a72a45c111e0ceeb SHA256 e59885a99d226568fd78a722bcd78fe7a358b5ab3c51ed10fb6ea03af776a799
 MISC metadata.xml 529 RMD160 c52a55dcb8ffedb63e2ddbc99d4bf959f9772550 SHA1 f26965716f7025486b78a2c953efd9180ed82fb5 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8ElasACgkQuUQtlDBCeQJHqACfShbOsck4cCt459fyOtkjtlSr
-zSYAn09aIzBGuNUY8n+hG24Njd8FbFRT
-=D6i0
+iQEcBAEBAgAGBQJPJwxHAAoJEEdUh39IaPFNlXgH/RRBR4TPS7ZOEQIpRN6/L7ca
++cyzMqPAIrkxgt3b5u6iAeLsUv8HvuEbI2SFZYgMSMIvzZq7a/lInmzXhyWQk+3d
+bHWEY25rXU6yybj6rXmorzsQu4mcttXqaqbr0cK6bTzNJn26q48mCopUNmNMU+sn
+5PSSFSHA2EN4OsrrjzWvSeZoIg/BgiwUqy9qN3lKVtrHQGsMzImSBifx+Yz44ooq
+s54mTeSYbSICbtm4zAueYOODYziTEdtOfUk/ZMFYddlkOf7Brt09pVnu8/gAmnML
+1Sszu/9ad+CnZdVBh3+Gr2rKWtsavi7q4FnGgvWne8jVwke/I/OQl4zr7KoIq0I=
+=dzDv
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
new file mode 100644
index 000000000000..ea737c8b0984
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/401287
+
+--- filter/filter_pp.c
++++ filter/filter_pp.c
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+ 
diff --git a/media-video/transcode/transcode-1.1.7-r1.ebuild b/media-video/transcode/transcode-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..189ca2ac46a2
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.7-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r1.ebuild,v 1.1 2012/01/30 21:34:18 ssuominen Exp $
+
+EAPI=4
+inherit eutils libtool multilib
+
+DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
+HOMEPAGE="http://tcforge.berlios.de/"
+SRC_URI="http://bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
+
+RDEPEND="
+	virtual/ffmpeg
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faac )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvd? ( media-libs/libdvdread )
+	iconv? ( virtual/libiconv )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg )
+	lzo? ( >=dev-libs/lzo-2 )
+	mjpeg? ( media-video/mjpegtools )
+	mp3? ( media-sound/lame )
+	mpeg? ( media-libs/libmpeg2 )
+	ogg? ( media-libs/libogg )
+	postproc? ( media-video/ffmpeg )
+	quicktime? ( >=media-libs/libquicktime-1 )
+	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2 )
+	v4l? ( media-libs/libv4l )
+	vorbis? ( media-libs/libvorbis )
+	X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv )
+	x264? ( media-libs/x264 )
+	xml? ( dev-libs/libxml2 )
+	xvid? ( media-libs/xvid )
+	"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
+	"
+
+REQUIRED_USE="
+	sse? ( mmx )
+	sse2? ( mmx sse )
+	3dnow? ( mmx )
+	nuv? ( lzo )
+	"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-0.10.patch
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
+
+	econf \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable altivec) \
+		$(use_enable v4l libv4l2) \
+		$(use_enable v4l libv4lconvert) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mpeg libmpeg2convert) \
+		--enable-experimental \
+		--enable-deprecated \
+		$(use_enable v4l) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable postproc libpostproc) \
+		$(use_enable truetype freetype2) \
+		$(use_enable mp3 lame) \
+		$(use_enable xvid) \
+		$(use_enable x264) \
+		$(use_enable ogg) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable dvd 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 imagemagick) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable iconv) \
+		$(use_enable nuv) \
+		$(use_with X x) \
+		--with-mod-path=/usr/$(get_libdir)/transcode \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install
+	dodoc AUTHORS ChangeLog README STYLE TODO
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+}