From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sat, 24 Jun 2017 07:35:14 +0000 (+0200)
Subject: package/x264: needs host-nasm instead of host-yasm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=929ddf4de92a38c90abe1dcf68c572e366a86b19;p=buildroot.git

package/x264: needs host-nasm instead of host-yasm

Upstream switched to nasm >= 2.13
http://git.videolan.org/?p=x264.git;a=commitdiff;h=d2b5f4873e2147452a723b61b14f030b2ee760a5#patch2

Fixes
http://autobuild.buildroot.net/results/3f5/3f5759a1fd6aaa0394229cdfce278752d4a01ddc/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/x264/x264.mk b/package/x264/x264.mk
index 69ec4ccea3..a5a967b3f7 100644
--- a/package/x264/x264.mk
+++ b/package/x264/x264.mk
@@ -13,9 +13,9 @@ X264_INSTALL_STAGING = YES
 X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
-# yasm needed for assembly files
-X264_DEPENDENCIES += host-yasm
-X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm"
+# nasm needed for assembly files
+X264_DEPENDENCIES += host-nasm
+X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/nasm"
 else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
 # We need to pass gcc as AS, because the ARM assembly files have to be
 # preprocessed