summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-03-03 18:34:30 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-03-03 18:34:30 +0000
commit4521b4e8e16319bb5354d2982baf1f7b486cf4c9 (patch)
treee8d7f6dc1b5e7616125456d0429e02482b1029b8 /media-video/ffmpeg
parentApply patch to build against recent x11-libs/libva, bug #503136. Require x11-... (diff)
downloadhistorical-4521b4e8e16319bb5354d2982baf1f7b486cf4c9.tar.gz
historical-4521b4e8e16319bb5354d2982baf1f7b486cf4c9.tar.bz2
historical-4521b4e8e16319bb5354d2982baf1f7b486cf4c9.zip
Add fma3 useflag
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest12
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
-rw-r--r--media-video/ffmpeg/metadata.xml1
4 files changed, 14 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 38f69eab4510..5a3413d82fef 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# 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.713 2014/02/17 18:13:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.714 2014/03/03 18:34:26 aballier Exp $
+
+ 03 Mar 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+ metadata.xml:
+ Add fma3 useflag
17 Feb 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
Depend on fdk-aac 0.1.3, bug #499402 by Alex Xu (Hello71).
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c311efb0a1d1..4c139fe90902 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -13,13 +13,13 @@ EBUILD ffmpeg-0.10.11.ebuild 9684 SHA256 c5fb97665f143665f995c1f4d44b2c25b95e38a
EBUILD ffmpeg-1.0.8.ebuild 9650 SHA256 84d1ef638cfe3c7fe5106e9c3d3ec7905cb5288b67261de32bc58eb1846af229 SHA512 15fd02e2944286676040fe747878fd4230a60a512abc9b97eda177fc8fbf853421d410b0b4a7a3a5e04842e96366f3e419748df00878803a2b17b3d0d71fbf90 WHIRLPOOL 3e9a4181f732c9441811413dc0fa3ac35b2733712ea6b0a97e67d815af4739d710c56d04bb0047466fd2989f0e7999c886ac778c77424e8d39c3078eeb340d68
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 10295 SHA256 495707bcbb1660107b14df17bf2db02fc75f6c0cd63760997004a959182214f5 SHA512 6019795450081babc6e90a6e95c9af45ea7fbfe2c4a6d0e8556fe5d6c6ce182995e86ffa8881d4c542f0d158bb8290cb4efe27dec3ba6da7b909a0fc3b8a5f61 WHIRLPOOL d1f142dd1c1e8bdbbfe6bcd54db392d5e5d306257a8c248471cfe3409908c0a86ee7a77b460e5edbf841fa02b32fdab1e422dc1a893db128f39f5df62f234d09
-MISC ChangeLog 99479 SHA256 0d0276056e1cbb3ed9b537691c6f243c67d41036a9e3b98fa848b81f4f14579e SHA512 205fd719cd0c6f8f42bcd559144acc681d86d72353b7989834c000b80d37f2a65d8acf7784a7155ccc43358a5f61210a49b57bf5cf6df267a15c16c8162cc9f4 WHIRLPOOL b17c4f963edeb8a14b1c5f673829c340562cfd4b5899d92a62c4d203acc42b17424f6929145e47c3558aee3f3683dee2a5f1373bcb8576cc4130eeabb88eb161
-MISC metadata.xml 5023 SHA256 99bbcb090ad6c7f40d1a19c14d5f31beb67023664b5e70d53e976ff6ccb03114 SHA512 8c067e95750c3868fb3dd987d66e4e9b3e6c17bce33dba3bba80d96d49fb293ae25faac505cb575ee00cfcd4c912e47831dca559aef06b4f921a34762b750169 WHIRLPOOL 4b05d43fd76ee436db935b681a21c9e267c6ab169314ae30e5b20c87386b37dde3694cf3a26910394607b0458cc974f35c79bb640c889b4ac6b07cfbb8b2c627
+EBUILD ffmpeg-9999.ebuild 10300 SHA256 1d1afb2d56b7954926c46ad81f5e18fd6520bc9566b58929ed5d0b3d3d6dce7d SHA512 119ce4d7c5ee747a9284ccb6636cd5342ddfef43273dd44236e126734533c8b59889f8a180ce8a04bdc9af8ecabf399f32815bad4b9d7b21e995c832f2e5d599 WHIRLPOOL c17233582b286d797d7393e870d984ea201b0732877ca305b110fad2cdb98efd9a1b1c20909cce29f3a82ecc1a60eca2bd1cf237bd682d6329f5fc23ce0f0aad
+MISC ChangeLog 99587 SHA256 ee30edb2baed49edb76d0ca182a27eab90ea8a5646502685d78835b1440b1996 SHA512 cc75f45016db428aadd9bbf2e7f1516fd3106ec94b034aec019a0693233a2fa6fcb4bf7541f56141b1068e95b7740bc4154dbca97dfb43ef605f7ab9efe8e2f8 WHIRLPOOL 2aa613a81e057c76e714e162e712c8d7034660d91f06945c460f8c8499381ad5198c85740933bf3d256da349de2afc2ff9bfe399df8b0732a52b390ade9f61aa
+MISC metadata.xml 5175 SHA256 272f5c0872fdb00bf4c99e43fc01a2bdf3d62a5f1110ab8c684bee01087f2327 SHA512 40f072741d089598f010813021f89e62a9fd2ccebe0a0e48e43314ac3601568b75cc533cad0c3f139a02a4a70391cbf33bb7ddf1d50088a131acad394c007f71 WHIRLPOOL 998ee505287b62d225fdc3b9a255d18c9ef37d59ada1eefa7af2be96179bcfc6f5d7dfa9465e54a263310a2e6fb2a211cd1f087d6b8b0b7aa97b6f7e2855d1fd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlMCUVEACgkQvFcC4BYPU0qRnQCePKGCNPKV/60pf/YpEO3UaEDR
-z3oAn0tcoQ91DoyQOjfV+taA9DWIappT
-=f07j
+iEYEAREIAAYFAlMUyzMACgkQvFcC4BYPU0oCagCgjR7hwu9KVfzSG58l8YqRxGww
+KzYAnim9ylV3J6fZMo6GkQnnhLsZcSCH
+=D8Pf
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9eb490c4f8c5..348de53ba6bc 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.147 2014/02/17 18:13:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.148 2014/03/03 18:34:26 aballier Exp $
EAPI="5"
@@ -53,7 +53,7 @@ ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
PPC_CPU_FEATURES="altivec"
SPARC_CPU_FEATURES="vis"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42"
# String for CPU features in the useflag[:configure_option] form
# if :configure_option isn't set, it will use 'useflag' as configure option
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 49657931b2c6..fd9fe5d23e28 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -29,6 +29,7 @@
<flag name="faac">Use external faac library for AAC encoding</flag>
<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
+ <flag name="fma3">Enables FMA3 optimizations: AMD processors starting with Piledriver architecture and Intel Haswell based processors or later.</flag>
<flag name="fma4">Enables FMA4 optimizations: AMD processors starting with Bulldozer architecture.</flag>
<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>