ffmpeg: Probe for inline asm and intrinsics

1 files changed, 13 insertions, 3 deletions

diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua
index dd2c5ca1..6b7c2cd7 100644
--- a/pkg/ffmpeg/gen.lua
+++ b/pkg/ffmpeg/gen.lua
@@ -27,9 +27,15 @@ pkg.deps = {
 	'$gendir/headers',
 }
 
-build('cat', '$outdir/config.h', {'$dir/config-head.h', '$dir/config.h', '$builddir/probe/PIC', '$dir/config-tail.h'})
-build('awk', '$outdir/config.asm', {'$dir/config.h', '$builddir/probe/PIC'}, {
-	expr=[['{print "%define " substr($$0, length("#define ") + 1)}']],
+local probe = {
+	'$builddir/probe/PIC',
+	'$builddir/probe/HAVE_INLINE_ASM',
+	'$builddir/probe/HAVE_MMINTRIN_H',
+}
+
+build('cat', '$outdir/config.h', {'$dir/config-head.h', probe, '$dir/config.h', '$dir/config-tail.h'})
+build('sed', '$outdir/config.asm', {probe, '$dir/config.h'}, {
+	expr=[[-n -e 's,^# *,%,p']],
 })
 build('awk', '$outdir/config.texi', '$dir/config.h', {
 	expr=[['$$3 == "1" {gsub("_", "-", $$2); print "@set", tolower($$2), "yes"}']],
@@ -92,6 +98,10 @@ for line in iterlines('sources.txt', 1) do
 		end
 	end
 end
+-- combination option in libavutil/x86/Makefile
+if options.HAVE_MMX_EXTERNAL then
+	sources.libavutil['libavutil/x86/emms.asm'] = true
+end
 for lib, srcs in pairs(sources) do
 	sources[lib] = table.keys(srcs)
 end