Re: update games/0ad

On Mon, October 3, 2022 17:55, Omar Polo wrote:
> here's an updated for games/0ad, sending it a bit early so interested
> folks can play it :)
>
> https://play0ad.com/new-release-0-a-d-alpha-26-zhuangzi/
>
> I've only played it briefly, but the new civilization (Han) is really
> cool. Will hopefully play it more in the following days.
>
> port-wise I removed the backported diff and updated the one we need.
> Upstream explicitly links to libogg and libvorbis on OpenBSD (there's
> a check in build/premake/extern_libs5.lua -- I'm assuming they dlopen
> on other platforms?) but starting from this version it also need
> vorbisfile to link.
>
> OK for after the unlock?

Hi,
Works fine for me. OK kirby@

>
> Index: Makefile.inc
> ===================================================================
> RCS file: /home/cvs/ports/games/0ad/Makefile.inc,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile.inc
> --- Makefile.inc 11 Mar 2022 19:04:03 -0000 1.14
> +++ Makefile.inc 2 Oct 2022 20:33:54 -0000
> @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = amd64 i386
>
> CATEGORIES = games
>
> -V ?= 0.0.25b
> +V ?= 0.0.26
>
> HOMEPAGE = https://play0ad.com/
>
> Index: base/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/games/0ad/base/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- base/Makefile 18 Aug 2022 02:24:48 -0000 1.37
> +++ base/Makefile 3 Oct 2022 14:42:02 -0000
> @@ -3,15 +3,13 @@ COMMENT = historical real-time strategy
> DISTNAME = 0ad-${V}-alpha-unix-build
> PKGNAME = 0ad-${V}
>
> -REVISION = 0
> -
> USE_WXNEEDED = Yes
>
> SO_VERSION = 0.0
> SHARED_LIBS += mozjs78-ps-release ${SO_VERSION}
>
> -WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 boost_filesystem
> -WANTLIB += boost_system c crypto curl enet execinfo fmt gloox iconv
> +WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 boost_filesystem
> +WANTLIB += boost_system c crypto curl enet execinfo fmt freetype gloox iconv
> WANTLIB += icudata icui18n icuuc idn m miniupnpc ogg openal
> WANTLIB += png sodium ssl vorbis vorbisfile xml2 z
>
> Index: base/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/games/0ad/base/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- base/distinfo 22 Nov 2021 16:00:30 -0000 1.9
> +++ base/distinfo 2 Oct 2022 20:34:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (0ad-0.0.25b-alpha-unix-build.tar.gz) =
> AnMMMof21FEekRntNF1CSk7z9aMb9KCnzHntgNv+PIA=
> -SIZE (0ad-0.0.25b-alpha-unix-build.tar.gz) = 78022628
> +SHA256 (0ad-0.0.26-alpha-unix-build.tar.gz) =
> SpkFAE4iDXdP8H/TH+XKqzraOAfut79mSykEWDcRQhw=
> +SIZE (0ad-0.0.26-alpha-unix-build.tar.gz) = 78065537
> 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
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ base/patches/patch-build_premake_extern_libs5_lua 2 Oct 2022 22:15:24
> -0000
> @@ -0,0 +1,12 @@
> +Index: build/premake/extern_libs5.lua
> +--- build/premake/extern_libs5.lua.orig
> ++++ build/premake/extern_libs5.lua
> +@@ -675,7 +675,7 @@ extern_lib_defs = {
> + -- 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" },
> ++ unix_names = { "ogg", "vorbis", "vorbisfile" },
> + })
> + else
> + pkgconfig.add_links("vorbisfile")
> Index: base/patches/patch-build_workspaces_update-workspaces_sh
> ===================================================================
> RCS file:
> /home/cvs/ports/games/0ad/base/patches/patch-build_workspaces_update-workspaces_sh,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-build_workspaces_update-workspaces_sh
> --- base/patches/patch-build_workspaces_update-workspaces_sh 11 Mar 2022
> 19:04:03 -0000 1.8
> +++ base/patches/patch-build_workspaces_update-workspaces_sh 2 Oct 2022
> 20:42:23 -0000
> @@ -2,7 +2,7 @@ Don't build bundled libraries during con
> Index: build/workspaces/update-workspaces.sh
> --- build/workspaces/update-workspaces.sh.orig
> +++ build/workspaces/update-workspaces.sh
> -@@ -86,7 +86,7 @@ if [ "`uname -s`" != "Darwin" ]; then
> +@@ -90,7 +90,7 @@ if [ "`uname -s`" != "Darwin" ]; then
> echo
>
> # Build/update bundled external libraries
> @@ -10,4 +10,4 @@ Index: build/workspaces/update-workspace
> + # (cd ../../libraries/source/fcollada && MAKE=${MAKE} JOBS=${JOBS}
> ./build.sh) || die "FCollada build failed"
> echo
> if [ "$with_system_mozjs" = "false" ]; then
> - (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS}
> ./build.sh) || die "SpiderMonkey build failed"
> + (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS}
> PYTHONNOUSERSITE=true ./build.sh) || die "SpiderMonkey build failed"
> Index: base/patches/patch-libraries_source_spidermonkey_FixMacBuild_diff
> ===================================================================
> RCS file: base/patches/patch-libraries_source_spidermonkey_FixMacBuild_diff
> diff -N base/patches/patch-libraries_source_spidermonkey_FixMacBuild_diff
> --- base/patches/patch-libraries_source_spidermonkey_FixMacBuild_diff 18 Aug
> 2022 02:24:48 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,100 +0,0 @@
> -Backport from upstream patch. Much of this is only for macos aarch64,
> -but it includes a piece that fixes build with newer setuptools as well.
> -Keeping the whole lot together because it's easier to handle the diff
> -that way.
> -
> -(ports/games/0ad/Makefile.inc sets ONLY_FOR_ARCHS=amd64 i386 anyway
> -so this won't actually be built on aarch64 as-is).
> -
> -Index: libraries/source/spidermonkey/FixMacBuild.diff
> ---- libraries/source/spidermonkey/FixMacBuild.diff.orig
> -+++ libraries/source/spidermonkey/FixMacBuild.diff
> -@@ -13,12 +13,84 @@
> - js_flags.append('-Xclang')
> - --- a/build/moz.configure/toolchain.configure
> - +++ b/build/moz.configure/toolchain.configure
> --@@ -141,7 +141,7 @@
> -+@@ -141,7 +141,6 @@
> - @imports(_from='biplist', _import='readPlist')
> - def macos_sdk(sdk, host):
> - sdk_min_version = Version('10.11')
> - - sdk_max_version = Version('10.15.4')
> --+ sdk_max_version = Version('11.99')
> -
> - if sdk:
> -- sdk = sdk[0]
> -\ No newline at end of file
> -+ sdk = sdk[0]
> -+@@ -170,11 +169,6 @@
> -+ 'You may need to point to it using --with-macos-sdk=<path>
> in your '
> -+ 'mozconfig. Various SDK versions are available from '
> -+ 'https://github.com/phracker/MacOSX-SDKs' % (version,
> sdk_min_version))
> -+- if version > sdk_max_version:
> -+- die('SDK version "%s" is unsupported. Please downgrade to
> version '
> -+- '%s. You may need to point to it using
> --with-macos-sdk=<path> in '
> -+- 'your mozconfig. Various SDK versions are available from '
> -+- 'https://github.com/phracker/MacOSX-SDKs' % (version,
> sdk_max_version))
> -+ return sdk
> -+
> -+ set_config('MACOS_SDK_DIR', macos_sdk)
> -+--- a/build/moz.configure/init.configure
> -++++ b/build/moz.configure/init.configure
> -+@@ -375,9 +375,6 @@
> -+ sys.exit(subprocess.call([python] + sys.argv))
> -+
> -+ # We are now in the virtualenv
> -+- if not distutils.sysconfig.get_python_lib():
> -+- die('Could not determine python site packages directory')
> -+-
> -+ str_version = '.'.join(str(v) for v in version)
> -+
> -+ return namespace(
> -+--- a/js/src/jit/arm64/vixl/MozCpu-vixl.cpp
> -++++ b/js/src/jit/arm64/vixl/MozCpu-vixl.cpp
> -+@@ -69,7 +69,7 @@ void CPU::SetUp() {
> -+
> -+
> -+ uint32_t CPU::GetCacheType() {
> -+-#if defined(__aarch64__) && !defined(_MSC_VER)
> -++#if defined(__aarch64__) && (defined(__linux__) || defined(__android__))
> -+ uint64_t cache_type_register;
> -+ // Copy the content of the cache type register to a core register.
> -+ __asm__ __volatile__ ("mrs %[ctr], ctr_el0" // NOLINT
> -+--- a/js/src/wasm/WasmSignalHandlers.cpp
> -++++ b/js/src/wasm/WasmSignalHandlers.cpp
> -+@@ -226,6 +226,10 @@ using mozilla::DebugOnly;
> -+ # define R13_sig(p) ((p)->thread.__sp)
> -+ # define R14_sig(p) ((p)->thread.__lr)
> -+ # define R15_sig(p) ((p)->thread.__pc)
> -++# define EPC_sig(p) ((p)->thread.__pc)
> -++# define RFP_sig(p) ((p)->thread.__fp)
> -++# define R31_sig(p) ((p)->thread.__sp)
> -++# define RLR_sig(p) ((p)->thread.__lr)
> -+ #else
> -+ # error "Don't know how to read/write to the thread state via the
> mcontext_t."
> -+