Index | Thread | Search

From:
Volker Schlecht <openbsd-ports@schlecht.dev>
Subject:
Re: Patch Release of 0 A.D. Alpha 27.1
To:
Itms <na.itms76@gmail.com>, ports <ports@openbsd.org>
Date:
Thu, 17 Jul 2025 22:10:15 +0200

Download raw body.

Thread
Thanks! It seems to build and work fine with quite a few of our patches
removed.

Everyone: diff attached, looking for ok

On 7/17/25 3:01 PM, Itms wrote:
> Dear maintainers of 0 A.D.,
> 
> We are proud to announce the release of our first Patch Release for 0 
> A.D. Alpha 27 (Agni) <https://play0ad.com/patch-release-27-1-for-0-a-d/ 
>  >. You can get the tarballs for building 0 A.D. on your distribution at 
> https://releases.wildfiregames.com/. The release files are signed with 
> the minisign public key 
> RWTWLbO12+ig3lUExIor3xd6DdZaYFEozn8Bu8nIzY3ImuRYQszIQyyy
> 
> This is a small-scale release addressing important performance fixes and 
> several bug fixes. Many patches from various maintainers have been 
> upstreamed to make your packaging work easier.
> 
> Thank you for the packaging work and for delivering the game to your 
> users! Please do not hesitate to reach out in case of issues.
> Nicolas "Itms" Auvray
> 
> 
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/games/0ad/Makefile.inc,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.inc
--- Makefile.inc	15 Feb 2025 22:37:06 -0000	1.18
+++ Makefile.inc	17 Jul 2025 20:03:17 -0000
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =	amd64 i386
 
 CATEGORIES = 		games
 
-V ?= 			0.27.0
+V ?= 			0.27.1
 
 HOMEPAGE = 		https://play0ad.com/
 
Index: base/distinfo
===================================================================
RCS file: /cvs/ports/games/0ad/base/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- base/distinfo	15 Feb 2025 22:37:06 -0000	1.12
+++ base/distinfo	17 Jul 2025 20:03:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.27.0-unix-build.tar.xz) = qpSFcAl1DV9h2/AWvBUOO9y9s6zfyK0gtzq4tD6aG6Y=
-SIZE (0ad-0.27.0-unix-build.tar.xz) = 152170976
+SHA256 (0ad-0.27.1-unix-build.tar.xz) = oKU1XutZaNJPKDdwc2FQ2XTa/sugd1TUZicH3BcBa/s=
+SIZE (0ad-0.27.1-unix-build.tar.xz) = 153554512
Index: base/patches/patch-build_premake_extern_libs5_lua
===================================================================
RCS file: base/patches/patch-build_premake_extern_libs5_lua
diff -N base/patches/patch-build_premake_extern_libs5_lua
--- base/patches/patch-build_premake_extern_libs5_lua	8 Feb 2025 22:13:43 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Index: build/premake/extern_libs5.lua
---- build/premake/extern_libs5.lua.orig
-+++ build/premake/extern_libs5.lua
-@@ -719,12 +719,6 @@ extern_lib_defs = {
- 				add_default_links({
- 					win_names  = { "libvorbisfile" },
- 				})
--			elseif os.getversion().description == "OpenBSD" then
--				-- TODO: We need to force linking with these as currently
--				-- they need to be loaded explicitly on execution
--				add_default_links({
--					unix_names = { "ogg", "vorbis" },
--				})
- 			else
- 				pkgconfig.add_links("vorbisfile")
- 			end
Index: base/patches/patch-libraries_build-source-libs_sh
===================================================================
RCS file: base/patches/patch-libraries_build-source-libs_sh
diff -N base/patches/patch-libraries_build-source-libs_sh
--- base/patches/patch-libraries_build-source-libs_sh	8 Feb 2025 22:13:43 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: libraries/build-source-libs.sh
---- libraries/build-source-libs.sh.orig
-+++ libraries/build-source-libs.sh
-@@ -62,7 +62,7 @@ while [ "$#" -gt 0 ]; do
- 		--with-system-cxxtest) with_system_cxxtest=true ;;
- 		--with-system-nvtt) with_system_nvtt=true ;;
- 		--with-system-mozjs) with_system_mozjs=true ;;
--		--with-system-premake) with_system_mozjs=true ;;
-+		--with-system-premake) with_system_premake=true ;;
- 		--with-spirv-reflect) with_spirv_reflect=true ;;
- 		-j*) JOBS="$1" ;;
- 		*)
Index: base/patches/patch-libraries_source_cxxtest-4_4_build_sh
===================================================================
RCS file: /cvs/ports/games/0ad/base/patches/patch-libraries_source_cxxtest-4_4_build_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libraries_source_cxxtest-4_4_build_sh
--- base/patches/patch-libraries_source_cxxtest-4_4_build_sh	8 Feb 2025 22:13:43 -0000	1.1
+++ base/patches/patch-libraries_source_cxxtest-4_4_build_sh	17 Jul 2025 20:03:17 -0000
@@ -1,12 +1,12 @@
 Index: libraries/source/cxxtest-4.4/build.sh
 --- libraries/source/cxxtest-4.4/build.sh.orig
 +++ libraries/source/cxxtest-4.4/build.sh
