cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11357 from neheb/ffm

Browse Source 
ffmpeg: disable x86 asm for old CPU types
This commit is contained in:
Rosen Penev
2020-02-16 19:48:57 -08:00
committed by GitHub
parent e76a71e667 013162d079
commit 28d68daec8
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/ffmpeg/Config.in
+8
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 if PACKAGE_libffmpeg-custom
comment "Build Licensing" comment "Build Licensing"
multimedia/ffmpeg/Makefile
+2 -4
View File
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.4.7 PKG_VERSION:=3.4.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/ PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@@ -482,13 +482,11 @@ ifeq ($(ARCH),x86_64)
FFMPEG_CONFIGURE+= --enable-lto FFMPEG_CONFIGURE+= --enable-lto
endif endif
ifneq ($(CONFIG_TARGET_x86),) ifeq ($(CONFIG_FFMPEG_X86ASM),y)
ifeq ($(CONFIG_NASM),y)
FFMPEG_CONFIGURE += --enable-x86asm FFMPEG_CONFIGURE += --enable-x86asm
else else
FFMPEG_CONFIGURE += --disable-x86asm FFMPEG_CONFIGURE += --disable-x86asm
endif endif
endif
ifeq ($(BUILD_VARIANT),full) ifeq ($(BUILD_VARIANT),full)