Date: Tue, 9 Apr 2024 00:11:55 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0e94a73ce0ca - main - games/maxr: update 0.2.13 =?utf-8?Q?=E2=86=92?= 0.2.15 Message-ID: <202404090011.4390BtUO030416@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e94a73ce0ca7e0b435be5eb5b8443b5346b5b52 commit 0e94a73ce0ca7e0b435be5eb5b8443b5346b5b52 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2024-04-05 17:23:24 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2024-04-09 00:10:58 +0000 games/maxr: update 0.2.13 → 0.2.15 --- games/maxr/Makefile | 10 ++++++- games/maxr/distinfo | 8 ++++-- games/maxr/files/patch-CMakeLists.txt | 53 +++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/games/maxr/Makefile b/games/maxr/Makefile index 7972e1920f16..90cb7a9921e2 100644 --- a/games/maxr/Makefile +++ b/games/maxr/Makefile @@ -1,6 +1,6 @@ PORTNAME= maxr DISTVERSIONPREFIX= release- -DISTVERSION= 0.2.13 +DISTVERSION= 0.2.15 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -11,9 +11,14 @@ WWW= https://www.maxr.org/ \ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/data/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \ + ${LOCALBASE}/include/doctest/doctest.h:devel/doctest +BUILD_DEPENDS+= ${LOCALBASE}/lib/libvorbis.so:audio/libvorbis # used to build a binary which is not installed + USES= cmake compiler:c++17-lang sdl USE_GITHUB= yes GH_ACCOUNT= maxr-dot-org +GH_TUPLE= oo13:spiritless_po:5d729be:spiritless_po/submodules/spiritless_po USE_SDL= sdl2 mixer2 net2 PLIST_FILES= bin/${PORTNAME} @@ -26,4 +31,7 @@ DESKTOP_ENTRIES="M.A.X.R." \ "Game;StrategyGame;" \ false +post-patch: + @${REINPLACE_CMD} -e '/include/ s|doctest.h|doctest/&|' ${WRKSRC}/tests/*.cpp + .include <bsd.port.mk> diff --git a/games/maxr/distinfo b/games/maxr/distinfo index 4bcae8508985..1938bad59307 100644 --- a/games/maxr/distinfo +++ b/games/maxr/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1696600634 -SHA256 (maxr-dot-org-maxr-release-0.2.13_GH0.tar.gz) = 3663c9c628c11be7a5de7493b9df8c4b823a9d0dcb2674ee9cf3f63ed53b1f48 -SIZE (maxr-dot-org-maxr-release-0.2.13_GH0.tar.gz) = 15940800 +TIMESTAMP = 1712336240 +SHA256 (maxr-dot-org-maxr-release-0.2.15_GH0.tar.gz) = 2ef00bf84461c43b4e87e2c42dba18e8126813a19c96103241e6ce9d1223b987 +SIZE (maxr-dot-org-maxr-release-0.2.15_GH0.tar.gz) = 18548869 +SHA256 (oo13-spiritless_po-5d729be_GH0.tar.gz) = 8ebb2f6c38a9ef4b76f088a90519928fb1ad9b7abb5dc878a590018a16fae3a0 +SIZE (oo13-spiritless_po-5d729be_GH0.tar.gz) = 68073 diff --git a/games/maxr/files/patch-CMakeLists.txt b/games/maxr/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..27acfa07c12c --- /dev/null +++ b/games/maxr/files/patch-CMakeLists.txt @@ -0,0 +1,53 @@ +--- CMakeLists.txt.orig 2024-03-19 16:53:32 UTC ++++ CMakeLists.txt +@@ -22,7 +22,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + + # --------------------------------------- + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /bigobj") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI /bigobj") +@@ -47,16 +46,20 @@ endif() + # ============================================ + + # nlohmann is a library header for json +-add_library(nlohmann INTERFACE IMPORTED) +-target_include_directories(nlohmann SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/nlohmann/single_include") ++#add_library(nlohmann INTERFACE IMPORTED) ++#target_include_directories(nlohmann SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/nlohmann/single_include") ++find_package(nlohmann_json REQUIRED) ++add_library(nlohmann ALIAS nlohmann_json::nlohmann_json) + + # spiritless_po is a library header for gettext po translation + add_library(spiritless_po INTERFACE IMPORTED) + target_include_directories(spiritless_po SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/spiritless_po/include") + + # doctest is a library header for test framework +-add_library(doctest INTERFACE IMPORTED) +-target_include_directories(doctest SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/doctest/doctest") ++#add_library(doctest INTERFACE IMPORTED) ++#target_include_directories(doctest SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/doctest/doctest") ++find_package(doctest REQUIRED) ++add_library(doctest ALIAS doctest::doctest) + + # SDL_flic + add_library(SDL_flic src/3rd/SDL_flic/SDL_flic.c src/3rd/SDL_flic/SDL_flic.h) +@@ -83,17 +86,6 @@ if(CRASH_RPT_INCLUDE_DIR) + target_compile_definitions(maxr_lib PUBLIC USE_CRASH_RPT) + target_include_directories(maxr_lib PUBLIC ${CRASH_RPT_INCLUDE_DIR}) + target_link_libraries(maxr_lib PUBLIC ${CRASH_RPT_LIB}) +-endif() +-## Add GIT Revision +-include(GetGitRevisionDescription) +-git_describe(GIT_DESC --always) +- +-if (GIT_DESC) +- message(STATUS "Setting cpp define GIT_DESC to ${GIT_DESC}") +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/autoversion.h.in" "${CMAKE_CURRENT_BINARY_DIR}/autoversion.h") +- target_include_directories(maxr_lib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +-else() +- message("Could not automativally set the maxr GIT_DESC from git. Set cmake variable GIT_EXECUTABLE to use this feature.") + endif() + + # maxr dedicated server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404090011.4390BtUO030416>