Merge pull request #3129 from dangowrt/ffmpeg-without-yasm

ffmpeg: allow building without yasm

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 0f7429ed63083aac1070fe73fb97f948a7d40c49..d3a5a0325c7b315a2e3c1bc9e2dff50b9cdd1a60 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -282,7 +282,7 @@ $(call Package/ffmpeg/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE+= libraries
- DEPENDS+= @BUILD_PATENTED @!TARGET_x86||YASM +libpthread +zlib +libbz2
+ DEPENDS+= @BUILD_PATENTED +libpthread +zlib +libbz2
  PROVIDES:= libffmpeg
 endef
 
@@ -395,7 +395,6 @@ FFMPEG_CONFIGURE += \
        --disable-fma3 \
        --disable-fma4 \
        --disable-avx2 \
-       --disable-yasm \
        --disable-inline-asm \
        --disable-mips32r2 \
        --disable-mipsdspr1 \
@@ -409,6 +408,12 @@ FFMPEG_CONFIGURE += \
 
 endif
 
+ifneq ($(CONFIG_YASM),y)
+FFMPEG_CONFIGURE += \
+       --disable-yasm
+
+endif
+
 #selectibly disable optimizations according to arch/cpu type
 ifneq ($(findstring arm,$(CONFIG_ARCH)),)
        ifeq (,$(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)))