diff options
| -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 | 11 | ||||
| -rw-r--r-- | media-video/ffmpeg/metadata.xml | 1 |
4 files changed, 19 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 4d9067ffd7d3..d7a8d14b0a9d 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.604 2013/02/18 18:55:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.605 2013/02/19 22:05:34 aballier Exp $ + + 19 Feb 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, + metadata.xml: + add libsoxr useflag 18 Feb 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: Add epatch_user, by Hristo Venev, bug #448612 diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index ea1586a5c289..1047c55e1a53 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -11,13 +11,13 @@ EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554 EBUILD ffmpeg-0.10.6.ebuild 8939 SHA256 d9bb2819b636920d559c7db27b2a7c94763528a2768b4b77d405504cbab9c122 SHA512 9aaee9ceda324977310e80303c1702e352942183dc13d2752746999b9d3c95b9651ea68836197284eeb7b98baa5c49ec88647258e1faef290d7464a7b8925b41 WHIRLPOOL 64f8d4de75e78993b9af6a6ed7b28d6a7774a9f7e8c00bf9dcc8a1e9a51df82a26d295d0e6edc375a5ba34d4b5b0dc97c0c57488a5d42d28b4fe44d7b414c059 EBUILD ffmpeg-1.0.4.ebuild 9581 SHA256 ec5ff5228c222f6ba5bd77d1be4c81fc74b704e1fedabee42c4a32acc953cc81 SHA512 085c0518736768b698f08a7af97fa1bd3ca78fc1e5e5d3b2f0fa0391562d2e95cb834e17c49e77cde60a2abe4e1bd7001bcb2ce12e418dc64ede71ce3feeb60f WHIRLPOOL 27a9fcca56ec3976b48471b6e456739025793d0ce42233451a651eec1ad6f4b757d9e3d0515a50de019332d57eb465c67aade8660ba896cc1c078dc19283bcb0 EBUILD ffmpeg-1.1.2.ebuild 9384 SHA256 6e40411ae95c33bc1cf88306a645cdee90a46ea423636d07ee6ce073014f6ae6 SHA512 52c8504380e27ae3b49da82c028e9f8a26d8f3a400c7ff684583eda9a774f701f61b6505481f773c0da6e7d13d6af16ba3101a599a2bbc5766515ab2b3ead75f WHIRLPOOL d9ac1568710464bead60c91a1226a26a69c6663d92194c286c97ebdec78a927545cfb90d2c4ae803fc5df0b710e342ec75b7c5f4facec653a9b5d31b9ccce10c -EBUILD ffmpeg-9999.ebuild 9417 SHA256 91be90a09a49776423f44bf9e0bb160a069eaefc14373f7a276e7cf8d2173447 SHA512 b838ef99f69bc7c0dd642054e5fbffd0a1d10bd90c3859499d2e40b3b6836df81fbbab4ccc7a0724053966e097c042113a0d9a943756952631c2811133ae79dd WHIRLPOOL 296f3f39297a299686ad7c796d286284994936ae0b6274ade1789df1899083ef8c31b241d31445cae6c88783a16236a46f2c631bbe6088d433ae314a89f52cd1 -MISC ChangeLog 85378 SHA256 ceaf854fbee56ca95cd3fd31d86288b0bcb7b825b659f8f1a6de26166194ac8a SHA512 4301c93ae5f6421f6e1ba41a7132587ff7f9a03e7efac057d5ef6fe19fc7201402921a3c8d86cb95da4770390b70554ca60dc09db8a30a9ad73c0392761387d1 WHIRLPOOL 9df52e248d1665fea3daee544a1bead64e3098ab15b7510d36c0e1d224a398991827888d39fe3ab8ecdc850987b85453e3d8500d70764757365eced700da6b95 -MISC metadata.xml 3635 SHA256 89039aac2113c4be46c76642a9ce0fc4d5047e74c19acca0e7e4b19bbc5d7ac1 SHA512 8ab0fd00c5b0eddd28e4c817a5cf3baded477fb22dec6fdff6e871442f92b7b68fa29eb80398e3c52cac5cfcc352e1fb848a6f46b19fc70d0822cc98cf6c1c03 WHIRLPOOL aa035a6597579cf2a212c28986aa4afbe52e3afe01617235801b3c842c8d6b1e7fcabda5beaa8971fb327c9bb475dfe189b95857def0573ad5181c8bec451493 +EBUILD ffmpeg-9999.ebuild 9532 SHA256 9468bb9cb48b1179763ab8448f8afb9737827a339655fe2a26a4eb97cb12fc7f SHA512 d1c916652755974b66c1ae79ee868b26d276e36330d777ba5f497086318bc51a8c7d3302dfb0662cabefa13c4695c2aa53b4f3fae7c48d6432d1583a056fc339 WHIRLPOOL 4047232765062c6cf2cfc95c888afb3c649308389d66c7ce2318900ed20a8781cf0c2a36c964fdfb63debbde0bd76f9f519a9cbecf635c90f950c6e4dc855249 +MISC ChangeLog 85489 SHA256 0e520a2f4d40b6c7f5d9ff9d214a735b2816a7b2c29f88965476b5474a85cd2d SHA512 72cb384fb8fbd490f441d2912152d577eb50a1910ff75869e82392aa789ef89f19e4367161d4245b86ac7afe91ccf5be5b427876e3468f72236f61a2e55ff55d WHIRLPOOL 9065c8c000950d2f67a27361d89d0797e1ed0eb56570b56cc34166fa608aa357de181dddbf68e2859687c26f1853397338721d917b792bdee18a73fea471f250 +MISC metadata.xml 3725 SHA256 b0eee9c78de338fc58bc8295e5da8079fe450229703dce3bf1221d711c00a6fe SHA512 88dfc6d61f50ea554ae3189f3138ecce3dbc07f4abdb786a4b77bee43c4057c4530bd313697e82b280301ab58bf71fd0eb0db5670392f8336f67681ae50c1389 WHIRLPOOL a4d9468f66d5d2835289fd7aab1d83b07ee34f864717254531f741445db12ef1fa35f28ecef583a887e3e6e8ed3ba7499d7189490ce61f10c1b34bf7915aa829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEieQ4ACgkQvFcC4BYPU0reGACeP6toY87mZCST48BFxy960air -dHcAnRp6DcbaH8oq0CoUJ7OKdQ8YbmVl -=olQB +iEYEAREIAAYFAlEj9zAACgkQvFcC4BYPU0rOSQCgnPG8cSNJA7b0f1FmhynB56a3 +GBEAoIzX8g53pq/DNpD09+p/YYevDGpm +=rm0f -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 3373afac5ec1..64957889d8a5 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.114 2013/02/18 18:55:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.115 2013/02/19 22:05:34 aballier Exp $ EAPI="4" @@ -32,9 +32,9 @@ IUSE=" aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca - libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp - schroedinger sdl speex static-libs test theora threads truetype twolame v4l - vaapi vdpau vorbis vpx X x264 xvid +zlib + libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio + rtmp schroedinger sdl speex static-libs test theora threads truetype twolame + v4l vaapi vdpau vorbis vpx X x264 xvid +zlib " # String for CPU features in the useflag[:configure_option] form @@ -81,6 +81,7 @@ RDEPEND=" jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) + libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) @@ -189,6 +190,8 @@ src_configure() { done use truetype && myconf="${myconf} --enable-libfreetype" use flite && myconf="${myconf} --enable-libflite" + # libswresample options + use libsoxr && myconf="${myconf} --enable-libsoxr" # 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 4b5249e91c20..bea267b69b6e 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -27,6 +27,7 @@ <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="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag> + <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag> <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag> <flag name="mmxext">Enables mmx2 support</flag> <flag name="network">Enables network streaming support</flag> |