-@@ -40,7 +40,7 @@ fi
+@@ -42,7 +42,7 @@ fi
  
  # unpack
  rm -Rf "cxxtest-${PV}"
--tar -xf "cxxtest-${PV}.tar.gz"
-+tar -xzf "cxxtest-${PV}.tar.gz"
+-"${TAR}" -xf "cxxtest-${PV}.tar.gz"
++"${TAR}" -xzf "cxxtest-${PV}.tar.gz"
  
  # patch
  patch -d "cxxtest-${PV}" -p1 <patches/0001-Add-Debian-python3-patch.patch
Index: base/patches/patch-libraries_source_fcollada_build_sh
===================================================================
RCS file: /cvs/ports/games/0ad/base/patches/patch-libraries_source_fcollada_build_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libraries_source_fcollada_build_sh
--- base/patches/patch-libraries_source_fcollada_build_sh	8 Feb 2025 22:13:43 -0000	1.1
+++ base/patches/patch-libraries_source_fcollada_build_sh	17 Jul 2025 20:03:17 -0000
@@ -1,7 +1,7 @@
 Index: libraries/source/fcollada/build.sh
 --- libraries/source/fcollada/build.sh.orig
 +++ libraries/source/fcollada/build.sh
-@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
+@@ -7,6 +7,7 @@ cd "$(dirname "$0")"
  
  PV=28209
  LIB_VERSION=${PV}
