diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index 72fd6480a34c..2d8adaa92378 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -1,67 +1,67 @@ PORTNAME= pioneer -DISTVERSION= 20250203 +DISTVERSION= 20250501 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= * PORTDOCS= AUTHORS.txt Changelog.txt Quickstart.txt \ README.md editor.txt 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 .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_OFF+= USE_SSE42 .endif post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo index ad6f611f14fc..2c86705619dd 100644 --- a/games/pioneer/distinfo +++ b/games/pioneer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738670143 -SHA256 (pioneerspacesim-pioneer-20250203_GH0.tar.gz) = 5b2814ad63b9b7f995fd6a1b913f97d00b450663d07cfbae59c88cccb97d5604 -SIZE (pioneerspacesim-pioneer-20250203_GH0.tar.gz) = 624337457 +TIMESTAMP = 1746101331 +SHA256 (pioneerspacesim-pioneer-20250501_GH0.tar.gz) = 959902d98a79536bd44f25bd7b29e48da94aeac597228776b0f91635877f362e +SIZE (pioneerspacesim-pioneer-20250501_GH0.tar.gz) = 624394151 diff --git a/games/pioneer/files/patch-cmake_TargetArchitecture.cmake b/games/pioneer/files/patch-cmake_TargetArchitecture.cmake deleted file mode 100644 index 7835d45ecf73..000000000000 --- a/games/pioneer/files/patch-cmake_TargetArchitecture.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/TargetArchitecture.cmake.orig 2025-02-03 19:33:59 UTC -+++ cmake/TargetArchitecture.cmake -@@ -1,7 +1,7 @@ - # This script detects supported target architectures and configures test flags - # accordingly - --if (${CMAKE_SYSTEM_PROCESSOR} MATCHES x86|x64) -+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES x86|x64|amd64) - set(PIONEER_TARGET_INTEL ON) - endif() - diff --git a/games/pioneer/files/patch-src_editor_CMakeLists.txt b/games/pioneer/files/patch-src_editor_CMakeLists.txt index 59c63edaaf2d..467cb1c56696 100644 --- a/games/pioneer/files/patch-src_editor_CMakeLists.txt +++ b/games/pioneer/files/patch-src_editor_CMakeLists.txt @@ -1,7 +1,15 @@ ---- src/editor/CMakeLists.txt.orig 2024-03-14 20:05:43 UTC +--- src/editor/CMakeLists.txt.orig 2025-05-01 11:22:38 UTC +++ src/editor/CMakeLists.txt -@@ -29,3 +29,4 @@ set_target_properties(editor PROPERTIES RUNTIME_OUTPUT +@@ -28,9 +28,10 @@ target_link_libraries(editor LINK_PRIVATE ${EDITOR_LIB + add_executable(editor WIN32 editormain.cpp ${RESOURCES}) 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) + if (MSVC) + # Put the output into the root dir so it can be run from Visual Studio + set_target_properties(editor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}) + else() + set_target_properties(editor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +-endif (MSVC) +\ No newline at end of file ++endif (MSVC)