[vlc-commits] contrib: vpx: do not enable runtime cpu detect for aarch64 darwin

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon Aug 10 15:09:20 2020 +0200| [1750865533f3c542f42c71cfb7a6538bf8fdbd93] | committer: Felix Paul Kühne

contrib: vpx: do not enable runtime cpu detect for aarch64 darwin

(cherry picked from commit 5681ea32dd6b57f96a251562fbcc0e413a74ddf5)
Signed-off-by: Felix Paul Kühne <felix at feepk.net>

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

 contrib/src/vpx/rules.mak | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index abef030a39..f8a3d018be 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -71,20 +71,12 @@ ifdef HAVE_ANDROID
 VPX_OS := android
 else ifdef HAVE_LINUX
 VPX_OS := linux
-else ifdef HAVE_MACOSX
-ifeq ($(OSX_VERSION),10.5)
-VPX_OS := darwin9
-else
-VPX_OS := darwin10
-endif
-VPX_CROSS :=
-else ifdef HAVE_IOS
+else ifdef HAVE_DARWIN_OS
 VPX_CROSS :=
 ifeq ($(ARCH),$(filter $(ARCH), arm aarch64))
 VPX_OS := darwin
 else
 VPX_OS := darwin11
-VPX_CROSS :=
 endif
 else ifdef HAVE_SOLARIS
 VPX_OS := solaris
@@ -113,15 +105,13 @@ VPX_CONF := \
 	--enable-vp9-highbitdepth \
 	--disable-tools
 
+ifneq ($(filter arm aarch64, $(ARCH)),)
+# Only enable runtime cpu detect on architectures other than arm/aarch64
+# when building for Windows and Darwin
 ifndef HAVE_WIN32
-ifndef HAVE_IOS
+ifndef HAVE_DARWIN_OS
 VPX_CONF += --enable-runtime-cpu-detect
 endif
-else
-# WIN32
-ifeq ($(filter arm aarch64, $(ARCH)),)
-# Only enable runtime cpu detect on architectures other than arm/aarch64
-VPX_CONF += --enable-runtime-cpu-detect
 endif
 endif