@@ -9,12 +9,3 @@ Index: libraries/source/fcollada/build.s
  
  fetch()
  {
-@@ -42,7 +43,7 @@ fi
- 
- # unpack
- rm -Rf fcollada-${PV}
--tar xf fcollada-${PV}.tar.xz
-+$TAR xf fcollada-${PV}.tar.xz
- 
- # build
- (
Index: base/patches/patch-libraries_source_nvtt_build_sh
===================================================================
RCS file: base/patches/patch-libraries_source_nvtt_build_sh
diff -N base/patches/patch-libraries_source_nvtt_build_sh
--- base/patches/patch-libraries_source_nvtt_build_sh	8 Feb 2025 22:13:43 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-Index: libraries/source/nvtt/build.sh
---- libraries/source/nvtt/build.sh.orig
-+++ libraries/source/nvtt/build.sh
-@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
- 
- PV=28209
- LIB_VERSION=${PV}
-+TAR=${TAR:-tar}
- 
- fetch()
- {
-@@ -42,7 +43,7 @@ fi
- 
- # unpack
- rm -Rf nvtt-${PV}
--tar xf nvtt-${PV}.tar.xz
-+$TAR xf nvtt-${PV}.tar.xz
- 
- # build
- (
Index: base/patches/patch-libraries_source_premake-core_build_sh
===================================================================
RCS file: base/patches/patch-libraries_source_premake-core_build_sh
diff -N base/patches/patch-libraries_source_premake-core_build_sh
--- base/patches/patch-libraries_source_premake-core_build_sh	8 Feb 2025 22:13:43 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-Index: libraries/source/premake-core/build.sh
---- libraries/source/premake-core/build.sh.orig
-+++ libraries/source/premake-core/build.sh
-@@ -9,6 +9,7 @@ cd "$(dirname "$0")"
- 
- PV=5.0.0-beta3
- LIB_VERSION=${PV}+wfg1
-+TAR=${TAR:-tar}
- 
- fetch()
- {
-@@ -44,7 +45,7 @@ fi
- 
- # unpack
- rm -Rf "premake-core-${PV}"
--tar -xf "premake-core-${PV}.tar.gz"
-+$TAR -xf "premake-core-${PV}.tar.gz"
- 
- # patch
- # ffcb7790f013bdceacc14ba5fda1c5cd107aac08
-@@ -57,6 +58,8 @@ patch -d "premake-core-${PV}" -p1 <patches/0003-Add-su
- patch -d "premake-core-${PV}" -p1 <patches/0004-Add-support-for-loongarch64-2363.patch
- # 5c524b6d53307bcb4ba7b02c9dba20100df68943
- patch -d "premake-core-${PV}" -p1 <patches/0005-premake.h-added-e2k-definition-2349.patch
-+
-+patch -d "premake-core-${PV}" <patches/0006-disable_gethostname_r.diff
- 
- #build
- (
Index: base/patches/patch-libraries_source_spidermonkey_build_sh
===================================================================
RCS file: /cvs/ports/games/0ad/base/patches/patch-libraries_source_spidermonkey_build_sh,v
retrieving revision 1.7
diff -u -p -r1.7 patch-libraries_source_spidermonkey_build_sh
--- base/patches/patch-libraries_source_spidermonkey_build_sh	8 Feb 2025 22:13:43 -0000	1.7
+++ base/patches/patch-libraries_source_spidermonkey_build_sh	17 Jul 2025 20:03:17 -0000
@@ -1,24 +1,15 @@
 Index: libraries/source/spidermonkey/build.sh
 --- libraries/source/spidermonkey/build.sh.orig
 +++ libraries/source/spidermonkey/build.sh
-@@ -8,6 +8,7 @@ FOLDER="mozjs-115.16.1"
+@@ -10,6 +10,7 @@ FOLDER="mozjs-115.16.1"
  # If same-version changes are needed, increment this.
- LIB_VERSION="115.16.1+1"
+ LIB_VERSION="115.16.1+a27.1"
  LIB_NAME="mozjs115"
 +TAR=${TAR:-tar}
  
  fetch()
  {
-@@ -47,7 +48,7 @@ fi
- 
- # unpack
- rm -Rf "${FOLDER}"
--tar xfJ "${FOLDER}.tar.xz"
-+$TAR xfJ "${FOLDER}.tar.xz"
- 
- # patch
- (
-@@ -158,7 +159,7 @@ else
+@@ -160,7 +161,7 @@ else
  	LIB_SUFFIX=.so
  	STATIC_LIB_SUFFIX=.a
  	if [ "${OS}" = "OpenBSD" ]; then
@@ -27,7 +18,7 @@ Index: libraries/source/spidermonkey/bui
  	elif [ "${OS}" = "Darwin" ]; then
  		LIB_SUFFIX=.a
  	fi
-@@ -188,7 +189,7 @@ fi
+@@ -190,7 +191,7 @@ fi
  mkdir include-release
  cp -R -L "${FOLDER}"/build-release/dist/include/* include-release/
  
@@ -36,7 +27,7 @@ Index: libraries/source/spidermonkey/bui
  	mkdir include-debug
  	cp -R -L "${FOLDER}"/build-debug/dist/include/* include-debug/
  fi
-@@ -220,7 +221,7 @@ elif [ "${OS}" = "Windows_NT" ]; then
+@@ -222,7 +223,7 @@ elif [ "${OS}" = "Windows_NT" ]; then
  else
  	# Copy shared libs to lib/, they will also be copied to binaries/system, so the compiler and executable (resp.) can find them.
  	cp -L "${FOLDER}/build-${REL}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}"
Index: data/distinfo
===================================================================
RCS file: /cvs/ports/games/0ad/data/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- data/distinfo	15 Feb 2025 22:37:06 -0000	1.12
+++ data/distinfo	17 Jul 2025 20:03:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.27.0-unix-data.tar.xz) = PkiFWrjh74EnAzhGLIJwsBUhPxT14FSquSrXTV6lneo=
-SIZE (0ad-0.27.0-unix-data.tar.xz) = 1367701984
+SHA256 (0ad-0.27.1-unix-data.tar.xz) = g34tbd8TiwJfwCAXJF11gaS7hP2UtCwOYF0yG3AXqZg=
+SIZE (0ad-0.27.1-unix-data.tar.xz) = 1367955136