Add bzip2 and static-libs useflag, by Nikoli <nikoli@lavabit.com> in bug #324453 and fix my previous mistake by reintroducing the faad dep.

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

3 files changed, 16 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a4b07b2810f8..a8e4bf6e17d4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.362 2010/07/22 20:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.363 2010/07/22 20:44:05 aballier Exp $
+
+  22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Add bzip2 and static-libs useflag, by Nikoli <nikoli@lavabit.com> in bug
+  #324453 and fix my previous mistake by reintroducing the faad dep.
 
   22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   sort rdepend, use same detection of live ebuild everywhere, cosmetics, by
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 147b8f5e3737..0727f5ee67dc 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,13 +7,13 @@ DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a
 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-r1.ebuild 7571 RMD160 6011e87fd5a1f310a9e0d58c0f19f6b18f2aeb72 SHA1 d5e9c4ceaecc4ae725bb8c42ad1f89207eed7cdb SHA256 1f6c57d2563d6a4b4c26697b496347e1528e56e96e4b71720ba67e89a7a8068a
-MISC ChangeLog 54181 RMD160 49d7d42e4e2b85762ec32accdc65945da6007c3a SHA1 dfdf7f1db74665333e034374cb866de438357876 SHA256 772f987c08e4ec5eed7ab08941cf8b34ac2a8c7fe135cfe66c4a05b6aaf4cf90
+EBUILD ffmpeg-9999-r1.ebuild 7686 RMD160 5b73ba5e0e81a77a9aeef38ba6501c0f71f4cbbe SHA1 ef5116d6c86bd5c6d1c914f80834384875b1df32 SHA256 8fe50d55165ab0161d134efed31fd62d4f3f6ce6c1c9bc1f69458cc3afba6467
+MISC ChangeLog 54401 RMD160 fb9c638d2ec0ac90501a1c1950ad833b03a164e0 SHA1 d43a31d5dad9986d12e6ea7052e16ce894335269 SHA256 5c8fa92639e67b1134176e4b6cca81f31eed181bf7c64837aaf9f575a3021683
 MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxIqqgACgkQvFcC4BYPU0rqXwCfX7vUOOcf5EAECQ6Vv6uNUVff
-qE4AoJORJ3tq9L5hZb4rxllIjya5ClMf
-=k23k
+iEYEARECAAYFAkxIrZsACgkQvFcC4BYPU0r4KQCfVQwLbk2exUZKQq3d2h+dhyjK
+egkAn01BF4LGMVzgHxSjk/DjPeR/ZFwY
+=BvcW
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 7405e75b0b87..6b17b4e454c9 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.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-r1.ebuild,v 1.45 2010/07/22 20:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.46 2010/07/22 20:44:05 aballier Exp $
 
 EAPI="2"
 
@@ -30,9 +30,9 @@ 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 cpudetection custom-cflags
+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 test theora
++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"
 
 VIDEO_CARDS="nvidia"
@@ -44,6 +44,7 @@ done
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
 	dirac? ( media-video/dirac )
 	encode? (
 		faac? ( media-libs/faac )
@@ -53,7 +54,6 @@ RDEPEND="
 		x264? ( >=media-libs/x264-0.0.20100605 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	faad? ( >=media-libs/faad2-2.6.1 )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -98,7 +98,9 @@ src_configure() {
 	for i in debug doc network vaapi zlib; do
 		use ${i} || myconf="${myconf} --disable-${i}"
 	done
+	use bzip2 || myconf="${myconf} --disable-bzlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
+	use static-libs || myconf="${myconf} --disable-static"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"