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

Merge pull request #6383 from thess/add-nasm

Browse Source 
ffmpeg/libx264: Replacing YASM with NASM and fixing ffmpeg/x264 module dependency
This commit is contained in:
Ted Hess
2018-07-06 12:31:45 -04:00
committed by GitHub
parent 346925a2b1 75f0499469
commit a81df2bc61
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libx264/Makefile
+4 -4
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=x264
PKG_VERSION:=snapshot-20180401-2245
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.videolan.org/x264/snapshots/
@@ -38,9 +38,9 @@ ifneq ($(CONFIG_SOFT_FLOAT)$(findstring $(call qstrip,$(CONFIG_CPU_TYPE)),$(CPU_
CONFIGURE_ARGS += --disable-asm
else
ifneq ($(CONFIG_TARGET_x86),)
ifeq ($(CONFIG_YASM),y)
CONFIGURE_VARS+= AS=yasm
MAKE_FLAGS+= AS=yasm
ifeq ($(CONFIG_NASM),y)
CONFIGURE_VARS+= AS=nasm
MAKE_FLAGS+= AS=nasm
else
CONFIGURE_VARS+= AS=
MAKE_FLAGS+= AS=