ffmpeg: allow building without yasm

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-09-03 14:49:34 +02:00
parent 7f85f9fbdc
commit 1913622d9b

View file

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