diff options
Diffstat (limited to 'media-video')
| -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 | 14 | ||||
| -rw-r--r-- | media-video/ffmpeg/metadata.xml | 1 |
4 files changed, 23 insertions, 10 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index fb1a71c86f43..d9b305bc12e6 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.395 2011/03/30 11:57:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.396 2011/03/30 12:07:28 aballier Exp $ + + 30 Mar 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, + metadata.xml: + add truetype and avx useflags, by Alphat-PC, bug #359493 30 Mar 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: disable-stripping isnt needed anymore diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 0fab8d86a64c..6830ac715b58 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -11,13 +11,13 @@ EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997 EBUILD ffmpeg-0.6.ebuild 7782 RMD160 7dcb53dfd7bed74aa95a6813cad6c55f9fc7f062 SHA1 92d32ee520b6125b1e825bb98f3731cdfb9918c8 SHA256 ba710a4af02900b36fc1ef8d4a60bfb9a216040b3974a2394c1e8e7cec5ef52c EBUILD ffmpeg-0.6_p25423.ebuild 7916 RMD160 47a171f90c44b376f87169ced67d46a4003d99a0 SHA1 b10e37c59c3758c1c1f89ad98f22780af64e1ced SHA256 1b614efd80d3d535bc778530ffb2bf7d6bd2e18d3650b4b39548ee8b191ebef2 EBUILD ffmpeg-0.6_p25767.ebuild 7914 RMD160 c083ebae2a69bb253ffc2393b9f7224f720e023c SHA1 d40d3704f060617cb4b48da8ffc783572fbbbfd3 SHA256 0d06742d7a4db2598905711b54cbd35f2934875e7dfe8d58abbdaeb72374816c -EBUILD ffmpeg-9999.ebuild 7715 RMD160 030ddbba4c5f8aaf45afed857b89a4971287ce6f SHA1 e8c4904f576bb5d77743e13584fa15f13b3a2cb2 SHA256 54fa65d7ecb40f2779d68ab5f336ecf9339aa203e2f28c1761dc4c975e2658db -MISC ChangeLog 58435 RMD160 5658920545caea14fe8dbe7306333396dc9775df SHA1 e423af3c924267f5c1f03edf99a1be77596e44b6 SHA256 186261cc5842eff3199157068d7a6096b328a54a8cf8f66d3c4e48cfe3744c6c -MISC metadata.xml 2265 RMD160 0416ebff8851e2ec715a801a3ecd66a98865578e SHA1 58d9750865481aedecd4d61dcaee9e43e6a27404 SHA256 38a520565c24ca97877c3b2814d685beb0079e3ad4d28e5924667084ba3ffd86 +EBUILD ffmpeg-9999.ebuild 7834 RMD160 f201956c7d33a1c3df198622e47afd42bbf1b3bd SHA1 f6fe6e6d8d2c7b0a8d16b0e5cdb8e357783a4f7d SHA256 b3eee8360f679c65957bdc12b8badf5fc4ca7e530bcac1ebb6543b4c1dbd29af +MISC ChangeLog 58583 RMD160 5467f0045917c7037c0d4dcc2f2f48b4e1dd52f0 SHA1 f66da5f9dfa31727423be1f442b3702d58ccdeaf SHA256 937fb768203478e7fc8b456710b83bfd0784d39ac4ef061e15df35f2b4fca488 +MISC metadata.xml 2402 RMD160 d1226017b36de2614eb29f742fef59b9cb9b3901 SHA1 2f00b54a5f1348fe84d455f04d81988282d91ecc SHA256 8494cfb404ca14fb828175b3fde3fff5b77a925473ee1c3b2028a7060d16907a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2TGrYACgkQvFcC4BYPU0pbhACfU4jFobNP+Bu2lgVkuI1E7ZPx -/1kAniwnLaXQCSCOc809HeosUK7Ais7k -=J9NJ +iEYEARECAAYFAk2THQYACgkQvFcC4BYPU0oAsQCgiilHSGB6yuarCwmMkLYMJWGG +PkgAoJvED9EsKjxGIlSSrgm6tK02WSb5 +=0CuO -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index c528244a0bbf..875d3f943d2f 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.33 2011/03/30 11:57:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.34 2011/03/30 12:07:28 aballier Exp $ EAPI="2" @@ -28,7 +28,13 @@ SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi -IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" +IUSE=" + +3dnow +3dnowext alsa altivec amr avx bindist +bzip2 cpudetection + custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables + ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp + schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l + v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib + " VIDEO_CARDS="nvidia" @@ -58,6 +64,7 @@ RDEPEND=" sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) + truetype? ( media-libs/freetype:2 ) vaapi? ( x11-libs/libva ) video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) vpx? ( media-libs/libvpx ) @@ -134,6 +141,7 @@ src_configure() { done # libavfilter options use frei0r && myconf="${myconf} --enable-frei0r" + use truetype && myconf="${myconf} --enable-libfreetype" # Threads; we only support pthread for now but ffmpeg supports more use threads && myconf="${myconf} --enable-pthreads" @@ -146,7 +154,7 @@ src_configure() { use jpeg2k && myconf="${myconf} --enable-libopenjpeg" # CPU features - for i in mmx ssse3 altivec ; do + for i in mmx ssse3 altivec avx ; do use ${i} || myconf="${myconf} --disable-${i}" done use mmxext || myconf="${myconf} --disable-mmx2" diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index fb6df0abe46e..8bdce5ef664f 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -12,6 +12,7 @@ 3dnowext in /proc/cpuinfo to know whether your CPU supports it). </flag> <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag> + <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag> <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag> <flag name="faac">Use external faac library for AAC encoding</flag> |