From 8a08d9baed425dada67a29668fe577ce37301a6b Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Mon, 8 May 2023 16:15:15 -0400
Subject: [PATCH] contrib: fix vpx build for Mac silicon

To build for arm64 on macOS, Darwin version 20 or higher
is required.

Change-Id: I6da0b78e64eee2b0b3b6169be58fd261ac3085be
---
 contrib/src/vpx/rules.mak | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 81a7c896b3..076e91f137 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -21,8 +21,10 @@ DEPS_vpx =
 
 ifdef HAVE_CROSS_COMPILE
 ifndef HAVE_IOS
+ifndef HAVE_MACOSX
 VPX_CROSS := $(CROSS_COMPILE)
 endif
+endif
 else
 VPX_CROSS :=
 endif
@@ -53,13 +55,11 @@ VPX_OS := linux
 else ifdef HAVE_DARWIN_OS
 ifeq ($(IOS_TARGET_PLATFORM),iPhoneSimulator)
 VPX_OS := iphonesimulator
-else ifeq ($(ARCH),armv7)
-VPX_OS := darwin
-else ifeq ($(ARCH),arm64)
+else ifdef HAVE_IOS
 VPX_OS := darwin
 else
-#to support minimum macOS version 10.13
-VPX_OS := darwin17
+# To build for arm64 on macOS, we need Darwin version 20 or higher
+VPX_OS := darwin20
 endif
 else ifdef HAVE_SOLARIS
 VPX_OS := solaris
-- 
GitLab