supertuxkart: Update to 1.3
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
@@ -0,0 +1,50 @@
|
||||
From 1cce43b2fa368152b83b12c21b3183c7affc9fa9 Mon Sep 17 00:00:00 2001
|
||||
From: Benau <Benau@users.noreply.github.com>
|
||||
Date: Thu, 7 Oct 2021 16:30:32 +0800
|
||||
Subject: [PATCH] Fix MIPS compilation
|
||||
|
||||
---
|
||||
src/graphics/sp/sp_texture.cpp | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/graphics/sp/sp_texture.cpp b/src/graphics/sp/sp_texture.cpp
|
||||
index 383db7030..000d66cff 100644
|
||||
--- a/src/graphics/sp/sp_texture.cpp
|
||||
+++ b/src/graphics/sp/sp_texture.cpp
|
||||
@@ -797,27 +797,27 @@ std::vector<std::pair<core::dimension2du, unsigned> >
|
||||
assert(c->getReferenceCount() == 1);
|
||||
std::shared_ptr<video::IImage> compressed(c);
|
||||
|
||||
- uint8_t* mips = new uint8_t[image->getDimension().getArea() * 4]();
|
||||
- uint8_t* mips_loc = mips;
|
||||
+ uint8_t* mipmaps = new uint8_t[image->getDimension().getArea() * 4]();
|
||||
+ uint8_t* mipmaps_loc = mipmaps;
|
||||
uint8_t* compressed_loc = (uint8_t*)compressed->lock();
|
||||
squishCompressImage((uint8_t*)image->lock(),
|
||||
mipmap_sizes[0].first.Width, mipmap_sizes[0].first.Height,
|
||||
mipmap_sizes[0].first.Width * 4, compressed->lock(), tc_flag);
|
||||
|
||||
// Now compress mipmap
|
||||
- generateHQMipmap(image->lock(), mipmap_sizes, mips);
|
||||
+ generateHQMipmap(image->lock(), mipmap_sizes, mipmaps);
|
||||
compressed_loc += mipmap_sizes[0].second;
|
||||
for (unsigned mip = 1; mip < mipmap_sizes.size(); mip++)
|
||||
{
|
||||
- squishCompressImage(mips_loc,
|
||||
+ squishCompressImage(mipmaps_loc,
|
||||
mipmap_sizes[mip].first.Width, mipmap_sizes[mip].first.Height,
|
||||
mipmap_sizes[mip].first.Width * 4, compressed_loc, tc_flag);
|
||||
- mips_loc += mipmap_sizes[mip].first.Width *
|
||||
+ mipmaps_loc += mipmap_sizes[mip].first.Width *
|
||||
mipmap_sizes[mip].first.Height * 4;
|
||||
compressed_loc += mipmap_sizes[mip].second;
|
||||
}
|
||||
|
||||
- delete [] mips;
|
||||
+ delete [] mipmaps;
|
||||
image.swap(compressed);
|
||||
#endif
|
||||
return mipmap_sizes;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,111 +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
|
||||
|
||||
|
||||
Upstream-Status: Accepted [https://github.com/supertuxkart/stk-code/commit/61833c9c26da5520f2eaa02f2458971ba07f2aad]
|
||||
---
|
||||
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 7c6f63209..c060e7a5a 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);
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -26,10 +26,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
SRC_URI = " \
|
||||
https://github.com/supertuxkart/stk-code/releases/download/${PV}/SuperTuxKart-${PV}-src.tar.xz \
|
||||
file://0001-Fix-compilation-with-latest-SDL.patch \
|
||||
file://0001-Fix-MIPS-compilation.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37"
|
||||
SRC_URI[sha256sum] = "eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd"
|
||||
|
||||
S = "${WORKDIR}/SuperTuxKart-${PV}-src"
|
||||
|
||||
Reference in New Issue
Block a user