[OE-core] [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

[Andre McCurdy]

Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
---
 meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb
index 307e37e3fe..c4261248b6 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb
@@ -114,10 +114,19 @@ EXTRA_OECONF = " \
     --pkg-config=pkg-config \
 "
 
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+    ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+    ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \
+"
+EXTRA_OECONF_append_arm = " ${EXTRA_OECONF_ARM}"
+EXTRA_OECONF_append_armeb = " ${EXTRA_OECONF_ARM}"
+
 EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"
+
 # gold crashes on x86, another solution is to --disable-asm but thats more hacky
 # ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
-
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
 do_configure() {
-- 
2.23.0