FreeBSD Bugzilla – Attachment 231546 Details for
Bug 261702
games/supertuxkart: Update to 1.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to upgrade to 1.3
0001-games-supertuxkart-bump-to-1.3.patch (text/plain), 14.31 KB, created by
sven.a.jonsson
on 2022-02-03 21:26:19 UTC
(
hide
)
Description:
Patch to upgrade to 1.3
Filename:
MIME Type:
Creator:
sven.a.jonsson
Created:
2022-02-03 21:26:19 UTC
Size:
14.31 KB
patch
obsolete
>From 32fadcf9970d3178b62a308bb510262409dd194b Mon Sep 17 00:00:00 2001 >From: Sven Jonsson <sven.a.jonsson@bahnhof.se> >Date: Thu, 3 Feb 2022 21:44:09 +0100 >Subject: [PATCH] games/supertuxkart: bump to 1.3 > >--- > games/supertuxkart/Makefile | 5 +- > games/supertuxkart/distinfo | 6 +- > games/supertuxkart/files/patch-61833c9 | 106 ----------------- > games/supertuxkart/files/patch-CMakeLists.txt | 110 ------------------ > ..._angelscript_projects_cmake_CMakeLists.txt | 10 -- > .../files/patch-src_network_stk__ipv6.cpp | 10 -- > games/supertuxkart/pkg-plist | 1 - > 7 files changed, 6 insertions(+), 242 deletions(-) > delete mode 100644 games/supertuxkart/files/patch-61833c9 > delete mode 100644 games/supertuxkart/files/patch-CMakeLists.txt > delete mode 100644 games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt > delete mode 100644 games/supertuxkart/files/patch-src_network_stk__ipv6.cpp > >diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile >index 79ae5ec095c3..42b7c0833c23 100644 >--- a/games/supertuxkart/Makefile >+++ b/games/supertuxkart/Makefile >@@ -1,6 +1,7 @@ >+ > PORTNAME= supertuxkart >-PORTVERSION= 1.2 >-PORTREVISION= 2 >+PORTVERSION= 1.3 >+PORTREVISION= 0 > CATEGORIES= games > MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION} > DISTNAME= SuperTuxKart-${PORTVERSION}-src >diff --git a/games/supertuxkart/distinfo b/games/supertuxkart/distinfo >index 61c3ad95cff5..ad7b50dee858 100644 >--- a/games/supertuxkart/distinfo >+++ b/games/supertuxkart/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1598745498 >-SHA256 (SuperTuxKart-1.2-src.tar.xz) = 052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37 >-SIZE (SuperTuxKart-1.2-src.tar.xz) = 614569164 >+TIMESTAMP = 1643902914 >+SHA256 (SuperTuxKart-1.3-src.tar.xz) = eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd >+SIZE (SuperTuxKart-1.3-src.tar.xz) = 627753500 >diff --git a/games/supertuxkart/files/patch-61833c9 b/games/supertuxkart/files/patch-61833c9 >deleted file mode 100644 >index 70e27fa9ec11..000000000000 >--- a/games/supertuxkart/files/patch-61833c9 >+++ /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 >---- 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); >diff --git a/games/supertuxkart/files/patch-CMakeLists.txt b/games/supertuxkart/files/patch-CMakeLists.txt >deleted file mode 100644 >index b2b12cbbf58a..000000000000 >--- a/games/supertuxkart/files/patch-CMakeLists.txt >+++ /dev/null >@@ -1,110 +0,0 @@ >---- 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.") >diff --git a/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt b/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt >deleted file mode 100644 >index dc96691d2cde..000000000000 >--- a/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt >+++ /dev/null >@@ -1,10 +0,0 @@ >---- lib/angelscript/projects/cmake/CMakeLists.txt.orig 2020-01-03 18:47:06 UTC >-+++ lib/angelscript/projects/cmake/CMakeLists.txt >-@@ -112,7 +112,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") >- if(CMAKE_ASM_COMPILER_WORKS) >- set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S) >- if (NOT IOS) >-- set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always") >- endif() >- else() >- message(FATAL ERROR "ARM target requires a working assembler") >diff --git a/games/supertuxkart/files/patch-src_network_stk__ipv6.cpp b/games/supertuxkart/files/patch-src_network_stk__ipv6.cpp >deleted file mode 100644 >index 029535b9220a..000000000000 >--- a/games/supertuxkart/files/patch-src_network_stk__ipv6.cpp >+++ /dev/null >@@ -1,10 +0,0 @@ >---- src/network/stk_ipv6.cpp.orig 2020-01-03 18:47:06 UTC >-+++ src/network/stk_ipv6.cpp >-@@ -39,6 +39,7 @@ extern "C" >- #else >- >- #include <arpa/inet.h> >-+#include <netinet/in.h> >- #include <err.h> >- #include <netdb.h> >- #include <sys/socket.h> >diff --git a/games/supertuxkart/pkg-plist b/games/supertuxkart/pkg-plist >index a2dec3edfa4c..052b30527a97 100644 >--- a/games/supertuxkart/pkg-plist >+++ b/games/supertuxkart/pkg-plist >@@ -9,5 +9,4 @@ share/icons/hicolor/48x48/apps/supertuxkart.png > share/icons/hicolor/512x512/apps/supertuxkart.png > share/icons/hicolor/64x64/apps/supertuxkart.png > share/metainfo/supertuxkart.appdata.xml >-share/pixmaps/supertuxkart.png > @dir %%DATADIR%%/data/editor/maps >-- >2.35.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 261702
: 231546