Date: Tue, 24 Feb 2026 20:19:40 +0000 From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 08b1b3459bf2 - main - games/0ad: Update to 0.28.0 Message-ID: <699e07dc.227ff.35bcb071@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=08b1b3459bf25460870f1aafcba52c436aa725d0 commit 08b1b3459bf25460870f1aafcba52c436aa725d0 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2026-02-24 20:19:16 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2026-02-24 20:19:16 +0000 games/0ad: Update to 0.28.0 --- games/0ad/Makefile | 20 +++++------ games/0ad/distinfo | 10 +++--- games/0ad/files/patch-boost-1.89 | 41 ---------------------- .../files/patch-build_premake_extern__libs5.lua | 15 ++++---- ...source_nvtt_nvtt-28209_src_src_nvcore_Debug.cpp | 12 ------- games/0ad/pkg-plist | 4 --- 6 files changed, 20 insertions(+), 82 deletions(-) diff --git a/games/0ad/Makefile b/games/0ad/Makefile index cbfd3ef4fb1f..24f3430906d0 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -1,6 +1,5 @@ PORTNAME= 0ad -DISTVERSION= 0.27.1 -PORTREVISION= 10 +DISTVERSION= 0.28.0 CATEGORIES= games MASTER_SITES= https://releases.wildfiregames.com/ DISTFILES= ${PORTNAME}-${DISTVERSION}-unix-build.tar.xz \ @@ -15,7 +14,8 @@ BROKEN_armv6= fails to link: fatal error: conftest: Unknown error: -1 BROKEN_armv7= fails to link: fatal error: conftest: Unknown error: -1 BROKEN_powerpc64= fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no member named 'xt_tp' -BUILD_DEPENDS= ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ +BUILD_DEPENDS= ${RUST_DEFAULT}>=1.76:lang/${RUST_DEFAULT} \ + rust-cbindgen>=0.26.0:devel/rust-cbindgen \ zip:archivers/zip \ cmake:devel/cmake-core LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ @@ -29,7 +29,8 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libenet.so:net/enet \ libsodium.so:security/libsodium \ libfmt.so:devel/libfmt \ - libmozjs-115.so:lang/spidermonkey115 + libmozjs-128.so:lang/spidermonkey128 \ + libnvtt.so:graphics/nvidia-texture-tools USES= compiler:c++11-lib desktop-file-utils dos2unix gmake gnome \ iconv openal:al perl5 pkgconfig python:build sdl tar:xz \ @@ -49,7 +50,7 @@ BUNDLE_LIBS= yes DOS2UNIX_REGEX= .*\.([ch]p{0,2}|make) BINARY_ALIAS= python3=${PYTHON_CMD} -USE_WX= 3.0+ +USE_WX= 3.2+ WX_COMPS= wx:lib MAKE_ENV+= JOBS=${_MAKE_JOBS} @@ -57,9 +58,6 @@ PORTDATA= * .include <bsd.port.pre.mk> -post-extract: - @(cd ${WRKSRC}/libraries/source/nvtt && ${TAR} xf nvtt-28209.tar.xz) - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ @@ -71,15 +69,15 @@ post-patch: .endif pre-build: - (cd ${WRKSRC}/libraries && ${SETENV} ${MAKE_ENV} ./build-source-libs.sh --with-system-mozjs -j ${_MAKE_JOBS}) - (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-mozjs --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/libraries && ${SETENV} ${MAKE_ENV} ./build-source-libs.sh --with-system-mozjs --with-system-nvtt -j ${_MAKE_JOBS}) + (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-mozjs --with-system-nvtt --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/games/0ad/distinfo b/games/0ad/distinfo index 9c0617992796..1a94f3970516 100644 --- a/games/0ad/distinfo +++ b/games/0ad/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1752758686 -SHA256 (0ad-0.27.1-unix-build.tar.xz) = a0a5355eeb5968d24f283770736150d974dafecba07754d4662707dc17016bfb -SIZE (0ad-0.27.1-unix-build.tar.xz) = 153554512 -SHA256 (0ad-0.27.1-unix-data.tar.xz) = 837e2d6ddf138b025fc02017245d7581a4bb84fd94b42c0e605d321b7017a998 -SIZE (0ad-0.27.1-unix-data.tar.xz) = 1367955136 +TIMESTAMP = 1771795500 +SHA256 (0ad-0.28.0-unix-build.tar.xz) = 27e217755ef76a922fe58dbf593d96e54b6ed2375d23f548c35619aa6bd5a42a +SIZE (0ad-0.28.0-unix-build.tar.xz) = 164975536 +SHA256 (0ad-0.28.0-unix-data.tar.xz) = e844b30ae2102c47e0a4fff2f0e0ef05ba0cebb1890aa72276fa12457c39526f +SIZE (0ad-0.28.0-unix-data.tar.xz) = 1415012652 diff --git a/games/0ad/files/patch-boost-1.89 b/games/0ad/files/patch-boost-1.89 deleted file mode 100644 index a5b03144eaf7..000000000000 --- a/games/0ad/files/patch-boost-1.89 +++ /dev/null @@ -1,41 +0,0 @@ -From 4c62138ce29c19911347ac15e264f4edced85a9c Mon Sep 17 00:00:00 2001 -From: Ralph Sennhauser <ralph.sennhauser@gmail.com> -Date: Sat, 18 Oct 2025 19:57:09 +0200 -Subject: [PATCH] Fix building against boost >=1.89 - -In boost-1.89 boost_system is a header-only library [1]. - -[1] https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3 - -Fixes: #8471 -Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> ---- - build/premake/extern_libs5.lua | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua -index 4f51c2c0ed..dc53bc7772 100644 ---- build/premake/extern_libs5.lua -+++ build/premake/extern_libs5.lua -@@ -235,7 +235,17 @@ extern_lib_defs = { - -- The following are not strictly link dependencies on all systems, but - -- are included for compatibility with different versions of Boost - android_names = { "boost_filesystem-gcc-mt", "boost_system-gcc-mt" }, -- unix_names = { os.findlib("boost_filesystem-mt") and "boost_filesystem-mt" or "boost_filesystem", os.findlib("boost_system-mt") and "boost_system-mt" or "boost_system" }, -+ unix_names = { -+ os.findlib("boost_filesystem-mt") and "boost_filesystem-mt" or "boost_filesystem", -+ -- boost_system is header-only in boost >=1.89 -+ (function() -+ if os.findlib("boost_system-mt") then -+ return "boost_system-mt" -+ elseif os.findlib("boost_system-mt") then -+ return "boost_system" -+ end -+ end)() -+ }, - osx_names = { "boost_filesystem", "boost_system" }, - }) - end, --- -2.47.3 - diff --git a/games/0ad/files/patch-build_premake_extern__libs5.lua b/games/0ad/files/patch-build_premake_extern__libs5.lua index caa0f1f9d782..2d61e8266f17 100644 --- a/games/0ad/files/patch-build_premake_extern__libs5.lua +++ b/games/0ad/files/patch-build_premake_extern__libs5.lua @@ -1,14 +1,11 @@ ---- build/premake/extern_libs5.lua.orig 2025-01-28 19:57:28 UTC +--- build/premake/extern_libs5.lua.orig 2025-12-22 03:23:46 UTC +++ build/premake/extern_libs5.lua -@@ -232,9 +232,9 @@ extern_lib_defs = { +@@ -221,7 +221,7 @@ extern_lib_defs = { + end -- TODO: This actually applies to most libraries we use on BSDs, make this a global setting. if os.istarget("bsd") then - if externalincludedirs then -- externalincludedirs { "/usr/local/include" } -+ externalincludedirs { "%%LOCALBASE%%/include" } - else -- sysincludedirs { "/usr/local/include" } -+ sysincludedirs { "%%LOCALBASE%%/include" } - end +- externalincludedirs { "/usr/local/include" } ++ externalincludedirs { "%%LOCALBASE%%/include" } end end, + }, diff --git a/games/0ad/files/patch-libraries_source_nvtt_nvtt-28209_src_src_nvcore_Debug.cpp b/games/0ad/files/patch-libraries_source_nvtt_nvtt-28209_src_src_nvcore_Debug.cpp deleted file mode 100644 index 13b99103cfa1..000000000000 --- a/games/0ad/files/patch-libraries_source_nvtt_nvtt-28209_src_src_nvcore_Debug.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- libraries/source/nvtt/nvtt-28209/src/src/nvcore/Debug.cpp.orig 2025-01-30 19:39:40 UTC -+++ libraries/source/nvtt/nvtt-28209/src/src/nvcore/Debug.cpp -@@ -631,6 +631,9 @@ namespace - # elif NV_CPU_X86 - ucontext_t * ucp = (ucontext_t *)secret; - return (void *)ucp->uc_mcontext.mc_eip; -+# elif NV_CPU_PPC -+ ucontext_t * ucp = (ucontext_t *)secret; -+ return (void *)ucp->uc_mcontext.mc_srr0; - # else - # error "Unknown CPU" - # endif diff --git a/games/0ad/pkg-plist b/games/0ad/pkg-plist index b45a20dc49f3..7814ccd29ff0 100644 --- a/games/0ad/pkg-plist +++ b/games/0ad/pkg-plist @@ -3,9 +3,5 @@ bin/0ad bin/ActorEditor lib/0ad/libAtlasUI.so lib/0ad/libCollada.so -lib/0ad/libnvcore.so -lib/0ad/libnvimage.so -lib/0ad/libnvmath.so -lib/0ad/libnvtt.so share/applications/0ad.desktop share/pixmaps/0ad.pnghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?699e07dc.227ff.35bcb071>