[vlc-commits] contrib: vpx: fix armv7* build on iOS

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jan 18 11:04:59 2018 +0100| [ed5177c851bc4902e5775a8baf00f79e21dd4d20] | committer: Thomas Guillem

contrib: vpx: fix armv7* build on iOS

(cherry picked from commit 7b77937df759747702f89aacb9e03fbbb29a6e55)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ed5177c851bc4902e5775a8baf00f79e21dd4d20
---

 contrib/src/vpx/rules.mak | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index e5e44758f0..efec7cb484 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -33,7 +33,15 @@ endif
 VPX_LDFLAGS := $(LDFLAGS)
 
 ifeq ($(ARCH),arm)
+ifdef HAVE_IOS
+ifneq ($(filter armv7s%,$(subst -, ,$(HOST))),)
+VPX_ARCH := armv7s
+else
+VPX_ARCH := armv7
+endif
+else
 VPX_ARCH := armv7
+endif
 else ifeq ($(ARCH),i386)
 VPX_ARCH := x86
 else ifeq ($(ARCH),mips)
@@ -59,7 +67,11 @@ else
 VPX_OS := darwin10
 endif
 else ifdef HAVE_IOS
+ifeq ($(ARCH),arm)
+VPX_OS := darwin
+else
 VPX_OS := darwin11
+endif
 else ifdef HAVE_SOLARIS
 VPX_OS := solaris
 else ifdef HAVE_WIN64 # must be before WIN32
@@ -78,7 +90,6 @@ endif
 endif
 
 VPX_CONF := \
-	--enable-runtime-cpu-detect \
 	--disable-docs \
 	--disable-examples \
 	--disable-unit-tests \
@@ -87,6 +98,10 @@ VPX_CONF := \
 	--disable-dependency-tracking \
 	--enable-vp9-highbitdepth
 
+ifndef HAVE_IOS
+VPX_CONF += --enable-runtime-cpu-detect
+endif
+
 ifndef BUILD_ENCODERS
 VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
 endif
@@ -109,9 +124,11 @@ endif
 ifeq ($(ARCH),aarch64)
 VPX_LDFLAGS += -arch arm64
 else
+ifndef HAVE_IOS
 VPX_LDFLAGS += -arch $(ARCH)
 endif
 endif
+endif
 ifdef HAVE_ANDROID
 # vpx configure.sh overrides our sysroot and it looks for it itself, and
 # uses that path to look for the compiler (which we already know)