From c46f32ccf4681912b189bb43c72234d18df4a392 Mon Sep 17 00:00:00 2001 From: Benjamin Bara Date: Mon, 4 Sep 2023 10:49:06 +0200 Subject: [PATCH] ffmpeg: avoid neon on unsupported machines Disable neon if the machine does not support it. (From OE-Core rev: 866d3ca22ca30bff9d7b85b87387f40b59d60113) Signed-off-by: Benjamin Bara Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0c3a6a74531d3860a3849a1f53f6709d6a0e88a5) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb index 9899e570ad..cecaeded8c 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb @@ -136,6 +136,8 @@ EXTRA_OECONF:append:mips = " --extra-libs=-latomic --disable-mips32r5 --disable- EXTRA_OECONF:append:riscv32 = " --extra-libs=-latomic" EXTRA_OECONF:append:armv5 = " --extra-libs=-latomic" EXTRA_OECONF:append:powerpc = " --extra-libs=-latomic" +EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}" +EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}" # 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