From: Alexis Ballier Date: Sun, 27 Nov 2011 14:53:00 +0000 (+0000) Subject: add libass useflag X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8464398924851291edc02b17e69c01aff7e642c3;p=gentoo.git add libass useflag Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64 --- diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index c3472a65017b..7c91fe30650f 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.491 2011/11/25 19:57:48 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.492 2011/11/27 14:53:00 aballier Exp $ + + 27 Nov 2011; Alexis Ballier ffmpeg-9999.ebuild, + metadata.xml: + add libass useflag 25 Nov 2011; Kacper Kowalik ffmpeg-0.7.7.ebuild: ppc/ppc64 stable wrt #389201 diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 2344657fbc8d..e6d5e6992cd9 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX ffmpeg-0.7.6-fix_ppc64_32ul.patch 1094 RMD160 b765f1f8420701e6d9447391dd498f6807b2e2e7 SHA1 f4fd276e9a88d815657282d67b716dc793f30988 SHA256 b6e60ba7f9d179b8b2ba03cf74694d1e92e6fc6d4626cda258ab1af50e0afea4 DIST ffmpeg-0.7.6.tar.bz2 4529035 RMD160 18641ae249d8b6f14f99013d1fccd85b0baddfa5 SHA1 0ea9ea769e195bf79d1b787acf253582481413b5 SHA256 f23265dc55fa8424872bc6cd026e340a367bc7eb4d5a6a32ca4aacb581b13cc2 @@ -14,23 +14,13 @@ EBUILD ffmpeg-0.7.8.ebuild 8443 RMD160 b6278d55d1ce6fe1d2b8d06bb5beacd2cc4b4797 EBUILD ffmpeg-0.8.5.ebuild 8043 RMD160 6d0818622d1b63f56ca61ee97c7e2b1bb797d229 SHA1 7590930cb73be2c4333005f88a6680a23e308da1 SHA256 74aaf70cf001c3a3be73dd7ae2e28ade46f568ed6c795b5a032fda93731a18b0 EBUILD ffmpeg-0.8.6.ebuild 8042 RMD160 4709694f4d6b3da1c20b6cd0e7f2783e8bcdd6f5 SHA1 170e0f605117aa622c6b42d1f60e252df9092b16 SHA256 ec9f7859106af231a8d8993dbd3ca2ec66b70eddc9761f7b8976f6007f558423 EBUILD ffmpeg-0.8.7.ebuild 8042 RMD160 667ec1443cb0e6b1aab0b42d03f095212b0e6508 SHA1 c2ab382135b4181358ce29b3c0d2a12183f3b869 SHA256 57efbfd28445bdfa0f84d13a4039a5e86e87a7d5b72812e18dd4e3c9a65a8788 -EBUILD ffmpeg-9999.ebuild 8746 RMD160 e8911f7df8b090b3c60566a77895da2090b22975 SHA1 a506f393a080edd996c140e1e5752b286a6363f5 SHA256 b8a1c288920ddf238efc353d171bae3337dcbcd59aa432ec5516c0f7c290385d -MISC ChangeLog 70737 RMD160 e08ceabd3b398e0e06ba0906ce61650c61d611d7 SHA1 6389d2aa042527d0413ab503a0f52758d76a2a0e SHA256 af98540e24573e7804c0f88f9343f2eb08d81db1a90644c94235a5018d62a261 -MISC metadata.xml 3022 RMD160 794769b4ccc4c9348f64b884ec5bdc9e81173994 SHA1 5b0d926db53d9e1314ed0fe2821d7952b5386133 SHA256 7566645dd9bf7db7cf3a7be1cfa3fec5c33f156aa52619a09a4b46f6581086ef +EBUILD ffmpeg-9999.ebuild 8825 RMD160 7014f07cc53ae399590f18b417f337e7168c7ce2 SHA1 0cd5c57610b58cd86eb5ae2bf6232b719f090a3e SHA256 83f4e26c1f63e14d8e3425f235477d4d6e0dde8230da7e9cbc7c8f356618c841 +MISC ChangeLog 70845 RMD160 4f84740c23bef8d239457343cfaeed7ebd008585 SHA1 a80c1f158bb32aeb34ddbe3582abae0b3717a214 SHA256 72e504a9f4f4c7eccab91068fba0a02f94795a328d28bf18f84a2bb5eb466e81 +MISC metadata.xml 3109 RMD160 9d1029fc4b092305f6f21a599dd2424dd55a49b3 SHA1 4bad7beb6a9f211c6eb9e3f20c28f178984efeca SHA256 122a9ebdad9fec3e57110dcd4cacdfd8b941192e39ae23f528aea5b2d0e51c14 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJOz/NGAAoJEF0huFKJUZL54K8P/RRCuJywhenL98TW2OGM6Y4C -yj8qPkxNx7b0ZRyDbkcrfHT6do7JaWc81XVPg6oclqjHOmmnSqsg49czIAQ6Yn8g -OIq7KJLynXSKRkkqp7Bu6iHf5lZqN3WkwxhgadY1gupuFH3ygSfOajrh4dYUjqTs -2QF0/jUFOtu38YYDovwnGRAn0bKRiBI91Lb4D8aNZMaqkXn+wKsbFjMoqpirBRa1 -HGJc2dpThgykz4b7woS8e0T51e9nr7Jww0ZFippIBBwJcgb9jD1D3OHPcgXqa4Uw -NnHIxb6gBIr4YYinNqL6IkxOegunfeQ3aNvobEM6/dWZLPrE98q4IJGEzty+5XfF -BKE6odd+l3/FC6PBruW+qUJsbvGJx12gdr6rdI3f4DsC/NMWOV5NX2M0/Nb3GWN8 -TyVllqb464YYZsq41IvWS2QFy1+3bn1dyOamxpUgzAt83f+axawALd8FHrDP04eJ -X01Ks/1PBCQlOGuwzo7Y8R7CHOGmQJlGMc0ggHYO29T6mwImYuI51rUGmNZ5+lOX -NtRxUkx6R3Oboz2qGU1Y9jFO4suXEBimS1Fi6tI+Oee0P+CzGzUaxKBdSpOc3ntY -rxBKJmth6pyXgzA5vhW0F+VJMcDA1LMFd0B6wNiBOx4x7yWnH5jj4g4DHM95/V0L -7CySBoxkfpuj/IgEqD5V -=/x4x +iEYEARECAAYFAk7STtIACgkQvFcC4BYPU0qc+gCdFuVV5CIsJx7P20E/NfFxglsO +LtMAnRlO7bvHmgjZHNuyLxaM/5LFB2zm +=frsh -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 70b176f253a6..7a29eebaddf8 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.63 2011/11/09 13:01:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.64 2011/11/27 14:53:00 aballier Exp $ EAPI="4" @@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi IUSE=" - aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc + 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 @@ -47,6 +47,7 @@ done RDEPEND=" alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) + ass? ( media-libs/libass ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) @@ -163,6 +164,7 @@ src_configure() { # libavfilter options use frei0r && myconf="${myconf} --enable-frei0r" use truetype && myconf="${myconf} --enable-libfreetype" + use ass && myconf="${myconf} --enable-libass" # 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 b7a0433fec14..9d3459a64019 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). + Enables media-libs/libass based subtitle renderer. 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)