Attachment #231546 for bug #261702

View | Details | Raw Unified | Return to bug 261702
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/games/supertuxkart/Makefile (-2 / +3 lines)
		1
1	PORTNAME= supertuxkart	2	PORTNAME= supertuxkart
2	PORTVERSION= 1.2	3	PORTVERSION= 1.3
3	PORTREVISION= 2	4	PORTREVISION= 0
4	CATEGORIES= games	5	CATEGORIES= games
5	MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION}	6	MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION}
6	DISTNAME= SuperTuxKart-${PORTVERSION}-src	7	DISTNAME= SuperTuxKart-${PORTVERSION}-src

Lines 1-3 Link Here

(-)b/games/supertuxkart/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1598745498	1	TIMESTAMP = 1643902914
2	SHA256 (SuperTuxKart-1.2-src.tar.xz) = 052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37	2	SHA256 (SuperTuxKart-1.3-src.tar.xz) = eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd
3	SIZE (SuperTuxKart-1.2-src.tar.xz) = 614569164	3	SIZE (SuperTuxKart-1.3-src.tar.xz) = 627753500




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
--- src/input/gamepad_config.cpp
+++ 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);




--- CMakeLists.txt.orig	2020-08-28 08:21:35 UTC
+++ CMakeLists.txt
@@ -174,7 +174,7 @@ endif()
 
 # Build the Bullet physics library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
-include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
+include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/bullet/src")
 
 if(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "BSD")
     set(LIBRESOLV_LIBRARY)
@@ -198,7 +198,7 @@ if(ENET_FOUND AND NOT USE_IPV6)
 else()
     # Fallback to built-in version
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+    include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/enet/include")
     set(ENET_LIBRARIES "enet")
 endif()
 
@@ -208,7 +208,7 @@ if (APPLE AND NOT IOS)
     find_path(GLEW_INCLUDEDIR NAMES GL/glew.h glew.h PATHS)
     if (NOT GLEW_LIBRARY OR NOT GLEW_INCLUDEDIR)
         add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
-        include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+	include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/glew/include")
         set(GLEW_LIBRARIES "glew")
     else()
         set(GLEW_LIBRARIES ${GLEW_LIBRARY})
@@ -226,7 +226,7 @@ elseif(NOT USE_GLES2 AND NOT SERVER_ONLY)
     else()
         # Fallback to built-in version silently
         add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
-        include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+	include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/glew/include")
         set(GLEW_LIBRARIES "glew")
     endif()
 endif()
@@ -260,7 +260,7 @@ endif()
 
 if(NOT SERVER_ONLY)
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
+    include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/graphics_utils")
 endif()
 
 # Libmcpp
@@ -268,7 +268,7 @@ find_library(MCPP_LIBRARY NAMES mcpp libmcpp)
 find_path(MCPP_INCLUDEDIR NAMES mcpp_lib.h PATHS)
 if (NOT MCPP_LIBRARY OR NOT MCPP_INCLUDEDIR)
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/mcpp")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/mcpp")
+    include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/mcpp")
     SET(MCPP_LIBRARY mcpp)
     message(STATUS "System libmcpp not found, use the bundled one.")
 else()
@@ -283,7 +283,7 @@ if(NOT SERVER_ONLY)
     endif()
     if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
         add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
-        include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
+	include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/libsquish")
         SET(SQUISH_LIBRARY squish)
     else()
         include_directories("${SQUISH_INCLUDEDIR}")
@@ -306,7 +306,7 @@ endif()
 
 # Build the irrlicht library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
-include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
+include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
 
 # Build the Wiiuse library
 # Note: wiiuse MUST be declared after irrlicht, since otherwise
@@ -325,7 +325,7 @@ if(USE_WIIUSE)
         if(WIIUSE_BUILD)
             add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
         endif()
-        include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse/src")
+	include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/wiiuse/src")
         set(WIIUSE_LIBRARIES "wiiuse" "bluetooth")
     endif()
 endif()
@@ -353,7 +353,7 @@ if(USE_SYSTEM_ANGELSCRIPT)
     endif()
 else()
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+    include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/angelscript/include")
     set(Angelscript_LIBRARIES angelscript)
 endif()
 
@@ -373,7 +373,7 @@ endif()
 if (NOT SERVER_ONLY)
     # SheenBidi
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/sheenbidi")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/sheenbidi/Headers")
+    include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/sheenbidi/Headers")
     SET(SHEENBIDI_LIBRARY sheenbidi)
 
     # Freetype
@@ -420,7 +420,7 @@ if(USE_SQLITE3)
     find_path(SQLITE3_INCLUDEDIR NAMES sqlite3.h PATHS)
     if (NOT SQLITE3_LIBRARY OR NOT SQLITE3_INCLUDEDIR)
 #        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/sqlite3")
-#        include_directories("${PROJECT_SOURCE_DIR}/lib/sqlite3")
+#        include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/sqlite3")
 #        SET(SQLITE3_LIBRARY sqlite3)
         set(USE_SQLITE3 OFF CACHE BOOL "Use sqlite to manage server stats and ban list." FORCE)
         message(WARNING "Sqlite3 not found, disable advanced server management.")

