summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-06-22 07:28:55 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-06-22 07:28:55 +0000
commiteacee671c0976e44a46386ee053984f41e92b47f (patch)
treed944ea6eb8af63e869055bf073c9815e49a8db10 /media-video/ffmpeg
parentx86 stable wrt security bug #324885 (diff)
downloadhistorical-eacee671c0976e44a46386ee053984f41e92b47f.tar.gz
historical-eacee671c0976e44a46386ee053984f41e92b47f.tar.bz2
historical-eacee671c0976e44a46386ee053984f41e92b47f.zip
faad support has been removed
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest14
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild7
3 files changed, 19 insertions, 7 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 839ab46174fe..3465c4cd08a3 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.357 2010/06/18 06:47:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.358 2010/06/22 07:28:55 aballier Exp $
+
+ 22 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+ faad support has been removed
18 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
Sort IUSE and make zlib enabled by default, by Nikoli
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 300d2d6ac8e0..7389cb10b752 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,9 +1,19 @@
+-----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 7761 RMD160 611bf4257eeacdea750ea83ad907fb0647b35afd SHA1 248b706b132aa8de0e028bf103beae24bde67007 SHA256 4c1958ce42c98bfb9fbfe722c65ed48852094ed0859f26c631f888831c1fa77d
-EBUILD ffmpeg-9999-r1.ebuild 7551 RMD160 9d32229bc943390647c5d94934009f45657bdca7 SHA1 a5fb0743e929ab76f829b4f0d5f14a8ce3c134d1 SHA256 6c9f300707b6d786a4c529f5b8a6ba194cdc708173fd61724b838df6e196ad38
-MISC ChangeLog 53566 RMD160 bf3bbe8093e793e907513b568359ed26bcdd4038 SHA1 756ba2a242f78853706236fcefd9467cf15b89ad SHA256 e78f2743e3c05110460cf9b5da3f008265e2995d329153cbcd1e1063053524dd
+EBUILD ffmpeg-9999-r1.ebuild 7505 RMD160 add44aea05b08b090c54d04ff2079fe23af3b17f SHA1 dae062b2ac5bfd76f898da7cb6fe7e1043802ac8 SHA256 8480d048c15fa7187feebf48e6b651b7bbf828b6110c2bea992318fe860adb82
+MISC ChangeLog 53674 RMD160 4cdbb5517b85b1769ca10710f215b106068d6850 SHA1 0b42c3e9cb8f7b404de0b9f730202e7c6a559396 SHA256 43d52be15709ca3190a37079226b6232d553f7f9a1e280442c495499e708a9a1
MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwgZj0ACgkQvFcC4BYPU0oaMQCfWD7Pay+c6rhcH6fYCmZEAiei
+B2IAoLb/WQXx8rPeVKVOhxdeMO3FMsuD
+=A8Cz
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 4097707d0afa..ab19015eef0f 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.43 2010/06/18 14:19:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.44 2010/06/22 07:28:55 aballier Exp $
EAPI="2"
@@ -31,7 +31,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags
-debug dirac doc +encode faac faad gsm +hardcoded-tables ieee1394 jack jpeg2k
+debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k
+mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora
threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
@@ -50,7 +50,6 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20100605 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
- faad? ( >=media-libs/faad2-2.6.1 )
zlib? ( sys-libs/zlib )
ieee1394? ( media-libs/libdc1394
sys-libs/libraw1394 )
@@ -144,7 +143,7 @@ src_configure() {
# Decoders
use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb"
- for i in gsm faad dirac rtmp schroedinger speex vpx; do
+ for i in gsm dirac rtmp schroedinger speex vpx; do
use ${i} && myconf="${myconf} --enable-lib${i}"
done
use jpeg2k && myconf="${myconf} --enable-libopenjpeg"