[vlc-commits] contrib: vpx: add patch to use macOS SDK on macOS aarch64

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon Aug 10 16:01:05 2020 +0200| [fa81c086d7e5b411eb67e35003918c0b9b6975ef] | committer: Felix Paul Kühne

contrib: vpx: add patch to use macOS SDK on macOS aarch64

(cherry picked from commit 6f043e6474534f45c077bae8ffacb2292b643d36)
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=fa81c086d7e5b411eb67e35003918c0b9b6975ef
---

 contrib/src/vpx/libvpx-darwin-aarch64.patch | 20 ++++++++++++++++++++
 contrib/src/vpx/rules.mak                   |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/contrib/src/vpx/libvpx-darwin-aarch64.patch b/contrib/src/vpx/libvpx-darwin-aarch64.patch
new file mode 100644
index 0000000000..b7e3efff56
--- /dev/null
+++ b/contrib/src/vpx/libvpx-darwin-aarch64.patch
@@ -0,0 +1,20 @@
+--- ./build/make/configure.sh.original  2020-08-10 15:46:20.000000000 +0200
++++ ./build/make/configure.sh   2020-08-10 15:54:53.000000000 +0200
+@@ -996,7 +996,7 @@ EOF
+ 
+         darwin*)
+           if ! enabled external_build; then
+-            XCRUN_FIND="xcrun --sdk iphoneos --find"
++            XCRUN_FIND="xcrun --find"
+             CXX="$(${XCRUN_FIND} clang++)"
+             CC="$(${XCRUN_FIND} clang)"
+             AR="$(${XCRUN_FIND} ar)"
+@@ -1015,7 +1015,7 @@ EOF
+             add_cflags -arch ${tgt_isa}
+             add_ldflags -arch ${tgt_isa}
+ 
+-            alt_libc="$(show_darwin_sdk_path iphoneos)"
++            alt_libc="$(show_darwin_sdk_path macosx)"
+             if [ -d "${alt_libc}" ]; then
+               add_cflags -isysroot ${alt_libc}
+             fi
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index f8a3d018be..c1db45ffb7 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -23,6 +23,9 @@ ifdef HAVE_ANDROID
 endif
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/vpx/darwin-do-not-overwrite-ld.patch
+ifeq ($(ARCH),aarch64)
+	$(APPLY) $(SRC)/vpx/libvpx-darwin-aarch64.patch
+endif
 endif
 	$(MOVE)