USE="qt-faststart" to replace separate media-video/qt-faststart package.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 22 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f9f871171d86..ec4bfeae423e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.365 2010/08/02 05:12:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.366 2010/08/10 09:57:39 ssuominen Exp $
+
+  10 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-9999.ebuild:
+  USE="qt-faststart" to replace separate media-video/qt-faststart package.
 
   02 Aug 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   avfilter-lavf doesnt exist, bug #330247
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4c216e37cbff..d37da0d69a0a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
 DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f
 DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a SHA1 c130e3bc368251b9130ce6eafb44fe8c3993ff5c SHA256 6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120
 EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
 EBUILD ffmpeg-0.6.ebuild 7796 RMD160 5c2daea06ca3de0c95ad20c74f9e98a9f9319f21 SHA1 a388929e8108f2e41fd5631fe0351f23f1daf470 SHA256 7811e2d022ce0ca4487eb8e1f5d3ca4c993486ef8c6c44c47bdc9b72f441c7ca
-EBUILD ffmpeg-9999.ebuild 7658 RMD160 46ae12de82c82b0ae79e524ea4fb8797bdde3ff3 SHA1 f61ebcf7797aa0687926d49f4282854a293e5a92 SHA256 d3c7795ef0f70e26f997a4927d24edb86f48f5c5bf44b3c3fa9b7746e2b63a15
-MISC ChangeLog 54703 RMD160 1a3ffec9f04b1e9272e6b9f8a9a317662b435e76 SHA1 0160aafa388907f7d8cdba98563dbc2e09828d22 SHA256 908552157d1f0e73b2b9fc6534069cde58b7d70c88f117c376676a99c2f7e703
-MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxWU6oACgkQvFcC4BYPU0pqAACeLycQYNLJ1PU/zMV7H92rrLya
-PhYAoLhgrq+yF398DQkFJRi9HWooq77V
-=BVS/
------END PGP SIGNATURE-----
+EBUILD ffmpeg-9999.ebuild 7799 RMD160 cc79400099d4a50e0880442157e0b175e3c136c1 SHA1 737f35de441b56de736a2ddc1d628be2d45d2c64 SHA256 b1c74480300811033d4ca89429604ffb640ed2e6ef156acf8a761a405e00e0ff
+MISC ChangeLog 54854 RMD160 06853e646ea9e53da6dfae83b62af3920a268ff9 SHA1 6cfc8af877fb7edf8007075b92552eb80ce3cf1c SHA256 470a4bb22dc140c573ebb430d59acb72ed5de14b29b1c152a2e2e13b914d980d
+MISC metadata.xml 2050 RMD160 8046e006480ce02c086476b098f624186451bb31 SHA1 59f86235d193cfda4bb5ac25a9de73e70971d700 SHA256 33b4d2911a43ed9eac793c86c7fcf5906500462ec2577ceccbaf9873fdc2b6b2
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 6a5c28f29c77..d2c9e05b4970 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.18 2010/08/02 05:12:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.19 2010/08/10 09:57:39 ssuominen Exp $
 
 EAPI="2"
 
@@ -30,10 +30,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags
-debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k
-+mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 static-libs test theora
-threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 
@@ -67,6 +64,7 @@ RDEPEND="
 	vpx? ( media-libs/libvpx )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	zlib? ( sys-libs/zlib )
+	!media-video/qt-faststart
 "
 
 DEPEND="${RDEPEND}
@@ -230,19 +228,28 @@ src_configure() {
 		--mandir=/usr/share/man \
 		--enable-static --enable-shared \
 		--cc="$(tc-getCC)" \
-		${myconf} || die "configure failed"
+		${myconf} || die
 }
 
 src_compile() {
 	emake version.h || die #252269
-	emake || die "make failed"
+	emake || die
+
+	if use qt-faststart; then
+		tc-export CC
+		emake -C tools qt-faststart || die
+	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install-man || die "Install Failed"
+	emake DESTDIR="${D}" install install-man || die
 
 	dodoc Changelog README INSTALL
 	dodoc doc/*
+
+	if use qt-faststart; then
+		dobin tools/qt-faststart || die
+	fi
 }
 
 src_test() {
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 8e4dbae27162..59048585e3db 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -20,6 +20,7 @@
     <flag name="mmxext">Enables mmx2 support</flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
+	<flag name="qt-faststart">Build and install qt-faststart application</flag>
     <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>