summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-10-08 20:30:54 +0100
committerSteve Sakoman <steve@sakoman.com>2024-11-11 09:16:26 -0800
commit9c4e3fe7dc33cc022ac0e93b17093e680e168311 (patch)
tree91d2cb2ffb3c560b80dcef9720c0b37896e9e0d5
parent3148ccf972fd5265c5cb14f559c822bbc900ac15 (diff)
downloadpoky-9c4e3fe7dc33cc022ac0e93b17093e680e168311.tar.gz
ffmpeg: nasm is x86 only, so only DEPEND if x86
No need to depend on nasm if we're not going to use it. (From OE-Core rev: 0830e65afc2e7d828ae1667addb6f7499ea8ddd0) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b99ea7f130c3f945af9a09a6ecf85b6ff8f4b710) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
index 9e60b5cd23..b16bd51dbd 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"
46# libpostproc was previously packaged from a separate recipe 46# libpostproc was previously packaged from a separate recipe
47PROVIDES = "libav libpostproc" 47PROVIDES = "libav libpostproc"
48 48
49DEPENDS = "nasm-native" 49DEPENDS:append:x86 = " nasm-native"
50DEPENDS:append:x86-64 = " nasm-native"
50 51
51inherit autotools pkgconfig 52inherit autotools pkgconfig
52 53