Accepting request 879280 from home:Kieltux:branches:games
- Add supertuxkart-sdl.patch to fix building on SDL2 >= 2.0.14
61833c9c26
OBS-URL: https://build.opensuse.org/request/show/879280
OBS-URL: https://build.opensuse.org/package/show/games/supertuxkart?expand=0&rev=95
This commit is contained in:
Git OBS Bridge
parent
1594af5bc6
commit
01ab98cdf2
106
supertuxkart-sdl.patch
Normal file
106
supertuxkart-sdl.patch
Normal file
@ -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);
|
||||||
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 15 19:46:21 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
|
||||||
|
|
||||||
|
- Add supertuxkart-sdl.patch to fix building on SDL2 >= 2.0.14
|
||||||
|
https://github.com/supertuxkart/stk-code/commit/61833c9c26da5520f2eaa02f2458971ba07f2aad
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Aug 29 13:04:13 UTC 2020 - Matthias Mailänder <mailaender@opensuse.org>
|
Sat Aug 29 13:04:13 UTC 2020 - Matthias Mailänder <mailaender@opensuse.org>
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package supertuxkart
|
# spec file for package supertuxkart
|
||||||
#
|
#
|
||||||
# Copyright (c) 2020 SUSE LLC
|
# Copyright (c) 2021 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -28,6 +28,9 @@ Source: https://github.com/supertuxkart/stk-code/releases/download/%{ver
|
|||||||
# Geeko kart add-on (CC-BY 3.0)
|
# Geeko kart add-on (CC-BY 3.0)
|
||||||
Source1: 14e6ba25b17f0d.zip
|
Source1: 14e6ba25b17f0d.zip
|
||||||
Source9: supertuxkart.6
|
Source9: supertuxkart.6
|
||||||
|
# PATCH-FIX-UPSTREAM - fix building on SDL2 >= 2.0.14
|
||||||
|
# See https://github.com/supertuxkart/stk-code/commit/61833c9c26da5520f2eaa02f2458971ba07f2aad
|
||||||
|
Patch0: supertuxkart-sdl.patch
|
||||||
BuildRequires: cmake >= 3
|
BuildRequires: cmake >= 3
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -90,6 +93,7 @@ Data files for SuperTuxKart a Free 3d kart racing game.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n SuperTuxKart-%{version}-src
|
%setup -q -n SuperTuxKart-%{version}-src
|
||||||
|
%patch0 -p1
|
||||||
find -name '*~' -delete -print
|
find -name '*~' -delete -print
|
||||||
find -name '.git*' -type f -delete -print
|
find -name '.git*' -type f -delete -print
|
||||||
rm -rfv ./.github
|
rm -rfv ./.github
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user