Removed Link Here

(-)a/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt (-10 lines)
1	--- lib/angelscript/projects/cmake/CMakeLists.txt.orig 2020-01-03 18:47:06 UTC
2	+++ lib/angelscript/projects/cmake/CMakeLists.txt
3	@@ -112,7 +112,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
4	if(CMAKE_ASM_COMPILER_WORKS)
5	set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
6	if (NOT IOS)
7	- set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
8	endif()
9	else()
10	message(FATAL ERROR "ARM target requires a working assembler")

Removed Link Here

(-)a/games/supertuxkart/files/patch-src_network_stk__ipv6.cpp (-10 lines)
1	--- src/network/stk_ipv6.cpp.orig 2020-01-03 18:47:06 UTC
2	+++ src/network/stk_ipv6.cpp
3	@@ -39,6 +39,7 @@ extern "C"
4	#else
5
6	#include <arpa/inet.h>
7	+#include <netinet/in.h>
8	#include <err.h>
9	#include <netdb.h>
10	#include <sys/socket.h>

Lines 9-13 share/icons/hicolor/48x48/apps/supertuxkart.png Link Here

(-)b/games/supertuxkart/pkg-plist (-2 lines)
9	share/icons/hicolor/512x512/apps/supertuxkart.png	9	share/icons/hicolor/512x512/apps/supertuxkart.png
10	share/icons/hicolor/64x64/apps/supertuxkart.png	10	share/icons/hicolor/64x64/apps/supertuxkart.png
11	share/metainfo/supertuxkart.appdata.xml	11	share/metainfo/supertuxkart.appdata.xml
12	share/pixmaps/supertuxkart.png
13	@dir %%DATADIR%%/data/editor/maps	12	@dir %%DATADIR%%/data/editor/maps
14	-

Return to bug 261702

Removed Link Here

