diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index 91f1e891aba7..dadf5b9ba77b 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -1,73 +1,72 @@ PORTNAME= pioneer -DISTVERSION= 20220203 -PORTREVISION= 1 +DISTVERSION= 20230203 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Space adventure game set in the Milky Way galaxy WWW= https://pioneerspacesim.net/ LICENSE= APACHE20 BSD2CLAUSE CC-BY-SA-3.0 DejaVu GPLv3 IUP \ MIT SIL ZLIB LICENSE_COMB= multi LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license LICENSE_NAME_IUP= Galaxy colour image use policy LICENSE_NAME_SIL= SIL open font license version 1.1 LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/licenses/LZ4.txt LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt LICENSE_FILE_GPLv3= ${WRKSRC}/licenses/GPL-3.txt LICENSE_FILE_IUP= ${WRKSRC}/licenses/Image\ Use\ Policy\ -\ NASA\ Spitzer\ Space\ Telescope.html LICENSE_FILE_SIL= ${WRKSRC}/licenses/SIL-1.1.txt 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 # 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' LIB_DEPENDS= libassimp.so:multimedia/assimp \ libfreetype.so:print/freetype2 \ libsigc-2.0.so:devel/libsigc++20 \ libvorbisfile.so:audio/libvorbis USES= cmake compiler:c++17-lang gl gnome lua:52 pkgconfig sdl USE_GITHUB= yes USE_GL= gl glu glew USE_SDL= image2 sdl2 GH_ACCOUNT= pioneerspacesim ALL_TARGET= all build-data CMAKE_ARGS= -DPIONEER_DATA_DIR:PATH="${DATADIR}/data" CMAKE_ON= USE_SYSTEM_LIBGLEW USE_SYSTEM_LIBLUA PORTDATA= data PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt \ README.md SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS PROFILER NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default PROFILER_DESC= Build with internal profiler 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}) .include diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo index 1e6fe981fee5..74a0bd8859d3 100644 --- a/games/pioneer/distinfo +++ b/games/pioneer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644231168 -SHA256 (pioneerspacesim-pioneer-20220203_GH0.tar.gz) = 415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c -SIZE (pioneerspacesim-pioneer-20220203_GH0.tar.gz) = 427362275 +TIMESTAMP = 1675424098 +SHA256 (pioneerspacesim-pioneer-20230203_GH0.tar.gz) = 80eea94e0f7e4d8e6a0c4629bdfb89201f82aae2f59ee7a1f7a487eeeccf27c7 +SIZE (pioneerspacesim-pioneer-20230203_GH0.tar.gz) = 541032264 diff --git a/games/pioneer/files/patch-CMakeLists.txt b/games/pioneer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..cb5c75eabff1 --- /dev/null +++ b/games/pioneer/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2023-02-03 14:29:13 UTC ++++ CMakeLists.txt +@@ -71,6 +71,9 @@ if (HAS_FECLEAREXCEPT AND HAS_FEENABLEEXCEPT AND HAS_F + set(HAS_FPE_OPS ON) + endif() + ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include \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." diff --git a/games/pioneer/files/patch-buildopts.h.cmakein b/games/pioneer/files/patch-buildopts.h.cmakein new file mode 100644 index 000000000000..5f8eae1bd327 --- /dev/null +++ b/games/pioneer/files/patch-buildopts.h.cmakein @@ -0,0 +1,10 @@ +--- 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 */ diff --git a/games/pioneer/files/patch-src_lua_LuaPushPull.h b/games/pioneer/files/patch-src_lua_LuaPushPull.h new file mode 100644 index 000000000000..6c0c26b13cda --- /dev/null +++ b/games/pioneer/files/patch-src_lua_LuaPushPull.h @@ -0,0 +1,30 @@ +--- 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 + + #include +@@ -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); } diff --git a/games/pioneer/files/patch-src_lua_LuaShip.cpp b/games/pioneer/files/patch-src_lua_LuaShip.cpp new file mode 100644 index 000000000000..2bde51af87ba --- /dev/null +++ b/games/pioneer/files/patch-src_lua_LuaShip.cpp @@ -0,0 +1,11 @@ +--- 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