diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-11 14:19:56 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-11 14:19:56 +0100 |
commit | 34d4f34516ab568ad4ea24fc16ee0ad9ec8ad079 (patch) | |
tree | 3339f6fc30715c2fbe1d20281f6ddc53eda3f9b4 /games-action/supertuxkart/files | |
parent | 32eff0cac517b699efc32b86520bac482961a57f (diff) |
gentoo auto-resync : 11:08:2022 - 14:19:56
Diffstat (limited to 'games-action/supertuxkart/files')
-rw-r--r-- | games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch | 67 | ||||
-rw-r--r-- | games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch | 106 |
2 files changed, 0 insertions, 173 deletions
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch deleted file mode 100644 index f9681733cfb1..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch +++ /dev/null @@ -1,67 +0,0 @@ -Subject: [PATCH] debian/use-system-libs - -Path to build irrlicht using the system libraries for png,zlib and -jpeg as well as the glext family of header files. - -Signed-off-by: Christoph Egger <debian@christoph-egger.org - ---- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp -+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp -@@ -35,7 +35,7 @@ - #include <GL/gl.h>
- #ifdef _IRR_OPENGL_USE_EXTPOINTER_
- #define GLX_GLXEXT_PROTOTYPES
--#include "glxext.h"
-+#include <GL/glxext.h>
- #endif
- #endif
-
---- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h -+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h -@@ -24,7 +24,7 @@ - #define NO_SDL_GLEXT - #include <SDL_video.h> - #include <SDL_opengl.h> -- #include "glext.h" -+ #include <GL/glext.h> - #elif defined(_IRR_WINDOWS_API_) - // include windows headers for HWND - #define WIN32_LEAN_AND_MEAN -@@ -34,7 +34,7 @@ - #endif - #include <GL/gl.h> - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -- #include "glext.h" -+ #include <GL/glext.h> - #endif - #include "wglext.h" - -@@ -49,7 +49,7 @@ - #endif - #include <OpenGL/gl.h> - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -- #include "glext.h" -+ #include <GL/glext.h> - #endif - #endif - ---- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h -+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h -@@ -12,7 +12,7 @@ - #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
- #include <GL/gl.h>
-- #include "glext.h"
-+ #include <GL/glext.h>
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #define GL_GLEXT_LEGACY 1
-@@ -26,7 +26,7 @@ - #include <GL/gl.h>
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-- #include "glext.h"
-+ #include <GL/glext.h>
- #endif
- #endif
-
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch deleted file mode 100644 index 973c75d010fb..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch +++ /dev/null @@ -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); |