From: Alexis Ballier Date: Tue, 27 Sep 2011 18:14:53 +0000 (+0000) Subject: add libaacplus support X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=90f92d27f0f9313a86f9f154dedccad6a44e1bd7;p=gentoo.git add libaacplus support Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 6958e9732434..c02f1da0cb0a 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.460 2011/09/27 15:34:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.461 2011/09/27 18:14:53 aballier Exp $ + + 27 Sep 2011; Alexis Ballier ffmpeg-9999.ebuild, + metadata.xml: + add libaacplus support 27 Sep 2011; Jeroen Roovers ffmpeg-0.7.5.ebuild: Stable for HPPA (bug #384095). diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 9a738696703b..bad30aaad64e 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -13,13 +13,13 @@ EBUILD ffmpeg-0.7.5.ebuild 8290 RMD160 5600d5d7d198870d7dd7d3da770a3d3765d2f4e5 EBUILD ffmpeg-0.8.2.ebuild 7830 RMD160 e4656d6311619f2f4fd09678df155a767facdef3 SHA1 5732d598d380e0fb9e22086fca403ba7479258fd SHA256 317a10414a0e56a62c358484c994cd4974574fc8e50c785d0c0de1e29ef951d7 EBUILD ffmpeg-0.8.3.ebuild 7830 RMD160 47884592486b9b815d0df95dad8ea4e26ff3f1c3 SHA1 4f4821b15f620c89ca4849a15655783afd75118b SHA256 286d0cb270395742dd9b408ad423ef54333bbd5b16276720ae7187971960c392 EBUILD ffmpeg-0.8.4.ebuild 7830 RMD160 d5cd97a30fc588caca4ba3824a8109bd3a298d16 SHA1 8aea46ed3ce0dd70fac1c8a4553ba0791b74e270 SHA256 c4873bf468b1777c0c6c67ec2202f4ae429ceba246cd3edcc0f17b395844e322 -EBUILD ffmpeg-9999.ebuild 8025 RMD160 d011411425e34a268a8361f8bbff67e9679e031b SHA1 fb3fb3a770f571d6598b751b996ae868fc9e73fb SHA256 896da35882f117e1926bc347dd0256ee5a029fc3578440efab5b80f7a7df047d -MISC ChangeLog 67064 RMD160 9f2882f00c0e3051d0dc2c0d842357f5063f89f9 SHA1 e6504228992458176c65a6b492f6601fae757e54 SHA256 e4b5ba3dc3394d3b520ae0abc151aea3dc67464c2f83ea33856476ead792fa79 -MISC metadata.xml 2646 RMD160 53e3a45f432bde3b3a8719b423344974b8eb83dd SHA1 fe660027a1984dbabd737f7ae2b4b8114118eded SHA256 1f7636fccd557eff9ff6e820639081b2a53beb3b71b73c392708c2e6d18027cf +EBUILD ffmpeg-9999.ebuild 8152 RMD160 06723aa747e0d3a1ecc1973aeafb91ea6a4ea336 SHA1 a0ef7490cff78acb5bceb3fb007eee0113bb672e SHA256 691817ac88c32f63ce474ad14a404b4684dc776dc243b8fb099726fd1349fe95 +MISC ChangeLog 67183 RMD160 8bbf188b012ea6e64a3552596209e2a5220492ab SHA1 cee3660e20e5dbcd2ea369d86f88400b15f8d957 SHA256 d21b94fbf32ff036e7becce71eb3294e31b87805d7b8ae6755e0a53c3f37c9d3 +MISC metadata.xml 2730 RMD160 30f7472831c62be2fd787b0c914681db7853361e SHA1 3a5abcd6fc24ce3e19497aa4b3d5cbf740ef7a4d SHA256 1e86d46c8891df413c68f98fe41e61691820fb66781717394a03327b907eeddc -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6B7QQACgkQVWmRsqeSphPbVQCfWnh4L8Pvb0rdfR435ha6f157 -Rp8AnRkYgdcVXI63TE0BI27YO5WsNKKb -=onmC +iEYEARECAAYFAk6CEqMACgkQvFcC4BYPU0oMeQCeNamqVMUKOde+/JuffCcc9nhC +mkUAoLoJE6IjtHtn+wd61jBFXNxq1Tvi +=NvaB -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 23c426cd42f5..52845649fcae 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.54 2011/09/21 15:21:46 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.55 2011/09/27 18:14:53 aballier Exp $ EAPI="4" @@ -29,10 +29,10 @@ if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi IUSE=" - aac alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode - faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openal - oss pic qt-faststart rtmp schroedinger sdl speex static-libs test theora - threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib + aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc + +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network + openal oss pic qt-faststart rtmp schroedinger sdl speex static-libs test + theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib " # String for CPU features in the useflag[:configure_option] form @@ -52,6 +52,7 @@ RDEPEND=" dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) + aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) @@ -93,7 +94,7 @@ DEPEND="${RDEPEND} v4l2? ( sys-kernel/linux-headers ) " # faac is license-incompatible with ffmpeg -REQUIRED_USE="bindist? ( encode? ( !faac ) )" +REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) )" S=${WORKDIR}/${P/_/-} @@ -126,6 +127,7 @@ src_configure() { for i in theora vorbis x264 xvid; do use ${i} && myconf="${myconf} --enable-lib${i}" done + use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree" use faac && myconf="${myconf} --enable-libfaac --enable-nonfree" else myconf="${myconf} --disable-encoders" diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index a9c5be50711a..80da8f959fe8 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -11,6 +11,7 @@ instruction set, present in modern AMD CPUs. (Check for 3dnowext in /proc/cpuinfo to know whether your CPU supports it). + AAC+ encoding via media-libs/libaacplus. Enables Adaptive Multi-Rate Audio support Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips) Enables audio CD grabbing with dev-libs/libcdio.