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

Merge pull request #11485 from BKPepe/x264

Browse source 
x264: add CONFIGURE_VARS when NASM is not selected
This commit is contained in:
Rosen Penev 2020-03-15 11:55:33 -07:00 committed by GitHub
commit d9c5df4290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/libx264/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=x264
PKG_VERSION:=snapshot-20190324-2245
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.videolan.org/x264/snapshots/
@ -39,6 +39,8 @@ ifneq ($(findstring cortex-a,$(CPU_TYPE)),)
MAKE_FLAGS+= AS=nasm
endif
else
CONFIGURE_VARS+= AS=
MAKE_FLAGS+= AS=
CONFIGURE_ARGS += --disable-asm
endif
endif
@ -56,9 +58,9 @@ CONFIGURE_ARGS += \
define Package/libx264
SECTION:=libs
CATEGORY:=Libraries
TITLE:=H264/AVC free codec library.
TITLE:=H264/AVC free codec library
DEPENDS:=+libpthread @BUILD_PATENTED
URL:=http://www.videolan.org/developers/x264.html
URL:=https://www.videolan.org/developers/x264.html
endef
define Package/libx264/description