From 4c58f29d4d2e24a6d7e304edce466f59fd6c37a2 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 26 Sep 2016 09:42:19 +0200
Subject: [PATCH] libx264: more build fixes

Introduce blacklist for CPU_TYPEs without ASM support in libx264
Add libpthread dependency required on non-musl builds

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 libs/libx264/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
index 4de07a23c..000a4d683 100644
--- a/libs/libx264/Makefile
+++ b/libs/libx264/Makefile
@@ -27,6 +27,9 @@ include $(INCLUDE_DIR)/package.mk
 TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I.
 MAKE_FLAGS+= LD="$(TARGET_CC) -o" 
 
+# 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
+
 ifneq ($(CONFIG_TARGET_x86),)
 ifeq ($(CONFIG_YASM),y)
   CONFIGURE_VARS+= AS=yasm
@@ -38,7 +41,7 @@ else
 endif
 endif
 
-ifneq ($(CONFIG_SOFT_FLOAT),)
+ifneq ($(CONFIG_SOFT_FLOAT)$(findstring $(CONFIG_CPU_TYPE),$(CPU_ASM_BLACKLIST)),)
 CONFIGURE_VARS+= AS= 
 MAKE_FLAGS+= AS= 
 CONFIGURE_ARGS += --disable-asm
@@ -53,7 +56,7 @@ define Package/libx264
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=H264/AVC free codec library.
-  DEPENDS:=@BUILD_PATENTED
+  DEPENDS:=+libpthread @BUILD_PATENTED
   URL:=http://www.videolan.org/developers/x264.html
 endef