summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild13
3 files changed, 16 insertions, 12 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7bbccea015be..9d219a5f0fe4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.709 2014/02/12 12:48:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.710 2014/02/12 13:15:46 aballier Exp $
+
+ 12 Feb 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ add opengl useflag
12 Feb 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.1.3.ebuild,
ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e9b543b5da38..736328aff56b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -25,13 +25,13 @@ EBUILD ffmpeg-1.2.3.ebuild 8938 SHA256 c93bdb73ebf4c2fc20f047983e3532cecd5339182
EBUILD ffmpeg-1.2.4.ebuild 8995 SHA256 470de6c8c403d844e876d4fa3d4b41225931176eaf4b14ec44db784ada42e250 SHA512 9e3966f60881134384faa97588aaf3588d2b5450d47401c30af1cadc2da54d4cb7f2ed4c6d041ac80933c0966cbf7047754362b28cb41883ddf79bb30ad09873 WHIRLPOOL 1deaaed0a61741c233339e47a7fddd602dedda00be4d442ef56d98965ae4946ce0ee655eef58c0fe1e4aa9690c9e15ed89a2b846e198e23f0e69379abf846164
EBUILD ffmpeg-1.2.5.ebuild 8939 SHA256 4590d85089b5949a48d436cb643ed3ce9fe5ec20e98de67d67ce1c73ff930820 SHA512 68c5942601561b1bc0101aba6b5f28ce60a99274ef074f3fab7c334791762e90476a73136cd47724523e7b5123fef3bc88cfc1ddbb3d5b81024b5e371e160465 WHIRLPOOL cc331d5ef44ff36fc0ddbbb6810ee920f5eccc1432fcfeeebaa90c249a8dafa9e5da32224d37f925e9cc1ae64167b1cbab047167fb89ab9dd019b781c704d28b
EBUILD ffmpeg-2.1.3.ebuild 10244 SHA256 80499a96b74defa8e8c1b3419611e53edd7167087e8f643241e949c159f30aa9 SHA512 0e8df2fdd50106263460d3b296299ab4ab2a0ed933c835a7fb9d8352dc15fe4f2fbb0868b6b2185d84739afed6ca499088594e11232c534f87ac446bb82a1f3a WHIRLPOOL e8081be3cde6d33d9252434d8a5e14cabd80b796ea084acd31f46b9f4beb766827f08273517cce3856e13ff23a3e33656a16348c6e60e894d6d52429e30bffa8
-EBUILD ffmpeg-9999.ebuild 10245 SHA256 2b76cabf8d8adebaaac7dede56de70dfba0119b5b653397ca714816d54e8e35d SHA512 3b39be8bf3df26345023e06c67be5455bd38987b53d67e64c4ced748439ca407ff4a1d241ced28bebb2b01dd64b75168a737bbf7a11d164743555689b6a4eb29 WHIRLPOOL b9b6b7c3a415a150b54ac663910f95f52bfc5803be58539d684523115db3a3102d43021b3d6c179d349e8f7a5544177e46a1b7ca1a9db9cc18661e02f1c9ba94
-MISC ChangeLog 98911 SHA256 867c6d86ec43309491e3cc133eb824037819b4e911e34d613fc6c17a19380ea0 SHA512 4def1709a2ecfac6c3956f1fcdb69de4d616107ef16ba3aeed4288b3951e602f9260498d0d39a277c9ee4b4f3c37c671343e577b6e62b11ca13fe0c27586a989 WHIRLPOOL a12a87324f0336912f7867c6297c810507f07d3a9e446f95e3cab5daa9bf74e729345922cfd3ff932e97c65e85516ec922751782be8f9a1ed9a60812e972946a
+EBUILD ffmpeg-9999.ebuild 10287 SHA256 dc0950033508a0045a6c3f7d732a4292b25b306aaee8891a698413f40d85c32d SHA512 f906de2368a8fb61416f958ffb871f2e93cadd8c4b33a8916cd6c031df487acbcaec5556a59e8afd5af3f0e8c6ca9bcbef0e6f2f8655ad442914d77845802c77 WHIRLPOOL dc71f3f1e83bdfef5ea0e789124147ace111cd112e2a978e976e452a5b97a100fe23ce45b91ce4cf754a8a11d22696875378b8cdad40fc928c50e0c32e35e00b
+MISC ChangeLog 99005 SHA256 630e2b6908293c41a3721fdce3582d7f089ae622fdb1f185444cced4637ee37b SHA512 c8aacfe5f1c7133cfe836ff862a021d616e60182604aea65f594aa38ce97181ce5bb7402fb5e964a7fb1fafef3d06f6a29fb1f143938518009898e68db16f349 WHIRLPOOL 3bf5d84a4826fcf1cc7ea088d83c3a85883cfe9176c7f0548907b2a545a47cf4406e86fa7bb910c8719feed0229cdd36df942d92330a8ae422b9f10430591204
MISC metadata.xml 5023 SHA256 99bbcb090ad6c7f40d1a19c14d5f31beb67023664b5e70d53e976ff6ccb03114 SHA512 8c067e95750c3868fb3dd987d66e4e9b3e6c17bce33dba3bba80d96d49fb293ae25faac505cb575ee00cfcd4c912e47831dca559aef06b4f921a34762b750169 WHIRLPOOL 4b05d43fd76ee436db935b681a21c9e267c6ab169314ae30e5b20c87386b37dde3694cf3a26910394607b0458cc974f35c79bb640c889b4ac6b07cfbb8b2c627
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlL7bZoACgkQvFcC4BYPU0qLTQCgzZ/jrmZoTCd4YsIRKNDDuATh
-TnQAoL/GOY7qyAEXNf7aIYfwBF38OWaa
-=Gm/f
+iEYEAREIAAYFAlL7dAMACgkQvFcC4BYPU0o3NQCfaj8/H71UKn7HXlyIqGbDuyvp
+aE0An2k/j6e9FbF21yvOnQ+9IMoeRn0j
+=f9Zy
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 158e97ec6578..53f1b54b06af 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.145 2014/02/12 12:48:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.146 2014/02/12 13:15:46 aballier Exp $
EAPI="5"
@@ -43,10 +43,10 @@ IUSE="
aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
- ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal openssl opus
- oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh static-libs test theora
- threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack X x264 xvid
- +zlib zvbi
+ ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
+ openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
+ static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
+ wavpack X x264 xvid +zlib zvbi
"
ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
@@ -112,6 +112,7 @@ RDEPEND="
libv4l? ( media-libs/libv4l )
modplug? ( media-libs/libmodplug )
openal? ( >=media-libs/openal-1.1 )
+ opengl? ( virtual/opengl )
openssl? ( dev-libs/openssl )
opus? ( media-libs/opus )
pulseaudio? ( media-sound/pulseaudio )
@@ -197,7 +198,7 @@ src_configure() {
fi
# libavdevice options
- ffuse="${ffuse} cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
+ ffuse="${ffuse} cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl"
# Indevs
use v4l || myconf="${myconf} --disable-indev=v4l2 --disable-outdev=v4l2"