summaryrefslogtreecommitdiff
path: root/games-action/supertuxkart
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-08 11:28:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-08 11:28:34 +0000
commit24fd814c326e282c4321965c31f341dad77e270d (patch)
tree033d63b33c21a3209964ab56005bb9bdd523630d /games-action/supertuxkart
parent129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
gentoo resync : 08.01.2021
Diffstat (limited to 'games-action/supertuxkart')
-rw-r--r--games-action/supertuxkart/Manifest3
-rw-r--r--games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch106
-rw-r--r--games-action/supertuxkart/supertuxkart-1.2.ebuild3
3 files changed, 110 insertions, 2 deletions
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index c86b0a7e7ba1..43ea8d057480 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -2,9 +2,10 @@ AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bc
AUX supertuxkart-1.1-fix-buildsystem.patch 761 BLAKE2B 6a3ca6329851b3ad22b4b7617d7d6b7668ac50a7aebaf8a2cb41f5e8036af03f669dab6cd803de2e7315196aa2c6f8698bf3d65280fb90446e7b64d22d7eabd1 SHA512 b15729cc2aea6286ecc55927a26c5e667c1ac51e8ea505622373fe8b6c51ae3a9dc8d57334d3a9ab1bd968c6107bc5a315963731a3b3ad9d89a8839981abfc11
AUX supertuxkart-1.1-irrlicht-arch-support.patch 1520 BLAKE2B 14c6fc7615e44c5007eb5828ac7e157f69a41343d6f5affb1c6b5af5afdca4c123bd1fe238c90495c097a5eafed976f557212f1e8d89c787069473cf63218fc0 SHA512 7cdb9582248937a9a48aeb1d66cee565fe1bb3255d58ec5dcfd735ee807fa51d7fc0ba661b74156ca12b036af3aefe7cabdf386e71fef98617d24268da2d0c0e
AUX supertuxkart-1.2-irrlicht-system-libs.patch 1706 BLAKE2B a3007cbcf9a01b44e385b9fe30183811a7cb2183ea8560b904271bd1df6ed02c827d4d02ee914691fa2fa9c39ecaf5cc2933318563c9ad0f40614adcf0298076 SHA512 b616bfe18d990f881a703c4c7a545f49d47cbf3bb42f0d4d657fa6a837667a316a48aec0bdf0e1ae803abdf536a66c6c8bbf39f9ec5c6008db7030b67337530a
+AUX supertuxkart-1.2-new-sdl.patch 5394 BLAKE2B 67893f5fb29a954205aeaff2d10029d9f98eacb9b67368a0783bf4a0c84a3d14fb7438e87b8f4925f43757782a48606957aaaea569f98a7b9c3665738fa13bf4 SHA512 e3e70f79168e8de5047d5a7fdb5c96815d8cdf19a010c0110ac90a72fa71abd811577ca80db46f08765b5bb53b77a38ef708d153eb76f7d41f627ebc46deb920
DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
EBUILD supertuxkart-1.1.ebuild 2261 BLAKE2B 92da19bb602e4e86d7efbd49180968d060ec7f1441bf0edabd04842904cdf9c5ee75def32db6278f9e70cf7b6abd63b1d6297c37aa68e688243dc85c37701973 SHA512 6b6d48a2344093b278739b3620f6ee1064233cd19cdea51c6bc94a7084c5d0a6f577b6fd57d75e1e3bb7052947f8b4a2ca997a14ac3f6b188656d7d0bc3072c4
-EBUILD supertuxkart-1.2.ebuild 2200 BLAKE2B 07c8a9c06f7c841a88a0ab9e292f9ebeda184b16872ff28e9afbd183ef4700f8fac5c5807993fbfc1cf2d310732354c4d842e1ac2b57e9fe8efd7412a7606a38 SHA512 e4b4c4269856fa539db4bb2989f16fd8bd153432102da83fefae2249091010c129aad6973a3ae9dc238ab8d79fc86077038851a56fbbae85d60c53f9c5b585b2
+EBUILD supertuxkart-1.2.ebuild 2234 BLAKE2B 4ff335dfc6d84df9c8c9555002b75f95e51f15d1167681b00e962dcee06043dfbd6a75c5e0b31c22fb26e214916dcac558ebef9c6d97186d89362480bb08ee61 SHA512 b48b83e366d4f8d138a1f19e824b14eb6a8cfad133b623fe94d87aae64105f5ece6bdb43d76cb494e9082f94a9e7610df5461a704cb1da5c5373a5bf9fe89b76
MISC metadata.xml 744 BLAKE2B 9a5503c3ced6ea22f92a36d6b8bb59dc9a36c58c6aae2d0e5894ee660c411cfaf99d9fefa27cae93d8d9523d1b537a1bc74a6377e143a50965f3b2a6223e02ab SHA512 9db288ffb3c471712925fe0a7d2f1a09b4618397533cd1f0ca2e70f3008ab7ed1ee72d9533f99ee68464c16cb024d7ec468fe9107bbecd05091f9ca6f5325608
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
new file mode 100644
index 000000000000..973c75d010fb
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
@@ -0,0 +1,106 @@
+From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Sun, 29 Nov 2020 12:42:11 +0800
+Subject: [PATCH] Fix compilation with latest SDL
+
+---
+ src/input/gamepad_config.cpp | 55 ++++++++++++++++++------------------
+ 1 file changed, 27 insertions(+), 28 deletions(-)
+
+diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
+index 7c6f632099..c060e7a5a7 100644
+--- a/src/input/gamepad_config.cpp
++++ b/src/input/gamepad_config.cpp
+@@ -32,8 +32,7 @@
+ #include "input/sdl_controller.hpp"
+ #include <array>
+
+-static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
+-enum AxisWithDirection
++enum AxisWithDirection : unsigned
+ {
+ SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
+ SDL_CONTROLLER_AXIS_LEFTX_LEFT,
+@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
+ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
+ {
+ #ifndef SERVER_ONLY
+- std::array<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
++ std::map<unsigned, core::stringw> readable =
+ {{
+- "A", // SDL_CONTROLLER_BUTTON_A
+- "B", // SDL_CONTROLLER_BUTTON_B
+- "X", // SDL_CONTROLLER_BUTTON_X
+- "Y", // SDL_CONTROLLER_BUTTON_Y
++ { SDL_CONTROLLER_BUTTON_A, "A" },
++ { SDL_CONTROLLER_BUTTON_B, "B" },
++ { SDL_CONTROLLER_BUTTON_X, "X" },
++ { SDL_CONTROLLER_BUTTON_Y, "Y" },
+ // I18N: name of buttons on gamepads
+- _("Back"), // SDL_CONTROLLER_BUTTON_BACK
++ { SDL_CONTROLLER_BUTTON_BACK, _("Back") },
+ // I18N: name of buttons on gamepads
+- _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
++ { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
+ // I18N: name of buttons on gamepads
+- _("Start"), // SDL_CONTROLLER_BUTTON_START
++ { SDL_CONTROLLER_BUTTON_START, _("Start") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
++ { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
++ { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
+ // I18N: name of buttons on gamepads
+- _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
++ { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
+ // I18N: name of buttons on gamepads
+- _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
++ { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
+ // I18N: name of buttons on gamepads
+- _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
++ { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
+ // I18N: name of buttons on gamepads
+- _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
++ { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
+ // I18N: name of buttons on gamepads
+- _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
++ { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
+ // I18N: name of buttons on gamepads
+- _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
++ { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
+
+ // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
++ { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
++ { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
++ { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP
++ { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT
++ { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT
++ { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN
++ { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP
++ { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") },
+ // I18N: name of buttons on gamepads
+- _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP
++ { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") },
+ // I18N: name of buttons on gamepads
+- _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP
++ { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") }
+ }};
+
+ const Binding &b = getBinding(action);
diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild b/games-action/supertuxkart/supertuxkart-1.2.ebuild
index 5e9aa59fdef6..fc674824ebbe 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -57,6 +57,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
"${FILESDIR}"/${PN}-1.2-irrlicht-system-libs.patch
+ "${FILESDIR}"/${P}-new-sdl.patch
)
src_prepare() {