All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] ffmpeg: depends on host-nasm if MMX is enabled
@ 2012-01-22 12:04 Arnout Vandecappelle
  2012-01-22 22:24 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Arnout Vandecappelle @ 2012-01-22 12:04 UTC (permalink / raw)
  To: buildroot

From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>


Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/multimedia/ffmpeg/ffmpeg.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 38f04aa..b3f5d31 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -124,8 +124,13 @@ FFMPEG_CONF_OPT += --disable-zlib
 endif
 
 # MMX on is default for x86, disable it for lowly x86-type processors
+# If it is enabled, nasm is required
 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
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+FFMPEG_DEPENDENCIES += host-nasm
+endif
 endif
 
 # ARM defaults to v5: clear if less, add extra if more
-- 
1.7.8.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH] ffmpeg: depends on host-nasm if MMX is enabled
  2012-01-22 12:04 [Buildroot] [PATCH] ffmpeg: depends on host-nasm if MMX is enabled Arnout Vandecappelle
@ 2012-01-22 22:24 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2012-01-22 22:24 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:

 Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
 Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-01-22 22:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-22 12:04 [Buildroot] [PATCH] ffmpeg: depends on host-nasm if MMX is enabled Arnout Vandecappelle
2012-01-22 22:24 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.