<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb028dfb6fa248019a3cd1b85e3babae578e93dd">https://github.com/macports/macports-ports/commit/fb028dfb6fa248019a3cd1b85e3babae578e93dd</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 fb028dfb6fa supertuxkart: fix build on 10.8-10.10
</span>fb028dfb6fa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fb028dfb6fa248019a3cd1b85e3babae578e93dd
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Tue May 16 20:39:32 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> supertuxkart: fix build on 10.8-10.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67263
</span>---
games/supertuxkart/Portfile | 3 ---
.../supertuxkart/files/patch-supertuxkart-no-metal.diff | 17 ++++++++++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertuxkart/Portfile b/games/supertuxkart/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41069a1dade..8aec6ea4616 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/supertuxkart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/supertuxkart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,9 +77,6 @@ if { ${os.platform} eq "darwin" && ${os.major} <= 10 } {
</span> }
if { ${os.platform} eq "darwin" && ${os.major} <= 14 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # MoltenVK.mm:14:41: error: use of undeclared identifier 'NSAppKitVersionNumber10_10_Max'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -DNSAppKitVersionNumber10_10_Max=1349
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # No Metal, https://trac.macports.org/ticket/67263
patchfiles-append patch-supertuxkart-no-metal.diff
configure.args-append -DDLOPEN_MOLTENVK=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertuxkart/files/patch-supertuxkart-no-metal.diff b/games/supertuxkart/files/patch-supertuxkart-no-metal.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c406b95f3b..cca476dd4d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/supertuxkart/files/patch-supertuxkart-no-metal.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/supertuxkart/files/patch-supertuxkart-no-metal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Undefining __OBJC__ prevents Metal headers from being included.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Supertuxkart will fall back to OpenGL at run-time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch to work on 10.10 and earlier (and only those systems).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The undef prevents Metal from being imported; the defines fill in for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+NSApplication.h, which otherwise has a conflicting type with IOSurfaceRef.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://trac.macports.org/ticket/67263
</span>
--- lib/irrlicht/source/Irrlicht/MoltenVK.mm.orig
+++ lib/irrlicht/source/Irrlicht/MoltenVK.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,11 @@
</span> #include "MoltenVK.h"
#include "SDL_vulkan.h"
+#undef __OBJC__
#include "vulkan_wrapper.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __OBJC__
</span>
#include <dlfcn.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <AppKit/NSApplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <AppKit/NSApplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const double NSAppKitVersionNumber;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NSAppKitVersionNumber10_10_Max 1349
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef DLOPEN_MOLTENVK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PFN_vkGetMoltenVKConfigurationMVK vkGetMoltenVKConfigurationMVK = NULL;
</span></pre><pre style='margin:0'>
</pre>