put the ffmpeg 0.10 build fix in 1.1.7, it didnt need a revbump for a build fix, so that we can stabilise ffmpeg 0.10

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

4 files changed, 17 insertions, 129 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index a304e59f62c0..da45ff6e20ad 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # 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.296 2012/02/01 01:49:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.297 2012/02/01 14:33:32 aballier Exp $
+
+  01 Feb 2012; Alexis Ballier <aballier@gentoo.org> transcode-1.1.7.ebuild,
+  -transcode-1.1.7-r1.ebuild:
+  put the ffmpeg 0.10 build fix in 1.1.7, it didnt need a revbump for a build
+  fix, so that we can stabilise ffmpeg 0.10
 
   01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> transcode-1.1.7.ebuild:
   ppc/ppc64 stable wrt #395729
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index ec91d93eb5fa..681e15991560 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -11,18 +11,13 @@ AUX transcode-1.1.7-ffmpeg.patch 2274 RMD160 9873bd9a8ba3336948336a508551ca3dd0c
 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 3152 RMD160 7bafd3ec9b290e9fd0346f83b0f5da54637d21d3 SHA1 ce08753fa76e5db3cffa8c0988273c60ebc4cf75 SHA256 1cd659164a0c6a643323cfabeaa6798fe997cc9b9d9e08cc52d932cc68adb708
-EBUILD transcode-1.1.7.ebuild 3090 RMD160 a3b469c17f4c612bdda2773b22645f9326647988 SHA1 9e4c2d51fe9d85275b41ca4f71a32ea26ecf827b SHA256 83fedc6a802b44322786a4fc184ab450f9ed24c7d12d9c07b03f9f16f7513f8e
-MISC ChangeLog 49225 RMD160 e6ae0468a199a91d0f24e79b94c0f053eadd4eb1 SHA1 b3128972900ebb8223d31ea452f399c4846a3d2e SHA256 35dca4ba11996a3ec4990fe9e5534d50299317e7efcb2997c99a843e7beeafdd
+EBUILD transcode-1.1.7.ebuild 3144 RMD160 f2273382344f536d4cc215c34b506bd4d3359c28 SHA1 6e63ed45a7ac2722768ce202d036cd2f58c10870 SHA256 dc1341a761afe6ec591ba5e7b0252f12cf89d64876eb2e19c427f195afabea38
+MISC ChangeLog 49453 RMD160 a6eb118409417fc832c64558e40d32525d36edb3 SHA1 cd5b7b354a3a4360636d1bb7f98d3b723b7020db SHA256 1f1b4d2ea8589768e24f90e4ee9a4585714250b789884fd161a2a85c2abdc624
 MISC metadata.xml 529 RMD160 c52a55dcb8ffedb63e2ddbc99d4bf959f9772550 SHA1 f26965716f7025486b78a2c953efd9180ed82fb5 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPKJmoAAoJEEdUh39IaPFNfDoH/iV1VP7smFScyJlVOKnvI2Ct
-3NCZD5QJpbiSwuEVBWg2M/UF4nS/d04ezlwOFbEDoJTVWDGTcb6oSZ1UU4snHOq+
-Qi9fajepJkUfbC1oD1If0vR7EvT0Hf4NWkNH9lSgXeeYRF9MO6pth8x3PlmO4fZz
-ymR0BpGAQXC9PjwzrerPPvTR0/+do4psfDg1zF9qChljhkiPd+pAamD+r6l0zQIc
-JoYaheBt9ANiL0aFp9qBYIfXAFHVwBFhDajig4BIoTUv1RkG/p1NDT4ekFvA951p
-UdwRwRPJni+JScXtR0Eddy5dgCB7rke6WUNIHjXn+XGd2Q6XQcbmmnGnv3ua41U=
-=82Sf
+iEYEARECAAYFAk8pTUIACgkQvFcC4BYPU0pLlgCeL7UXd0ZgVcngJSb58MD3VcVC
+npAAn1cM9xZOwGeOWZr8XaBA2fczV7KB
+=Yo8d
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-1.1.7-r1.ebuild b/media-video/transcode/transcode-1.1.7-r1.ebuild
deleted file mode 100644
index a7e6853641b0..000000000000
--- a/media-video/transcode/transcode-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.2 2012/01/30 22:01:15 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-0.6.90
-	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 {} +
-}
diff --git a/media-video/transcode/transcode-1.1.7.ebuild b/media-video/transcode/transcode-1.1.7.ebuild
index 8beb67de08ec..04e0db04a42b 100644
--- a/media-video/transcode/transcode-1.1.7.ebuild
+++ b/media-video/transcode/transcode-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.5 2012/02/01 01:49:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7.ebuild,v 1.6 2012/02/01 14:33:32 aballier Exp $
 
 EAPI=4
 inherit eutils libtool multilib
@@ -15,7 +15,7 @@ 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
+	>=virtual/ffmpeg-0.6.90
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faac )
 	alsa? ( media-libs/alsa-lib )
@@ -56,7 +56,10 @@ REQUIRED_USE="
 	"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	epatch \
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-0.10.patch
+
 	elibtoolize
 }