| 1 |
commit: dd337de56a66a488ec68261e1ee98249c7e5eea1 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 18 09:24:11 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 18 09:25:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd337de5 |
| 7 |
|
| 8 |
media-video/ffmpeg: Convert to CPU_FLAGS_ARM, add missing ones and some required use |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
media-video/ffmpeg/ffmpeg-3.3.ebuild | 19 +++++++++++++++++-- |
| 13 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 19 +++++++++++++++++-- |
| 14 |
2 files changed, 34 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/ffmpeg/ffmpeg-3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.ebuild |
| 17 |
index 841ef128a24..fd36a3eba3a 100644 |
| 18 |
--- a/media-video/ffmpeg/ffmpeg-3.3.ebuild |
| 19 |
+++ b/media-video/ffmpeg/ffmpeg-3.3.ebuild |
| 20 |
@@ -103,8 +103,23 @@ IUSE=" |
| 21 |
|
| 22 |
# Strings for CPU features in the useflag[:configure_option] form |
| 23 |
# if :configure_option isn't set, it will use 'useflag' as configure option |
| 24 |
-ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) |
| 25 |
-ARM_CPU_REQUIRED_USE="arm64? ( armvfp neon )" |
| 26 |
+ARM_CPU_FEATURES=( |
| 27 |
+ cpu_flags_arm_thumb:armv5te |
| 28 |
+ cpu_flags_arm_v6:armv6 |
| 29 |
+ cpu_flags_arm_thumb2:armv6t2 |
| 30 |
+ cpu_flags_arm_neon:neon |
| 31 |
+ cpu_flags_arm_vfp:vfp |
| 32 |
+ cpu_flags_arm_vfpv3:vfpv3 |
| 33 |
+ cpu_flags_arm_v8:armv8 |
| 34 |
+) |
| 35 |
+ARM_CPU_REQUIRED_USE=" |
| 36 |
+ arm64? ( cpu_flags_arm_v8 ) |
| 37 |
+ cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) |
| 38 |
+ cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) |
| 39 |
+ cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) |
| 40 |
+ cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) |
| 41 |
+ cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) |
| 42 |
+" |
| 43 |
MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) |
| 44 |
PPC_CPU_FEATURES=( altivec ) |
| 45 |
X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) |
| 46 |
|
| 47 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 48 |
index 0cab2cec5be..12172bafc68 100644 |
| 49 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 50 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 51 |
@@ -103,8 +103,23 @@ IUSE=" |
| 52 |
|
| 53 |
# Strings for CPU features in the useflag[:configure_option] form |
| 54 |
# if :configure_option isn't set, it will use 'useflag' as configure option |
| 55 |
-ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) |
| 56 |
-ARM_CPU_REQUIRED_USE="arm64? ( armvfp neon )" |
| 57 |
+ARM_CPU_FEATURES=( |
| 58 |
+ cpu_flags_arm_thumb:armv5te |
| 59 |
+ cpu_flags_arm_v6:armv6 |
| 60 |
+ cpu_flags_arm_thumb2:armv6t2 |
| 61 |
+ cpu_flags_arm_neon:neon |
| 62 |
+ cpu_flags_arm_vfp:vfp |
| 63 |
+ cpu_flags_arm_vfpv3:vfpv3 |
| 64 |
+ cpu_flags_arm_v8:armv8 |
| 65 |
+) |
| 66 |
+ARM_CPU_REQUIRED_USE=" |
| 67 |
+ arm64? ( cpu_flags_arm_v8 ) |
| 68 |
+ cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) |
| 69 |
+ cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) |
| 70 |
+ cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) |
| 71 |
+ cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) |
| 72 |
+ cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) |
| 73 |
+" |
| 74 |
MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) |
| 75 |
PPC_CPU_FEATURES=( altivec ) |
| 76 |
X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) |
Archives