[patch] X86_CPU_REQUIRED_USE fix

x86flags-fixed.patch (text/plain), 2.18 KB, created by Adrien Dessemond on 2020-12-16 15:09:39 UTC

--- ffmpeg-4.3.1.ebuild.orig	2020-12-10 15:39:21.000000000 -0500
+++ ffmpeg-4.3.1.ebuild	2020-12-16 09:50:26.502403371 -0500
@@ -132,24 +132,27 @@
 	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
 	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
 "
-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 )
+
+# TODO: AVX512
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aes avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4_1 sse4_2:sse42 xop:xop )
 X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
 X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx2 )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_fma4 )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_fma3 )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_xop )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_aes?  ( cpu_flags_x86_aes )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_mmx?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnowext )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_3dnow )
 "
 
 CPU_FEATURES_MAP=(