Dominique Leuenberger 2021-10-01 20:29:08 +00:00 committed by Git OBS Bridge
commit 3b8c2d6e4d
5 changed files with 51 additions and 115 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
size 614569164

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd
size 627753500

View File

@ -1,106 +0,0 @@
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);

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Wed Sep 29 18:09:14 UTC 2021 - ecsos <ecsos@opensuse.org>
- Update to version 1.3
* Networking
- Server bookmarks
* Graphics
- Introduce render resolution scaling for the modern renderer.
For users with limited GPU power, this allows to get significant performance (FPS) gains
at the cost of image quality.
It can also allow additional graphics effects at the same performance.
This is especially useful for users with high-resolution and high-DPI screens.
The scaling only affects the 3D scene, the UI remains crisp at full-resolution.
- Simplification through removal of unused deprecated graphical effects
- Many updates to texture-related code
- Auto-compute Level of Detail distances for 3D models set to use LOD depending on track complexity.
The geometry level parameter allows partial control over the drawing distances.
- Improved screen space reflection
* General
- Switch port
- Gamepad force feedback support
- Highscore screen
- Grand Prix highscores
- Updates to the bundled tinygettext library
- Enable custom skidding sounds for karts
- Greatly sped up loading of tracks with many checklines through optimization
- And many bugfixes and enhancements too small or specific to be detailed
* User Interface
- Display the skin-appropriate iconset without having to restart
- Fix some issues with the options menu when used during a pause
- Add a confirmation dialog before closing the game through the "go back" key/button
- In the result screen, display the race position with a number with 10 karts or more
- In the result screen, display the challenge result and the requirements met or failed
- Many small menu and dialogs improvements
- Usability and functionality improvements to the debug menu
- Clickable URLs in text
* In-race UI
Add visual and sound feedback when a timed challenge or timed game is about to end
* Tracks and modeling
- Alien Signal
- Ancient Colosseum Labyrinth
- Improved Las Dunas Soccer
- Add lap line extensions to Hacienda, Old Mine, Ravenbridge Mansion and Shifting Sands
- New Pepper kart
- Improved Adiumy, Emule, GNU and Sara karts
- Drop supertuxkart-sdl.patch because now in upstream.
-------------------------------------------------------------------
Mon Mar 15 19:46:21 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>

View File

@ -18,7 +18,7 @@
#
Name: supertuxkart
Version: 1.2
Version: 1.3
Release: 0
Summary: A 3D kart racing game
License: GPL-2.0-or-later AND GPL-3.0-or-later AND CC-BY-SA-3.0
@ -28,9 +28,6 @@ Source: https://github.com/supertuxkart/stk-code/releases/download/%{ver
# Geeko kart add-on (CC-BY 3.0)
Source1: 14e6ba25b17f0d.zip
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: fdupes
BuildRequires: gcc-c++
@ -93,7 +90,6 @@ Data files for SuperTuxKart a Free 3d kart racing game.
%prep
%setup -q -n SuperTuxKart-%{version}-src
%patch0 -p1
find -name '*~' -delete -print
find -name '.git*' -type f -delete -print
rm -rfv ./.github
@ -148,7 +144,6 @@ cp %{SOURCE9} %{buildroot}%{_mandir}/man6
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/supertuxkart.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/supertuxkart.png
%{_datadir}/icons/hicolor/
%files data