From 0830e65afc2e7d828ae1667addb6f7499ea8ddd0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 8 Oct 2024 20:30:54 +0100 Subject: [PATCH] ffmpeg: nasm is x86 only, so only DEPEND if x86 No need to depend on nasm if we're not going to use it. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit b99ea7f130c3f945af9a09a6ecf85b6ff8f4b710) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb index 9e60b5cd23e..b16bd51dbd7 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb @@ -46,7 +46,8 @@ ARM_INSTRUCTION_SET:armv6 = "arm" # libpostproc was previously packaged from a separate recipe PROVIDES = "libav libpostproc" -DEPENDS = "nasm-native" +DEPENDS:append:x86 = " nasm-native" +DEPENDS:append:x86-64 = " nasm-native" inherit autotools pkgconfig -- 2.47.3