diff options
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/ffmpeg/Manifest | 12 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 7 | ||||
-rw-r--r-- | media-video/ffmpeg/metadata.xml | 1 |
4 files changed, 17 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 9a6b0d14e758..b5f6182e8fe7 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.371 2010/09/24 20:44:59 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.372 2010/10/01 00:56:44 aballier Exp $ + + 01 Oct 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, + metadata.xml: + Add frei0r useflag 24 Sep 2010; Markos Chandras <hwoarang@gentoo.org> ffmpeg-0.6.ebuild: Stable on amd64 wrt bug #332361 diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 4f1a155bbe3e..6a57b03bb50e 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 7788 RMD160 9e1e01720dcb806273d2c436e3b44b565f247d7d SHA1 2acb99ffd56c1c560d5567f0e8c5cc48fb6e6dd6 SHA256 31e9d704fd4562a8b2c5a932e0dfc72295929296ab428113d00d5c7693b89c05 -EBUILD ffmpeg-9999.ebuild 7777 RMD160 63564ff3ff611e11f02e459fa7b65df4cb23117e SHA1 a13b4de0fc543c5f8a4985c2cfbd5f52c7668a3f SHA256 6f2c8aa469c141ecd18ae5dcd53a96b2dc3f5ae1bcfae23aa3b036f40f209a1a -MISC ChangeLog 55418 RMD160 c1611b95768415f547c6701efcd3ae85e6205a10 SHA1 71d6d6931342c508874e728b3b749bfb4626b3a8 SHA256 99b5ae607dc798984639fc2c8fe848261fab1d5c75eb5b08565ac84b0707211f -MISC metadata.xml 2050 RMD160 8046e006480ce02c086476b098f624186451bb31 SHA1 59f86235d193cfda4bb5ac25a9de73e70971d700 SHA256 33b4d2911a43ed9eac793c86c7fcf5906500462ec2577ceccbaf9873fdc2b6b2 +EBUILD ffmpeg-9999.ebuild 7901 RMD160 d312a0065c6c5c03b236a34c2522b2a564d44fd5 SHA1 eeee10dbd758b7ac06a5058f61d49d30635e4ccb SHA256 b4546d1cbfa03cb6d94dfc8924302e633e447702f23fdff75a2207fd7a6f53d0 +MISC ChangeLog 55528 RMD160 3f4209581233efaee46648b7ef7d4c62310a2740 SHA1 42f0a80473dad191133bc8034ab88a1c2dd331c8 SHA256 2bedf64b38ee73d6439292485fe57066ab57eceb816dc644663fc542b9e39fb1 +MISC metadata.xml 2116 RMD160 881f00e64f73bbdd20d5017bba99d34fb96e7d6a SHA1 17780b8d193967be4835ff2fee71f3bcd6ff77f4 SHA256 f5ff02d46c6d928807a03062eeee3320eba15682f5b0a2f633e07d7c2340fe08 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkydDYMACgkQ9/cejkQaxBDVYwCfS+QmnzzuvdjL+26rtLoEmgJ1 -pucAn1qH8fli7MLA/mCUvisAVV2FhegZ -=joZ4 +iEYEARECAAYFAkylMdMACgkQvFcC4BYPU0resACfQARAXqJ00kFlsaYZ1gmynE1r +ZZ0AnjCuJkPZhExRqMS7cbWp5s+xcJlT +=Y8om -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 203c2aee7bea..ef69705baca6 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.20 2010/09/20 16:48:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.21 2010/10/01 00:56:44 aballier Exp $ EAPI="2" @@ -28,7 +28,7 @@ SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then 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 qt-faststart 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 frei0r 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" @@ -49,6 +49,7 @@ RDEPEND=" x264? ( >=media-libs/x264-0.0.20100605 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) + frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) @@ -136,6 +137,8 @@ src_configure() { for i in alsa oss ; do use ${i} || myconf="${myconf} --disable-outdev=${i}" done + # libavfilter options + use frei0r && myconf="${myconf} --enable-frei0r" # Threads; we only support pthread for now but ffmpeg supports more use threads && myconf="${myconf} --enable-pthreads" diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 59048585e3db..52717bad32a4 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -16,6 +16,7 @@ <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag> <flag name="faac">Use external faac library for AAC encoding</flag> <flag name="faad">Use external faad library for AAC decoding (instead of internal libavcodec support)</flag> + <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag> <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag> <flag name="mmxext">Enables mmx2 support</flag> <flag name="network">Enables network streaming support</flag> |