<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f5ba6115b3c18ec02d892e1473ae9b185ad8cde1">https://github.com/macports/macports-ports/commit/f5ba6115b3c18ec02d892e1473ae9b185ad8cde1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f5ba6115b3c libsdl2: Fix build on arm64 Macs
</span>f5ba6115b3c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f5ba6115b3c18ec02d892e1473ae9b185ad8cde1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 4 00:44:51 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libsdl2: Fix build on arm64 Macs
</span>---
devel/libsdl2/Portfile | 3 ++-
devel/libsdl2/files/arm.patch | 45 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/Portfile b/devel/libsdl2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75d5c66dd39..0e761f998df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsdl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,8 @@ checksums rmd160 0f2c979da6151b622a6445e7fc8d4e3ea8987105 \
</span> sha256 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863
patchfiles NSOperatingSystemVersion.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sdl2-config.cmake.in-fix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sdl2-config.cmake.in-fix.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm.patch
</span>
configure.args --without-x
build.args V=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/arm.patch b/devel/libsdl2/files/arm.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ff3a768651c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsdl2/files/arm.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Properly identify Apple Silicon Macs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is a combination of three upstream commits:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://hg.libsdl.org/SDL/rev/af22dd6c0787
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://hg.libsdl.org/SDL/rev/8a12de07fc37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://hg.libsdl.org/SDL/rev/ac567246864a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-03-10 20:36:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-09-04 00:03:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21667,7 +21667,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <Metal/Metal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <QuartzCore/CAMetalLayer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if !TARGET_CPU_X86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if TARGET_CPU_X86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error Metal doesn't work on this configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22570,7 +22570,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Metal/Metal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QuartzCore/CAMetalLayer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if !TARGET_CPU_X86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if TARGET_CPU_X86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error Vulkan doesn't work on this configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24222,7 +24222,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so we'll just use libusb when it's available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$host" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libusb does not support iOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arm*-apple-darwin* | *-ios-* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-ios-* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skiplibusb=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On the other hand, *BSD specifically uses libusb only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25072,7 +25072,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arm*-apple-darwin*|*-ios-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-ios-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH=ios
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CheckVisibilityHidden
</span></pre><pre style='margin:0'>
</pre>