From 743c37630b2bf0b7b7ca293b662f8def5bc0285f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 1 Oct 2021 05:41:22 -0300 Subject: [PATCH] supertuxkart: update to 1.3. --- ...3c9c26da5520f2eaa02f2458971ba07f2aad.patch | 106 ------------------ .../supertuxkart/patches/ns_name_ntop.patch | 17 --- srcpkgs/supertuxkart/template | 6 +- 3 files changed, 3 insertions(+), 126 deletions(-) delete mode 100644 srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch delete mode 100644 srcpkgs/supertuxkart/patches/ns_name_ntop.patch diff --git a/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch deleted file mode 100644 index 18dd7a6ef9c5..000000000000 --- a/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001 -From: Benau -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 src/input/gamepad_config.cpp 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 - --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 readable = -+ std::map 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/srcpkgs/supertuxkart/patches/ns_name_ntop.patch b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch deleted file mode 100644 index d251deaa15a6..000000000000 --- a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch from https://github.com/supertuxkart/stk-code/pull/4361 - -Necessary because musl does not (yet?) implement ns_name_ntop. - -diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp -index 605254808..fd4fd5d24 100644 ---- a/src/network/network_config.cpp -+++ b/src/network/network_config.cpp -@@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector >* l, - for (unsigned i = 0; i < srv.size(); i++) - { - char server_name[512] = {}; -- if (ns_name_ntop(srv[i] + SRV_SERVER, server_name, 512) < 0) -+ if (ns_name_uncompress(response, response + response_len, srv[i] + SRV_SERVER, server_name, 512) < 0) - continue; - uint16_t port = ns_get16(srv[i] + SRV_PORT); - uint16_t weight = ns_get16(srv[i] + SRV_WEIGHT); diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template index 519bc615782d..52cbec801334 100644 --- a/srcpkgs/supertuxkart/template +++ b/srcpkgs/supertuxkart/template @@ -1,7 +1,7 @@ # Template file for 'supertuxkart' pkgname=supertuxkart -version=1.2 -revision=3 +version=1.3 +revision=1 wrksrc="SuperTuxKart-${version}-src" build_style=cmake hostmakedepends="pkg-config" @@ -16,7 +16,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://supertuxkart.net" distfiles="https://github.com/${pkgname}/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz" -checksum=052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37 +checksum=eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel"