From 4e20ad196d33d957541ac11b3a460ac2971cdc0e Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Sun, 22 Jan 2012 13:04:16 +0100 Subject: ffmpeg: depends on host-nasm if MMX is enabled [Peter: slightly reordered] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/multimedia/ffmpeg/ffmpeg.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 38f04aafc..dc572de90 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -123,9 +123,14 @@ else FFMPEG_CONF_OPT += --disable-zlib endif +ifeq ($(BR2_i386)$(BR2_x86_64),y) # MMX on is default for x86, disable it for lowly x86-type processors ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) FFMPEG_CONF_OPT += --disable-mmx +else +# If it is enabled, nasm is required +FFMPEG_DEPENDENCIES += host-nasm +endif endif # ARM defaults to v5: clear if less, add extra if more -- cgit v1.2.3