ffmpeg on riscv64

pkg/dav1d/config.h

@@ -1,11 +1,17 @@
 #define ARCH_AARCH64 0
 #define ARCH_ARM 0
 #define ARCH_PPC64LE 0
+
 #ifdef __x86_64__
 #define ARCH_X86 1
 #define ARCH_X86_32 0
 #define ARCH_X86_64 1
+#else
+#define ARCH_X86 0
+#define ARCH_X86_32 0
+#define ARCH_X86_64 0
 #endif
+
 #define CONFIG_16BPC 1
 #define CONFIG_8BPC 1
 #define CONFIG_LOG 1

pkg/dav1d/gen.lua

@@ -41,7 +41,8 @@ build('sed', '$outdir/include/dav1d/version.h', '$srcdir/include/dav1d/version.h
 build('awk', '$outdir/vcs_version.h', '$dir/ver', {
 	expr=[['{printf "#define DAV1D_VERSION \"%s\"\n", $$1}']],
 })
-build('awk', '$outdir/config.asm', '$dir/config.h', {
+build('unifdef', '$outdir/config.h.tmp', '$dir/config.h', {flags='-D__x86_64__'})
+build('awk', '$outdir/config.asm', '$outdir/config.h.tmp', {
 	expr=[['$$1 == "#define" {print "%define " substr($$0, length("#define ") + 1)} END {print "%define private_prefix dav1d"}']],
 })
 build('touch', '$outdir/cli_config.h')

pkg/ffmpeg/config.h

@@ -33,9 +33,6 @@
 #define ARCH_SPARC64 0
 #define ARCH_TILEGX 0
 #define ARCH_TILEPRO 0
-#define ARCH_X86 1
-#define ARCH_X86_32 0
-#define ARCH_X86_64 1
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV6T2 0
@@ -54,25 +51,6 @@
 #define HAVE_VSX 0
 #define HAVE_RV 0
 #define HAVE_RVV 0
-#define HAVE_AESNI 1
-#define HAVE_AMD3DNOW 1
-#define HAVE_AMD3DNOWEXT 1
-#define HAVE_AVX 1
-#define HAVE_AVX2 1
-#define HAVE_AVX512 1
-#define HAVE_AVX512ICL 1
-#define HAVE_FMA3 1
-#define HAVE_FMA4 1
-#define HAVE_MMX 1
-#define HAVE_MMXEXT 1
-#define HAVE_SSE 1
-#define HAVE_SSE2 1
-#define HAVE_SSE3 1
-#define HAVE_SSE4 1
-#define HAVE_SSE42 1
-#define HAVE_SSSE3 1
-#define HAVE_XOP 1
-#define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
 #define HAVE_MIPS32R5 0
@@ -105,24 +83,6 @@
 #define HAVE_VSX_EXTERNAL 0
 #define HAVE_RV_EXTERNAL 0
 #define HAVE_RVV_EXTERNAL 0
-#define HAVE_AESNI_EXTERNAL 1
-#define HAVE_AMD3DNOW_EXTERNAL 1
-#define HAVE_AMD3DNOWEXT_EXTERNAL 1
-#define HAVE_AVX_EXTERNAL 1
-#define HAVE_AVX2_EXTERNAL 1
-#define HAVE_AVX512_EXTERNAL 1
-#define HAVE_AVX512ICL_EXTERNAL 1
-#define HAVE_FMA3_EXTERNAL 1
-#define HAVE_FMA4_EXTERNAL 1
-#define HAVE_MMX_EXTERNAL 1
-#define HAVE_MMXEXT_EXTERNAL 1
-#define HAVE_SSE_EXTERNAL 1
-#define HAVE_SSE2_EXTERNAL 1
-#define HAVE_SSE3_EXTERNAL 1
-#define HAVE_SSE4_EXTERNAL 1
-#define HAVE_SSE42_EXTERNAL 1
-#define HAVE_SSSE3_EXTERNAL 1
-#define HAVE_XOP_EXTERNAL 1
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
@@ -156,24 +116,6 @@
 #define HAVE_VSX_INLINE 0
 #define HAVE_RV_INLINE 0
 #define HAVE_RVV_INLINE 0
-#define HAVE_AESNI_INLINE HAVE_INLINE_ASM
-#define HAVE_AMD3DNOW_INLINE HAVE_INLINE_ASM
-#define HAVE_AMD3DNOWEXT_INLINE HAVE_INLINE_ASM
-#define HAVE_AVX_INLINE HAVE_INLINE_ASM
-#define HAVE_AVX2_INLINE HAVE_INLINE_ASM
-#define HAVE_AVX512_INLINE HAVE_INLINE_ASM
-#define HAVE_AVX512ICL_INLINE HAVE_INLINE_ASM
-#define HAVE_FMA3_INLINE HAVE_INLINE_ASM
-#define HAVE_FMA4_INLINE HAVE_INLINE_ASM
-#define HAVE_MMX_INLINE HAVE_INLINE_ASM
-#define HAVE_MMXEXT_INLINE HAVE_INLINE_ASM
-#define HAVE_SSE_INLINE HAVE_INLINE_ASM
-#define HAVE_SSE2_INLINE HAVE_INLINE_ASM
-#define HAVE_SSE3_INLINE HAVE_INLINE_ASM
-#define HAVE_SSE4_INLINE HAVE_INLINE_ASM
-#define HAVE_SSE42_INLINE HAVE_INLINE_ASM
-#define HAVE_SSSE3_INLINE HAVE_INLINE_ASM
-#define HAVE_XOP_INLINE HAVE_INLINE_ASM
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
@@ -207,7 +149,6 @@
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 /* probe HAVE_INLINE_ASM */
 #define HAVE_SYMVER 1
-#define HAVE_X86ASM 1
 #define HAVE_BIGENDIAN 0
 #define HAVE_FAST_UNALIGNED 1
 #define HAVE_ARPA_INET_H 1
@@ -765,3 +706,133 @@
 #define CONFIG_VP8DSP 0
 #define CONFIG_WMA_FREQS 1
 #define CONFIG_WMV2DSP 1
+
+#if defined(__x86_64__)
+#define ARCH_X86 1
+#define ARCH_X86_32 0
+#define ARCH_X86_64 1
+
+#define HAVE_AESNI 1
+#define HAVE_AMD3DNOW 1
+#define HAVE_AMD3DNOWEXT 1
+#define HAVE_AVX 1
+#define HAVE_AVX2 1
+#define HAVE_AVX512 1
+#define HAVE_AVX512ICL 1
+#define HAVE_FMA3 1
+#define HAVE_FMA4 1
+#define HAVE_MMX 1
+#define HAVE_MMXEXT 1
+#define HAVE_SSE 1
+#define HAVE_SSE2 1
+#define HAVE_SSE3 1
+#define HAVE_SSE4 1
+#define HAVE_SSE42 1
+#define HAVE_SSSE3 1
+#define HAVE_XOP 1
+#define HAVE_I686 1
+
+#define HAVE_AESNI_EXTERNAL 1
+#define HAVE_AMD3DNOW_EXTERNAL 1
+#define HAVE_AMD3DNOWEXT_EXTERNAL 1
+#define HAVE_AVX_EXTERNAL 1
+#define HAVE_AVX2_EXTERNAL 1
+#define HAVE_AVX512_EXTERNAL 1
+#define HAVE_AVX512ICL_EXTERNAL 1
+#define HAVE_FMA3_EXTERNAL 1
+#define HAVE_FMA4_EXTERNAL 1
+#define HAVE_MMX_EXTERNAL 1
+#define HAVE_MMXEXT_EXTERNAL 1
+#define HAVE_SSE_EXTERNAL 1
+#define HAVE_SSE2_EXTERNAL 1
+#define HAVE_SSE3_EXTERNAL 1
+#define HAVE_SSE4_EXTERNAL 1
+#define HAVE_SSE42_EXTERNAL 1
+#define HAVE_SSSE3_EXTERNAL 1
+#define HAVE_XOP_EXTERNAL 1
+
+#define HAVE_AESNI_INLINE HAVE_INLINE_ASM
+#define HAVE_AMD3DNOW_INLINE HAVE_INLINE_ASM
+#define HAVE_AMD3DNOWEXT_INLINE HAVE_INLINE_ASM
+#define HAVE_AVX_INLINE HAVE_INLINE_ASM
+#define HAVE_AVX2_INLINE HAVE_INLINE_ASM
+#define HAVE_AVX512_INLINE HAVE_INLINE_ASM
+#define HAVE_AVX512ICL_INLINE HAVE_INLINE_ASM
+#define HAVE_FMA3_INLINE HAVE_INLINE_ASM
+#define HAVE_FMA4_INLINE HAVE_INLINE_ASM
+#define HAVE_MMX_INLINE HAVE_INLINE_ASM
+#define HAVE_MMXEXT_INLINE HAVE_INLINE_ASM
+#define HAVE_SSE_INLINE HAVE_INLINE_ASM
+#define HAVE_SSE2_INLINE HAVE_INLINE_ASM
+#define HAVE_SSE3_INLINE HAVE_INLINE_ASM
+#define HAVE_SSE4_INLINE HAVE_INLINE_ASM
+#define HAVE_SSE42_INLINE HAVE_INLINE_ASM
+#define HAVE_SSSE3_INLINE HAVE_INLINE_ASM
+#define HAVE_XOP_INLINE HAVE_INLINE_ASM
+
+#define HAVE_X86ASM 1
+#else
+#define ARCH_X86 0
+#define ARCH_X86_32 0
+#define ARCH_X86_64 0
+
+#define HAVE_AESNI 0
+#define HAVE_AMD3DNOW 0
+#define HAVE_AMD3DNOWEXT 0
+#define HAVE_AVX 0
+#define HAVE_AVX2 0
+#define HAVE_AVX512 0
+#define HAVE_AVX512ICL 0
+#define HAVE_FMA3 0
+#define HAVE_FMA4 0
+#define HAVE_MMX 0
+#define HAVE_MMXEXT 0
+#define HAVE_SSE 0
+#define HAVE_SSE2 0
+#define HAVE_SSE3 0
+#define HAVE_SSE4 0
+#define HAVE_SSE42 0
+#define HAVE_SSSE3 0
+#define HAVE_XOP 0
+#define HAVE_I686 0
+
+#define HAVE_AESNI_EXTERNAL 0
+#define HAVE_AMD3DNOW_EXTERNAL 0
+#define HAVE_AMD3DNOWEXT_EXTERNAL 0
+#define HAVE_AVX_EXTERNAL 0
+#define HAVE_AVX2_EXTERNAL 0
+#define HAVE_AVX512_EXTERNAL 0
+#define HAVE_AVX512ICL_EXTERNAL 0
+#define HAVE_FMA3_EXTERNAL 0
+#define HAVE_FMA4_EXTERNAL 0
+#define HAVE_MMX_EXTERNAL 0
+#define HAVE_MMXEXT_EXTERNAL 0
+#define HAVE_SSE_EXTERNAL 0
+#define HAVE_SSE2_EXTERNAL 0
+#define HAVE_SSE3_EXTERNAL 0
+#define HAVE_SSE4_EXTERNAL 0
+#define HAVE_SSE42_EXTERNAL 0
+#define HAVE_SSSE3_EXTERNAL 0
+#define HAVE_XOP_EXTERNAL 0
+
+#define HAVE_AESNI_INLINE 0
+#define HAVE_AMD3DNOW_INLINE 0
+#define HAVE_AMD3DNOWEXT_INLINE 0
+#define HAVE_AVX_INLINE 0
+#define HAVE_AVX2_INLINE 0
+#define HAVE_AVX512_INLINE 0
+#define HAVE_AVX512ICL_INLINE 0
+#define HAVE_FMA3_INLINE 0
+#define HAVE_FMA4_INLINE 0
+#define HAVE_MMX_INLINE 0
+#define HAVE_MMXEXT_INLINE 0
+#define HAVE_SSE_INLINE 0
+#define HAVE_SSE2_INLINE 0
+#define HAVE_SSE3_INLINE 0
+#define HAVE_SSE4_INLINE 0
+#define HAVE_SSE42_INLINE 0
+#define HAVE_SSSE3_INLINE 0
+#define HAVE_XOP_INLINE 0
+
+#define HAVE_X86ASM 0
+#endif