(-)a/games/supertuxkart/files/patch-61833c9 (-106 lines)
1	From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
2	From: Benau <Benau@users.noreply.github.com>
3	Date: Sun, 29 Nov 2020 12:42:11 +0800
4	Subject: [PATCH] Fix compilation with latest SDL
5
6	---
7	src/input/gamepad_config.cpp \| 55 ++++++++++++++++++------------------
8	1 file changed, 27 insertions(+), 28 deletions(-)
9
10	diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
11	index 7c6f632099..c060e7a5a7 100644
12	--- src/input/gamepad_config.cpp
13	+++ src/input/gamepad_config.cpp
14	@@ -32,8 +32,7 @@
15	#include "input/sdl_controller.hpp"
16	#include <array>
17
18	-static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
19	-enum AxisWithDirection
20	+enum AxisWithDirection : unsigned
21	{
22	SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
23	SDL_CONTROLLER_AXIS_LEFTX_LEFT,
24	@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
25	core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
26	{
27	#ifndef SERVER_ONLY
28	- std::array<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
29	+ std::map<unsigned, core::stringw> readable =
30	{{
31	- "A", // SDL_CONTROLLER_BUTTON_A
32	- "B", // SDL_CONTROLLER_BUTTON_B
33	- "X", // SDL_CONTROLLER_BUTTON_X
34	- "Y", // SDL_CONTROLLER_BUTTON_Y
35	+ { SDL_CONTROLLER_BUTTON_A, "A" },
36	+ { SDL_CONTROLLER_BUTTON_B, "B" },
37	+ { SDL_CONTROLLER_BUTTON_X, "X" },
38	+ { SDL_CONTROLLER_BUTTON_Y, "Y" },
39	// I18N: name of buttons on gamepads
40	- _("Back"), // SDL_CONTROLLER_BUTTON_BACK
41	+ { SDL_CONTROLLER_BUTTON_BACK, _("Back") },
42	// I18N: name of buttons on gamepads
43	- _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
44	+ { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
45	// I18N: name of buttons on gamepads
46	- _("Start"), // SDL_CONTROLLER_BUTTON_START
47	+ { SDL_CONTROLLER_BUTTON_START, _("Start") },
48	// I18N: name of buttons on gamepads
49	- _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
50	+ { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
51	// I18N: name of buttons on gamepads
52	- _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
53	+ { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
54	// I18N: name of buttons on gamepads
55	- _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
56	+ { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
57	// I18N: name of buttons on gamepads
58	- _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
59	+ { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
60	// I18N: name of buttons on gamepads
61	- _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
62	+ { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
63	// I18N: name of buttons on gamepads
64	- _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
65	+ { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
66	// I18N: name of buttons on gamepads
67	- _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
68	+ { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
69	// I18N: name of buttons on gamepads
70	- _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
71	+ { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
72
73	// Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
74	// I18N: name of buttons on gamepads
75	- _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
76	+ { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
77	// I18N: name of buttons on gamepads
78	- _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
79	+ { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
80	// I18N: name of buttons on gamepads
81	- _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
82	+ { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
83	// I18N: name of buttons on gamepads
84	- _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP
85	+ { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") },
86	// I18N: name of buttons on gamepads
87	- _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT
88	+ { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") },
89	// I18N: name of buttons on gamepads
90	- _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT
91	+ { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") },
92	// I18N: name of buttons on gamepads
93	- _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN
94	+ { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") },
95	// I18N: name of buttons on gamepads
96	- _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP
97	+ { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") },
98	// I18N: name of buttons on gamepads
99	- _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP
100	+ { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") },
101	// I18N: name of buttons on gamepads
102	- _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP
103	+ { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") }
104	}};
105
106	const Binding &b = getBinding(action);

Removed Link Here

(-)a/games/supertuxkart/files/patch-CMakeLists.txt (-110 lines)
1	--- CMakeLists.txt.orig 2020-08-28 08:21:35 UTC
2	+++ CMakeLists.txt
3	@@ -174,7 +174,7 @@ endif()
4
5	# Build the Bullet physics library
6	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
7	-include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
8	+include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/bullet/src")
9
10	if(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "BSD")
11	set(LIBRESOLV_LIBRARY)
12	@@ -198,7 +198,7 @@ if(ENET_FOUND AND NOT USE_IPV6)
13	else()
14	# Fallback to built-in version
15	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
16	- include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
17	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/enet/include")
18	set(ENET_LIBRARIES "enet")
19	endif()
20
21	@@ -208,7 +208,7 @@ if (APPLE AND NOT IOS)
22	find_path(GLEW_INCLUDEDIR NAMES GL/glew.h glew.h PATHS)
23	if (NOT GLEW_LIBRARY OR NOT GLEW_INCLUDEDIR)
24	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
25	- include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
26	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/glew/include")
27	set(GLEW_LIBRARIES "glew")
28	else()
29	set(GLEW_LIBRARIES ${GLEW_LIBRARY})
30	@@ -226,7 +226,7 @@ elseif(NOT USE_GLES2 AND NOT SERVER_ONLY)
31	else()
32	# Fallback to built-in version silently
33	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
34	- include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
35	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/glew/include")
36	set(GLEW_LIBRARIES "glew")
37	endif()
38	endif()
39	@@ -260,7 +260,7 @@ endif()
40
41	if(NOT SERVER_ONLY)
42	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
43	- include_directories("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
44	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/graphics_utils")
45	endif()
46
47	# Libmcpp
48	@@ -268,7 +268,7 @@ find_library(MCPP_LIBRARY NAMES mcpp libmcpp)
49	find_path(MCPP_INCLUDEDIR NAMES mcpp_lib.h PATHS)
50	if (NOT MCPP_LIBRARY OR NOT MCPP_INCLUDEDIR)
51	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/mcpp")
52	- include_directories("${PROJECT_SOURCE_DIR}/lib/mcpp")
53	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/mcpp")
54	SET(MCPP_LIBRARY mcpp)
55	message(STATUS "System libmcpp not found, use the bundled one.")
56	else()
57	@@ -283,7 +283,7 @@ if(NOT SERVER_ONLY)
58	endif()
59	if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
60	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
61	- include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
62	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/libsquish")
63	SET(SQUISH_LIBRARY squish)
64	else()
65	include_directories("${SQUISH_INCLUDEDIR}")
66	@@ -306,7 +306,7 @@ endif()
67
68	# Build the irrlicht library
69	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
70	-include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
71	+include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
72
73	# Build the Wiiuse library
74	# Note: wiiuse MUST be declared after irrlicht, since otherwise
75	@@ -325,7 +325,7 @@ if(USE_WIIUSE)
76	if(WIIUSE_BUILD)
77	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
78	endif()
79	- include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse/src")
80	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/wiiuse/src")
81	set(WIIUSE_LIBRARIES "wiiuse" "bluetooth")
82	endif()
83	endif()
84	@@ -353,7 +353,7 @@ if(USE_SYSTEM_ANGELSCRIPT)
85	endif()
86	else()
87	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
88	- include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
89	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/angelscript/include")
90	set(Angelscript_LIBRARIES angelscript)
91	endif()
92
93	@@ -373,7 +373,7 @@ endif()
94	if (NOT SERVER_ONLY)
95	# SheenBidi
96	add_subdirectory("${PROJECT_SOURCE_DIR}/lib/sheenbidi")
97	- include_directories("${PROJECT_SOURCE_DIR}/lib/sheenbidi/Headers")
98	+ include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/sheenbidi/Headers")
99	SET(SHEENBIDI_LIBRARY sheenbidi)
100
101	# Freetype
102	@@ -420,7 +420,7 @@ if(USE_SQLITE3)
103	find_path(SQLITE3_INCLUDEDIR NAMES sqlite3.h PATHS)
104	if (NOT SQLITE3_LIBRARY OR NOT SQLITE3_INCLUDEDIR)
105	# add_subdirectory("${PROJECT_SOURCE_DIR}/lib/sqlite3")
106	-# include_directories("${PROJECT_SOURCE_DIR}/lib/sqlite3")
107	+# include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/sqlite3")
108	# SET(SQLITE3_LIBRARY sqlite3)
109	set(USE_SQLITE3 OFF CACHE BOOL "Use sqlite to manage server stats and ban list." FORCE)
110	message(WARNING "Sqlite3 not found, disable advanced server management.")