Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ffmpeg: disable x86 asm for old CPU types

Browse source 
This is a workaround for NASM being totally broken.

I have two patches, one for master and another for 19.07 that upstream is
not merging.

https://patchwork.ozlabs.org/patch/1221696/
https://patchwork.ozlabs.org/patch/1221697/

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 013162d079)
This commit is contained in:
Rosen Penev 2020-02-15 22:24:21 -08:00
parent dbef699276
commit bd24f9bb34
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
multimedia/ffmpeg/Config.in
View file

@ -1,3 +1,11 @@
config FFMPEG_X86ASM
bool "Compile x86 ASM"
depends on (x86_64 || (i386 && !(TARGET_x86_geode || TARGET_x86_legacy)))
help
This compiles ffmpeg with x86 assembly optimizations. This option is needed as NASM is
totally broken with CPU_TYPE=pentium.
default y
if PACKAGE_libffmpeg-custom
comment "Build Licensing"

6
multimedia/ffmpeg/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
PKG_VERSION:=3.4.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@ -484,13 +484,11 @@ ifeq ($(ARCH),x86_64)
FFMPEG_CONFIGURE+= --enable-lto
endif
ifneq ($(CONFIG_TARGET_x86),)
ifeq ($(CONFIG_NASM),y)
ifeq ($(CONFIG_FFMPEG_X86ASM),y)
FFMPEG_CONFIGURE += --enable-x86asm
else
FFMPEG_CONFIGURE += --disable-x86asm
endif
endif
ifeq ($(BUILD_VARIANT),full)