commit: dd337de56a66a488ec68261e1ee98249c7e5eea1 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Apr 18 09:24:11 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Apr 18 09:25:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd337de5
media-video/ffmpeg: Convert to CPU_FLAGS_ARM, add missing ones and some required use Package-Manager: Portage-2.3.5, Repoman-2.3.2 media-video/ffmpeg/ffmpeg-3.3.ebuild | 19 +++++++++++++++++-- media-video/ffmpeg/ffmpeg-9999.ebuild | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.ebuild index 841ef128a24..fd36a3eba3a 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.ebuild @@ -103,8 +103,23 @@ IUSE=" # Strings for CPU features in the useflag[:configure_option] form # if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) -ARM_CPU_REQUIRED_USE="arm64? ( armvfp neon )" +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) +" MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) PPC_CPU_FEATURES=( altivec ) 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 ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 0cab2cec5be..12172bafc68 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -103,8 +103,23 @@ IUSE=" # Strings for CPU features in the useflag[:configure_option] form # if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) -ARM_CPU_REQUIRED_USE="arm64? ( armvfp neon )" +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) +" MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) PPC_CPU_FEATURES=( altivec ) 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 )
