mirror of
https://git.freebsd.org/ports.git
synced 2025-05-24 23:16:33 -04:00
games/pioneer: update 20230203 → 20240314
Tested by: Dmitry Lukhtionov
This commit is contained in:
Dmitry Marakasov
parent
1163dc08e9
commit
aa4f5c4718
10 changed files with 57 additions and 80 deletions
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= pioneer
|
||||
DISTVERSION= 20230203
|
||||
DISTVERSION= 20240314
|
||||
CATEGORIES= games
|
||||
|
||||
MAINTAINER= amdmi3@FreeBSD.org
|
||||
|
|
@ -23,6 +23,7 @@ LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
|||
LICENSE_PERMS_IUP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
||||
LICENSE_PERMS_SIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
||||
|
||||
BROKEN_FreeBSD_13= fails to build
|
||||
# XXX: if you have similar error, try adding failing arch to USE_CHRONO condition in contrib/profiler/Profiler.h
|
||||
BROKEN_xxx= fails to build: contrib/profiler/Profiler.h:158:51: inconsistent operand constraints in an 'asm'
|
||||
|
||||
|
|
@ -39,10 +40,11 @@ GH_ACCOUNT= pioneerspacesim
|
|||
ALL_TARGET= all build-data
|
||||
CMAKE_ARGS= -DPIONEER_DATA_DIR:PATH="${DATADIR}/data"
|
||||
CMAKE_ON= USE_SYSTEM_LIBGLEW USE_SYSTEM_LIBLUA
|
||||
CMAKE_OFF= FMT_INSTALL
|
||||
|
||||
PORTDATA= data
|
||||
PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt \
|
||||
README.md
|
||||
PORTDATA= *
|
||||
PORTDOCS= AUTHORS.txt Changelog.txt Quickstart.txt \
|
||||
README.md editor.txt
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
|
||||
|
|
@ -55,17 +57,6 @@ DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}"
|
|||
DOCS_SUB_LIST_OFF= QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}"
|
||||
PROFILER_CMAKE_BOOL= PROFILER_ENABLED
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e '/^include(FindGit/d ; \
|
||||
/TIMESTAMP PROJECT_VERSION/s|.*|set(PROJECT_VERSION "${GH_TAGNAME}")|' \
|
||||
${WRKSRC}/CMakeLists.txt
|
||||
|
||||
post-install:
|
||||
.for f in modelcompiler savegamedump
|
||||
${MV} ${STAGEDIR}${PREFIX}/bin/${f} \
|
||||
${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${f}
|
||||
.endfor
|
||||
|
||||
post-install-DOCS-on:
|
||||
@(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1675424098
|
||||
SHA256 (pioneerspacesim-pioneer-20230203_GH0.tar.gz) = 80eea94e0f7e4d8e6a0c4629bdfb89201f82aae2f59ee7a1f7a487eeeccf27c7
|
||||
SIZE (pioneerspacesim-pioneer-20230203_GH0.tar.gz) = 541032264
|
||||
TIMESTAMP = 1711646408
|
||||
SHA256 (pioneerspacesim-pioneer-20240314_GH0.tar.gz) = 9cd31abd3e4d90cb589ecd628118dfb76ad5e98638361da666d76539b3269c3f
|
||||
SIZE (pioneerspacesim-pioneer-20240314_GH0.tar.gz) = 574924215
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
--- CMakeLists.txt.orig 2023-02-03 14:29:13 UTC
|
||||
--- CMakeLists.txt.orig 2024-03-14 20:05:43 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -71,6 +71,9 @@ if (HAS_FECLEAREXCEPT AND HAS_FEENABLEEXCEPT AND HAS_F
|
||||
set(HAS_FPE_OPS ON)
|
||||
endif()
|
||||
@@ -336,6 +336,7 @@ add_executable(modelcompiler src/modelcompiler.cpp)
|
||||
add_executable(${PROJECT_NAME} WIN32 src/main.cpp ${RESOURCES})
|
||||
add_executable(unittest ${UNITTEST_CXX_FILES})
|
||||
add_executable(modelcompiler src/modelcompiler.cpp)
|
||||
+set_target_properties(modelcompiler PROPERTIES OUTPUT_NAME pioneer-modelcompiler)
|
||||
add_executable(savegamedump
|
||||
src/savegamedump.cpp
|
||||
src/JsonUtils.cpp
|
||||
@@ -345,6 +346,7 @@ add_executable(savegamedump
|
||||
src/Lang.cpp
|
||||
${FILESYSTEM_CXX_FILES}
|
||||
)
|
||||
+set_target_properties(savegamedump PROPERTIES OUTPUT_NAME pioneer-savegamedump)
|
||||
|
||||
+include(CheckCXXSourceCompiles)
|
||||
+check_cxx_source_compiles("#include <cstddef>\nvoid foo(size_t){}; void foo(unsigned int){};int main(){}" SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES)
|
||||
+
|
||||
if (NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
|
||||
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
|
||||
find_program(NATURALDOCS NAMES naturaldocs)
|
||||
if (NATURALDOCS)
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
--- buildopts.h.cmakein.orig 2023-02-03 08:11:26 UTC
|
||||
+++ buildopts.h.cmakein
|
||||
@@ -9,6 +9,7 @@
|
||||
#cmakedefine01 WITH_OBJECTVIEWER
|
||||
#cmakedefine01 WITH_DEVKEYS
|
||||
#cmakedefine01 HAS_FPE_OPS
|
||||
+#cmakedefine01 SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES
|
||||
#cmakedefine REMOTE_LUA_REPL
|
||||
|
||||
#endif /* BUILDOPTS_H */
|
||||
13
games/pioneer/files/patch-src_core_macros.h
Normal file
13
games/pioneer/files/patch-src_core_macros.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- src/core/macros.h.orig 2024-03-14 20:05:43 UTC
|
||||
+++ src/core/macros.h
|
||||
@@ -45,6 +45,10 @@ char (&COUNTOF_Helper(T (&array)[N]))[N];
|
||||
#include <malloc.h>
|
||||
#define stackalloc(T, n) reinterpret_cast<T *>(_alloca(sizeof(T) * n))
|
||||
#else
|
||||
+#ifdef __FreeBSD__
|
||||
+#include <stdlib.h>
|
||||
+#else
|
||||
#include <alloca.h>
|
||||
+#endif
|
||||
#define stackalloc(T, n) reinterpret_cast<T *>(alloca(sizeof(T) * n))
|
||||
#endif
|
||||
7
games/pioneer/files/patch-src_editor_CMakeLists.txt
Normal file
7
games/pioneer/files/patch-src_editor_CMakeLists.txt
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
--- src/editor/CMakeLists.txt.orig 2024-03-14 20:05:43 UTC
|
||||
+++ src/editor/CMakeLists.txt
|
||||
@@ -29,3 +29,4 @@ set_target_properties(editor PROPERTIES RUNTIME_OUTPUT
|
||||
set_cxx_properties(editor)
|
||||
target_link_libraries(editor LINK_PRIVATE ${EDITOR_LIBRARIES} ${pioneerLibs} ${winLibs})
|
||||
set_target_properties(editor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
+set_target_properties(editor PROPERTIES OUTPUT_NAME pioneer-editor)
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
--- src/lua/LuaPushPull.h.orig 2023-02-03 08:11:26 UTC
|
||||
+++ src/lua/LuaPushPull.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#define _LUAPUSHPULL_H
|
||||
|
||||
#include "Lua.h"
|
||||
+#include "buildopts.h"
|
||||
#include <lua.hpp>
|
||||
|
||||
#include <cstddef>
|
||||
@@ -15,7 +16,9 @@ inline void pi_lua_generic_push(lua_State *l, bool val
|
||||
inline void pi_lua_generic_push(lua_State *l, int value) { lua_pushinteger(l, value); }
|
||||
inline void pi_lua_generic_push(lua_State *l, int64_t value) { lua_pushinteger(l, value); }
|
||||
inline void pi_lua_generic_push(lua_State *l, unsigned int value) { lua_pushinteger(l, value); }
|
||||
+#if SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES
|
||||
inline void pi_lua_generic_push(lua_State *l, size_t value) { lua_pushinteger(l, value); }
|
||||
+#endif
|
||||
inline void pi_lua_generic_push(lua_State *l, double value) { lua_pushnumber(l, value); }
|
||||
inline void pi_lua_generic_push(lua_State *l, const char *value) { lua_pushstring(l, value); }
|
||||
inline void pi_lua_generic_push(lua_State *l, const std::string &value)
|
||||
@@ -32,7 +35,9 @@ inline void pi_lua_generic_pull(lua_State *l, int inde
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, int &out) { out = luaL_checkinteger(l, index); }
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, int64_t &out) { out = luaL_checkinteger(l, index); }
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, unsigned int &out) { out = luaL_checkunsigned(l, index); }
|
||||
+#if SIZE_T_AND_UNSIGNED_INT_ARE_DIFFERENT_TYPES
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, size_t &out) { out = luaL_checkunsigned(l, index); }
|
||||
+#endif
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, float &out) { out = luaL_checknumber(l, index); }
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, double &out) { out = luaL_checknumber(l, index); }
|
||||
inline void pi_lua_generic_pull(lua_State *l, int index, const char *&out) { out = luaL_checkstring(l, index); }
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- src/lua/LuaShip.cpp.orig 2023-02-03 08:11:26 UTC
|
||||
+++ src/lua/LuaShip.cpp
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "SpaceStation.h"
|
||||
#include "ship/PlayerShipController.h"
|
||||
#include "ship/PrecalcPath.h"
|
||||
-#include "src/lua.h"
|
||||
+#include "lua.h"
|
||||
|
||||
/*
|
||||
* Class: Ship
|
||||
10
games/pioneer/files/patch-src_vector3.h
Normal file
10
games/pioneer/files/patch-src_vector3.h
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
--- src/vector3.h.orig 2024-03-14 20:05:43 UTC
|
||||
+++ src/vector3.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "vector2.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
+#include <algorithm>
|
||||
|
||||
// Need this pragma due to operator[] implementation.
|
||||
#pragma pack(4)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
bin/pioneer
|
||||
bin/pioneer-editor
|
||||
bin/pioneer-modelcompiler
|
||||
bin/pioneer-savegamedump
|
||||
share/appdata/net.pioneerspacesim.Pioneer.appdata.xml
|
||||
share/applications/net.pioneerspacesim.Pioneer.desktop
|
||||
share/icons/hicolor/128x128/apps/net.pioneerspacesim.Pioneer.png
|
||||
share/icons/hicolor/16x16/apps/net.pioneerspacesim.Pioneer.png
|
||||
|
|
@ -12,6 +12,7 @@ share/icons/hicolor/32x32/apps/net.pioneerspacesim.Pioneer.png
|
|||
share/icons/hicolor/40x40/apps/net.pioneerspacesim.Pioneer.png
|
||||
share/icons/hicolor/48x48/apps/net.pioneerspacesim.Pioneer.png
|
||||
share/icons/hicolor/64x64/apps/net.pioneerspacesim.Pioneer.png
|
||||
share/metainfo/net.pioneerspacesim.Pioneer.metainfo.xml
|
||||
@dir %%DATADIR%%/data/music/core/undocked
|
||||
@dir %%DATADIR%%/data/music/core/near-planet
|
||||
@dir %%DATADIR%%/data/music/core/docked
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue