From 4f3d38a6a922e266e60b9ef55c7c5576ede7e80b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 15 Dec 2011 11:38:29 +0000 Subject: [PATCH] add avconv useflag Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- media-video/ffmpeg/ChangeLog | 6 +++++- media-video/ffmpeg/Manifest | 12 ++++++------ media-video/ffmpeg/ffmpeg-9999.ebuild | 16 +++++++++------- media-video/ffmpeg/metadata.xml | 1 + 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 1a7bd869eb5b..7e17d26c2da6 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.508 2011/12/15 11:30:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.509 2011/12/15 11:38:29 aballier Exp $ + + 15 Dec 2011; Alexis Ballier ffmpeg-9999.ebuild, + metadata.xml: + add avconv useflag *ffmpeg-0.9 (15 Dec 2011) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index eaf37fd66e3b..e15119b19996 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -10,13 +10,13 @@ EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4 EBUILD ffmpeg-0.9.ebuild 8243 RMD160 1a53d5f13da10ca48e7a366c7afa0562b26da0d1 SHA1 9962281411e6132e670640e042a5d08e0e9dc092 SHA256 3101496a71f30b51f1e8c052d62497eaf2e0ee1640c192634746c6af5f2ee3f9 -EBUILD ffmpeg-9999.ebuild 8287 RMD160 ddf5b46aa60697f102d0a4fb0b1311d9c7bf6d3c SHA1 73c53a9087ef19f984d405306e7aabb93c548d79 SHA256 23afed5b6e6464f92ada61f10e52170738e140245720474481dd684bf525988c -MISC ChangeLog 73031 RMD160 0f4b019a9b81c59ff00bf1104ba4ac3c3376350f SHA1 1201756725d48f882c0b40759fb68c173446f76b SHA256 7cdf97ca75295a1f938c738585b3c3fc4e91d764658a3dc5faef46811eb88e7a -MISC metadata.xml 3136 RMD160 83498fadc792f93d602a65caf742e4cd1c379615 SHA1 61ecdedb07c4d97cf5f3a665e9d301c07657d863 SHA256 6a36d874d9bd519aadc8c406f9f1a07b60dd35c41a41ba8484f602b87f8ed85e +EBUILD ffmpeg-9999.ebuild 8322 RMD160 e059f327c52b9bee688685aec80117893a8db0da SHA1 7ed72c0b767d88c6a6d06e8d301f45458ae7838d SHA256 f4d1c971fd36f2f6e29ccb3c0c01b5f2cb873a5883309545db133cf698da673c +MISC ChangeLog 73141 RMD160 c9e48945601a33de7ad0deaa2d45869226ceb1c3 SHA1 c19bd183e5bf01706a200c12910cab92f63a1960 SHA256 9f351c070b368059ddf246014a3ab8e2039d270d8c6615ba68a94d6f1a5866fa +MISC metadata.xml 3268 RMD160 5d5416365dded7cfc95afcd15d229133a6b5e7e9 SHA1 5a0c14d612464804bcb11cb288adb17858b3d6af SHA256 f761435bfa15493652fcc714c1124570546abaee000bad85f66ee83093f80d32 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7p2mkACgkQvFcC4BYPU0pCAACgha/vuZftXz4BrXfMOJi2pPYu -SSgAnRXdqDP5flJRZpEpd/L6NcJY/RCY -=LHHU +iEYEARECAAYFAk7p3DsACgkQvFcC4BYPU0rzqgCfab6IvNnAuPQnGi1cBYLABKaZ +7NsAnAoaNnODrjcAH/nyfQ9IePONMtFo +=5qv6 -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 07182db34393..858c187a1a47 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.71 2011/12/15 11:25:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.72 2011/12/15 11:38:29 aballier Exp $ EAPI="4" @@ -29,11 +29,11 @@ if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi IUSE=" - aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug dirac doc - +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l - modplug mp3 network openal openssl oss pic pulseaudio +qt-faststart rtmp - schroedinger sdl speex static-libs test theora threads truetype v4l vaapi - vdpau vorbis vpx X x264 xvid +zlib + aac aacplus alsa amr ass avconv bindist +bzip2 cdio celt cpudetection debug + dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack + jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio + +qt-faststart rtmp schroedinger sdl speex static-libs test theora threads + truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib " # String for CPU features in the useflag[:configure_option] form @@ -126,7 +126,9 @@ src_configure() { use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" use openssl && myconf="${myconf} --enable-openssl --enable-nonfree" - use gnutls && myconf="${myconf} --enable-gnutls" + for i in gnutls avconv ; do + use $i && myconf="${myconf} --enable-$i" + done # Encoders if use encode diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 6d07f0ea17e8..f15c4b8ea9d0 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -14,6 +14,7 @@ Enables media-libs/libass based subtitle renderer. AAC+ encoding via media-libs/libaacplus. Enables Adaptive Multi-Rate Audio support + Build and install avconv, an alternative command line tool to ffmpeg from media-video/libav. Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips) Enables audio CD grabbing with dev-libs/libcdio. Adds Xiph CELT/Opus audio decoding support via media-libs/celt -- 2.26.2