05.02.2025 20:42, Martijn van Duren пишет:
> During fosdem I was told that there was a new 0ad release. So here's my
> attempt at updating. Quite a few things appear not needed (anymore), but
> I hope I haven't overlooked some edgecase. Some light playtesting shows
> no problems.
>
> - I haven't hit any WXNEEDED, or NOBTCFI issues, so I've removed these.
> - The build.sh scripts use tar directly with unsupported flags. make
> them use gtar instead.
> - Atlas (map builder) seems to run fine now, so enable it. This
> requires wxWidgets-gtk3.
> - Somewhere in the library build process -L/usr/local/lib disappears,
> so set it explicitly via LDFLAGS.
> - The 0006-disable_gethostname_r.diff for premake comes from
> premake5-beta4
update.sh patch didn't apply, otherwise looks fine... still building here.
They also provide .tar.xz tarballs which are noticably smaller than .tar.gz
if you want to use those; data's do-install would need adjusting, though.
bsd.port.mk's EXTRACT_CASES has our 'xz | tar' idiom for that.
--- patches/patch-build_resources_0ad_sh.orig Tue May 21 04:29:18 2024
+++ patches/patch-build_resources_0ad_sh Wed Feb 5 23:39:32 2025
@@ -5,18 +5,18 @@
+++ build/resources/0ad.sh
@@ -2,6 +2,16 @@
- pyrogenesis=$(which pyrogenesis 2> /dev/null)
- if [ -x "$pyrogenesis" ] ; then
-+ DATASIZE=$((2 * 1024 * 1024))
-+ if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
-+ ulimit -Sd ${DATASIZE} || \
-+ ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default no
<<- _EOF
-+ Cannot increase datasize-cur to at least ${DATASIZE}
-+ Do you want to run 0 A.D. anyway?
-+ (If so, it may run out of memory and crash.)
-+ _EOF
-+ [ $? -eq 0 ] || exit
-+ fi
- "$pyrogenesis" "$@"
+ pyrogenesis=$(which pyrogenesis 2>/dev/null)
+ if [ -x "$pyrogenesis" ]; then
++ DATASIZE=$((2 * 1024 * 1024))
++ if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
++ ulimit -Sd ${DATASIZE} || \
++ ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1
-default no <<- _EOF
++ Cannot increase datasize-cur to at least ${DATASIZE}
++ Do you want to run 0 A.D. anyway?
++ (If so, it may run out of memory and crash.)
++ _EOF
++ [ $? -eq 0 ] || exit
++ fi
+ "$pyrogenesis" "$@"
else
- echo "Error: pyrogenesis not found in ($PATH)"
+ echo "Error: pyrogenesis not found in ($PATH)"
