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

Merge pull request #3554 from thess/x264-test

Browse source 
libx264: Add AMD Geode and i486 to ASM blacklist, fix CPU type test
This commit is contained in:
Ted Hess 2016-12-08 15:25:42 -05:00 committed by GitHub
commit 781b57f177
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/libx264/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=x264 PKG_NAME:=x264
PKG_VERSION:=snapshot-20160815-2245-stable PKG_VERSION:=snapshot-20160815-2245-stable
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.videolan.org/x264/snapshots/ PKG_SOURCE_URL:=https://download.videolan.org/x264/snapshots/
@ -28,8 +28,14 @@ TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I.
MAKE_FLAGS+= LD="$(TARGET_CC) -o" MAKE_FLAGS+= LD="$(TARGET_CC) -o"
# ARM ASM depends on ARM1156 or later, blacklist earlier or incompatible cores # ARM ASM depends on ARM1156 or later, blacklist earlier or incompatible cores
CPU_ASM_BLACKLIST:=arm920t arm926ej-s arm1136j-s arm1176jzf-s fa526 mpcore xscale # AMD Geode LX and i486 do not have SSE
CPU_ASM_BLACKLIST:=geode i486 arm920t arm926ej-s arm1136j-s arm1176jzf-s fa526 mpcore xscale
ifneq ($(CONFIG_SOFT_FLOAT)$(findstring $(call qstrip,$(CONFIG_CPU_TYPE)),$(CPU_ASM_BLACKLIST)),)
CONFIGURE_VARS+= AS=
MAKE_FLAGS+= AS=
CONFIGURE_ARGS += --disable-asm
else
ifneq ($(CONFIG_TARGET_x86),) ifneq ($(CONFIG_TARGET_x86),)
ifeq ($(CONFIG_YASM),y) ifeq ($(CONFIG_YASM),y)
CONFIGURE_VARS+= AS=yasm CONFIGURE_VARS+= AS=yasm
@ -40,11 +46,6 @@ else
CONFIGURE_ARGS += --disable-asm CONFIGURE_ARGS += --disable-asm
endif endif
endif endif
ifneq ($(CONFIG_SOFT_FLOAT)$(findstring $(CONFIG_CPU_TYPE),$(CPU_ASM_BLACKLIST)),)
CONFIGURE_VARS+= AS=
MAKE_FLAGS+= AS=
CONFIGURE_ARGS += --disable-asm
endif endif
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \