lede-packages-rs

commit a580aea0be72b44f3550d2af36557079175c2177
parent 7f85f9fbdc023298ad68f8fd69eeb78e52358ed8
Author: Ted Hess <thess@kitschensync.net>
Date:   Sat,  3 Sep 2016 09:21:35 -0400

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

ffmpeg: allow building without yasm
Diffstat:
M
multimedia/ffmpeg/Makefile
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git 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)))