<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6e68d13e5a95d3e13ff05cd16415b3a8ca68fa11">https://github.com/macports/macports-ports/commit/6e68d13e5a95d3e13ff05cd16415b3a8ca68fa11</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 6e68d13e5a9 supertuxkart: patch to fix SDL-related build failure in file src/input/gamepad_config.cpp
</span>6e68d13e5a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e68d13e5a95d3e13ff05cd16415b3a8ca68fa11
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jan 10 14:54:55 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> supertuxkart: patch to fix SDL-related build failure in file src/input/gamepad_config.cpp
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/62024
</span>---
games/supertuxkart/Portfile | 7 +-
.../files/patch-1.2-sdl-gamepad_config.diff | 95 ++++++++++++++++++++++
2 files changed, 101 insertions(+), 1 deletion(-)
<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 39b153d1e63..185697f3b41 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;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span>
name supertuxkart
version 1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories games
license GPL-3+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,11 @@ use_xz yes
</span>
homepage http://supertuxkart.sourceforge.net/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for v1.2: static_assert build failure in src/input/gamepad_config.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Already included in upstream master; remove after next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/62024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-1.2-sdl-gamepad_config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 266b0ee1bca4726dd87104dc568baa632f84461a \
sha256 052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37 \
size 614569164
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertuxkart/files/patch-1.2-sdl-gamepad_config.diff b/games/supertuxkart/files/patch-1.2-sdl-gamepad_config.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fbdecc9378e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/supertuxkart/files/patch-1.2-sdl-gamepad_config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,95 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/input/gamepad_config.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/input/gamepad_config.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,8 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "input/sdl_controller.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-enum AxisWithDirection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum AxisWithDirection : unsigned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_CONTROLLER_AXIS_LEFTX_LEFT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef SERVER_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::array<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::map<unsigned, core::stringw> readable =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "A", // SDL_CONTROLLER_BUTTON_A
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "B", // SDL_CONTROLLER_BUTTON_B
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "X", // SDL_CONTROLLER_BUTTON_X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Y", // SDL_CONTROLLER_BUTTON_Y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_A, "A" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_B, "B" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_X, "X" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_Y, "Y" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Back"), // SDL_CONTROLLER_BUTTON_BACK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_BACK, _("Back") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Start"), // SDL_CONTROLLER_BUTTON_START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_START, _("Start") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: name of buttons on gamepads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") }
</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;'>+ const Binding &b = getBinding(action);
</span></pre><pre style='margin:0'>
</pre>