mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

ffmpeg: Add build overrides for some specific CPUs: Octeon, X86 and 24kf. 

Octeon: Rename octeonplus to oction+
MIPS 24kf: Inline ASM fails to build (unknown reason)
X86: Configure finds NASM and assumes YASM if name explictly set (wrong switches)

Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess 2018-08-15 08:58:40 -04:00
parent ac35fa13c2
commit 8b37cf3b06
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multimedia/ffmpeg/Makefile
View File

@ -374,6 +374,8 @@ endef
# Strip off FPU notation
REAL_CPU_TYPE:=$(firstword $(subst +, ,$(CONFIG_CPU_TYPE)))
# Fixup cpu types recogized by ffmpeg configure
REAL_CPU_TYPE:=$(subst octeonplus,octeon+,$(REAL_CPU_TYPE))
FFMPEG_CONFIGURE:= \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
@ -422,6 +424,10 @@ FFMPEG_CONFIGURE+= \
else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
FFMPEG_CONFIGURE+= \
--disable-altivec
# libavcode/mips/aacdec_mips.c build problem
else ifneq ($(findstring 24kf,$(CONFIG_CPU_TYPE)),)
FFMPEG_CONFIGURE+= \
--disable-inline-asm
endif
# selectively disable optimizations according to arch/cpu type
@ -448,7 +454,9 @@ endif
ifneq ($(CONFIG_TARGET_x86),)
ifeq ($(CONFIG_NASM),y)
FFMPEG_CONFIGURE += --yasmexe=nasm
# Set yasmexe to anything but YASM/NASM (ffmpeg configure will then find NASM correctly)
# Newer ffmpeg packages will use --enable-x86asm (with NASM default)
FFMPEG_CONFIGURE += --yasmexe=xyzzy
else
FFMPEG_CONFIGURE += --disable-yasm
endif