games/supertuxkart: update 1.2 → 1.3
This commit is contained in:
Dmitry Marakasov
parent
2df6f2a7e3
commit
472b94effc
@ -1,8 +1,7 @@
|
||||
PORTNAME= supertuxkart
|
||||
PORTVERSION= 1.2
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 1.3
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION}
|
||||
MASTER_SITES= https://github.com/supertuxkart/stk-code/releases/download/${PORTVERSION}/
|
||||
DISTNAME= SuperTuxKart-${PORTVERSION}-src
|
||||
|
||||
MAINTAINER= amdmi3@FreeBSD.org
|
||||
@ -11,18 +10,20 @@ COMMENT= Free 3D kart racing game
|
||||
LICENSE= GPLv3+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
|
||||
libcurl.so:ftp/curl
|
||||
|
||||
BROKEN_FreeBSD_12_i386= does not build (error: this directive must appear between .cfi_startproc and .cfi_endproc directives)
|
||||
BROKEN_i386= ld: error: cannot preempt symbol: alcOpenDevice
|
||||
|
||||
USES= alias cmake compiler:c++11-lib pkgconfig tar:xz
|
||||
CMAKE_OFF= USE_WIIUSE \
|
||||
BUILD_RECORDER \
|
||||
USE_SYSTEM_ENET \
|
||||
USE_SYSTEM_SQUISH
|
||||
CMAKE_ON= USE_SYSTEM_GLEW
|
||||
LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
|
||||
libcurl.so:ftp/curl \
|
||||
libangelscript.so:lang/angelscript \
|
||||
libmcpp.so:devel/mcpp
|
||||
|
||||
USES= alias cmake compiler:c++11-lib pkgconfig ssl tar:xz
|
||||
CMAKE_OFF= USE_WIIUSE
|
||||
CMAKE_OFF+= BUILD_RECORDER
|
||||
CMAKE_OFF+= USE_SYSTEM_ENET # bundled enet is required for IPv6 support
|
||||
CMAKE_OFF+= USE_SYSTEM_SQUISH # does not build with system squish
|
||||
CMAKE_ON+= USE_SYSTEM_ANGELSCRIPT
|
||||
|
||||
PORTDATA= *
|
||||
|
||||
@ -46,11 +47,11 @@ SERVER_ONLY_LIB_DEPENDS_OFF= \
|
||||
libfreetype.so:print/freetype2 \
|
||||
libharfbuzz.so:print/harfbuzz
|
||||
SERVER_ONLY_USES_OFF= gettext gl jpeg openal:al sdl xorg
|
||||
SERVER_ONLY_USE_OFF= GL=gl,glu,glew SDL=sdl2 XORG=x11,xrandr
|
||||
SERVER_ONLY_USE_OFF= GL=gl,glu SDL=sdl2 XORG=x11,xrandr
|
||||
|
||||
# make sure that bundled libraries are not used
|
||||
post-extract:
|
||||
.for bundled in glew wiiuse
|
||||
.for bundled in wiiuse angelscipt mcpp
|
||||
@${RM} -rf ${WRKSRC}/lib/${bundled}
|
||||
.endfor
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1598745498
|
||||
SHA256 (SuperTuxKart-1.2-src.tar.xz) = 052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
|
||||
SIZE (SuperTuxKart-1.2-src.tar.xz) = 614569164
|
||||
TIMESTAMP = 1632849452
|
||||
SHA256 (SuperTuxKart-1.3-src.tar.xz) = eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd
|
||||
SIZE (SuperTuxKart-1.3-src.tar.xz) = 627753500
|
||||
|
||||
@ -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);
|
||||
@ -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.")
|
||||
@ -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")
|
||||
@ -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>
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user