On Wed, 2025-02-05 at 21:44 +0000, Klemens Nanni wrote:
> 05.02.2025 20:42, Martijn van Duren пишет:
> > - Atlas (map builder) seems to run fine now, so enable it. This
> > requires wxWidgets-gtk3.
>
> cd /usr/ports/pobj/0ad-0.27.0/0ad-0.27.0/build/workspaces && /usr/bin/env -i
> CC="cc" CXX="c++" CFLAGS="-O2 -pipe " CXXFLAGS="-O2 -pipe "
> SO_VERSION="0.0" TAR=gtar PYTHON="/usr/local/bin/python3.12" MAKE=gmake
> LIBTOOL="/usr/bin/libtool" LIBmozjs115-release_LTVERSION='-version-info
> 0:0:0' libmozjs115_release_ltversion=0.0 CCACHE_DIR=/usr/ports/pobj/.ccache
> SCCACHE_SERVER_PORT=44226 SCCACHE_DIR=/usr/ports/pobj/.sccache
> PATH=/usr/ports/pobj/0ad-0.27.0/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin
> verbose=1 ./update-workspaces.sh -j6 --datadir=/usr/local/share/0ad
> --libdir=/usr/local/lib --minimal-flags
>
> Premake args: --datadir=/usr/local/share/0ad --libdir=/usr/local/lib
> --minimal-flags
> WX_CONFIG must be set and valid or wx-config must be present when atlas is
> enabled
> current value: wx-config
> ERROR: Premake failed
> *** Error 1 in . (Makefile:76 'do-build')
>
> Needs a build dep on
>
> wxWidgets-gtk3-3.2.6p2:x11/wxWidgets,-main:/usr/local/bin/wx-config
>
> After installing this it fails differently
>
> $ make build
> [...]
> Premake args: --datadir=/usr/local/share/0ad --libdir=/usr/local/lib
> --minimal-flags
> Building configurations...
> Running action 'gmake2'...
> Done (1930ms).
> cd /usr/ports/pobj/0ad-0.27.0/0ad-0.27.0 && /usr/bin/env -i CC="cc"
> CXX="c++" CFLAGS="-O2 -pipe " CXXFLAGS="-O2 -pipe -I/usr/X11R6/include"
> LDFLAGS="-L/usr/local/lib -liconv" CC=cc
> PYTHONUSERBASE=/usr/ports/pobj/0ad-0.27.0 PORTSDIR="/usr/ports"
> LIBTOOL="/usr/bin/libtool" LIBmozjs115-release_LTVERSION='-version-info
> 0:0:0' libmozjs115_release_ltversion=0.0 CCACHE_DIR=/usr/ports/pobj/.ccache
> SCCACHE_SERVER_PORT=44226 SCCACHE_DIR=/usr/ports/pobj/.sccache
> RUSTC_WRAPPER=/usr/local/bin/sccache
> PATH='/usr/ports/pobj/0ad-0.27.0/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
> PREFIX='/usr/local' LOCALBASE='/usr/local' X11BASE='/usr/X11R6'
> CFLAGS='-O2 -pipe' TRUEPREFIX='/usr/local' DESTDIR=''
> HOME='/0ad-0.27.0_writes_to_HOME' PICFLAG="-fpic" BINGRP=bin BINOWN=root
> BINMODE=755 NONBINMODE=644 DIRMODE=755 INSTALL_COPY=-c INSTALL_STRIP=-s
> MANGRP=bin MANOWN=root MANMODE=644
> BSD_INSTALL_PROGRAM="/usr/ports/pobj/0ad-0.27.0/bin/install -c -s -m 755"
> BSD_INSTALL_SCRIPT="/usr/ports/pobj/0ad-0.27.0/bin/install -c -m 755"
> BSD_INSTALL_DATA="/usr/ports/pobj/0ad-0.27.0/bin/install -c -m 644"
> BSD_INSTALL_MAN="/usr/ports/pobj/0ad-0.27.0/bin/install -c -m 644"
> BSD_INSTALL_PROGRAM_DIR="/usr/ports/pobj/0ad-0.27.0/bin/install -d -m 755"
> BSD_INSTALL_SCRIPT_DIR="/usr/ports/pobj/0ad-0.27.0/bin/install -d -m 755"
> BSD_INSTALL_DATA_DIR="/usr/ports/pobj/0ad-0.27.0/bin/install -d -m 755"
> BSD_INSTALL_MAN_DIR="/usr/ports/pobj/0ad-0.27.0/bin/install -d -m 755" gmake
> SILENT= LIBTOOL="/usr/bin/libtool"
> LIBmozjs115-release_LTVERSION='-version-info 0:0:0'
> libmozjs115_release_ltversion=0.0
> SHARED_LIBS_LOG=/usr/ports/pobj/0ad-0.27.0/0ad-0.27.0/shared_libs.log -j6 -f
> Makefile all
> gmake: Makefile: No such file or directory
> gmake: *** No rule to make target 'Makefile'. Stop.
>
Yep... I accidentally placed it in RUN_DEPENDS, instead of LIB_DEPENDS.
These libraries are linked against libAtlasUI.so, but make package
compains with:
LIB_DEPENDS x11/wxWidgets not needed for games/0ad/base ?
Not sure how this is supposed to be resolved, or if it can be ignored.
And I did made the changes for patch-build_resources_0ad_sh, but
it got lost when picking the new and modified files.
Same delete list applies:
games/0ad/base/patches/patch-build_premake_premake5_build_gmake2_bsd_Premake5_make
games/0ad/base/patches/patch-build_workspaces_update-workspaces_sh
games/0ad/base/patches/patch-libraries_source_fcollada_src_FColladaPlugins_FArchiveXML_FArchiveXML_cpp
games/0ad/base/patches/patch-libraries_source_fcollada_src_FCollada_FUtils_FUXmlDocument_cpp
games/0ad/base/patches/patch-libraries_source_fcollada_src_Makefile
games/0ad/base/patches/patch-libraries_source_spidermonkey_0001-Python-Build-Use-r-instead-of-rU-file-read-modes_patch
games/0ad/base/patches/patch-libraries_source_spidermonkey_FixNewClang.diff
games/0ad/base/patches/patch-libraries_source_spidermonkey_mozjs_virtualenv_patch
games/0ad/base/patches/patch-libraries_source_spidermonkey_patch_sh
games/0ad/base/patches/patch-source_collada_CommonConvert_cpp
games/0ad/base/patches/patch-source_collada_XMLFix_cpp
games/0ad/base/patches/patch-source_network_NetMessage_cpp
games/0ad/base/patches/patch-source_ps_XML_RelaxNG_cpp
games/0ad/base/patches/patch-source_ps_XML_Xeromyces_cpp
games/0ad/base/patches/patch-source_simulation2_serialization_BinarySerializer_cpp
diff /usr/ports
path + /usr/ports
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 77eb3e609fc458ada66c0767165c24880e3115c7
file + games/0ad/Makefile.inc
--- games/0ad/Makefile.inc
+++ games/0ad/Makefile.inc
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = amd64 i386
CATEGORIES = games
-V ?= 0.0.26
+V ?= 0.27.0
HOMEPAGE = https://play0ad.com/
@@ -12,4 +12,4 @@ SITES =
https://releases.wildfiregames.com/ \
# GPLv2+, MIT for libs, CC-BY-SA for data
PERMIT_PACKAGE = Yes
-WRKDIST = ${WRKDIR}/0ad-${V}-alpha
+WRKDIST = ${WRKDIR}/0ad-${V}
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 9388a46af4817b36aecf270ce17306e1748d4d60
file + games/0ad/base/Makefile
--- games/0ad/base/Makefile
+++ games/0ad/base/Makefile
@@ -1,28 +1,20 @@
-BROKEN = venv for spidermonkey (mozjs) outdated and fails with Python
3.12
-
COMMENT = historical real-time strategy game
-DISTNAME = 0ad-${V}-alpha-unix-build
+DISTNAME = 0ad-${V}-unix-build
PKGNAME = 0ad-${V}
-REVISION = 7
-USE_WXNEEDED = Yes
-USE_NOBTCFI = Yes
+SO_VERSION = 0.0
+SHARED_LIBS += mozjs115-release ${SO_VERSION}
-SO_VERSION = 0.0
-SHARED_LIBS += mozjs78-ps-release ${SO_VERSION}
-
WANTLIB += ${MODRUST_WANTLIB} ${COMPILER_LIBCXX} SDL2 X11 boost_filesystem
WANTLIB += boost_system 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
-BUILD_DEPENDS = archivers/zip \
- shells/bash
-# used offline, to apply binary patch: see
-# patch-libraries_source_spidermonkey_mozjs_virtualenv_patch
-# patch-libraries_source_spidermonkey_patch_sh
-BUILD_DEPENDS += devel/git
+BUILD_DEPENDS = archivers/gtar \
+ archivers/zip \
+ devel/cmake \
+ shells/bash \
LIB_DEPENDS = audio/libvorbis \
audio/openal \
@@ -37,9 +29,11 @@ LIB_DEPENDS = audio/libvorbis \
net/miniupnp/miniupnpc \
security/libsodium \
textproc/icu4c \
- textproc/libxml
+ textproc/libxml \
+ x11/wxWidgets
RUN_DEPENDS = devel/desktop-file-utils \
- games/0ad/data=${V}
+ games/0ad/data=${V} \
+ x11/wxWidgets
MODULES = lang/python \
lang/rust
@@ -53,51 +47,37 @@ MAKE_ENV = CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
- LDFLAGS="-liconv"
+ LDFLAGS="-L/usr/local/lib -liconv"
-FIX_CRLF_FILES = build/premake/premake5/build/gmake.bsd/Premake5.make
-
USE_GMAKE = Yes
-# libraries/source/spidermonkey/mozjs-*/python/mach/mach/mixin/process.py
-# checks this var and errors out if undefined:
-# Exception: Could not detect environment shell!
-CONFIGURE_ENV += SHELL=sh
+# Library build.sh scripts require gtar specific flags.
+CONFIGURE_ENV += TAR=gtar
# XXX don't use --with-native-mozjs because 0ad needs to stay in sync
# with it: updates to mozjs could break the multiplayer.
CONFIGURE_ARGS += -j${MAKE_JOBS} \
- --without-nvtt \
--datadir=${PREFIX}/share/0ad \
--libdir=${PREFIX}/lib \
--minimal-flags
-# XXX atlas (the level editor) requires threaded libxml
-CONFIGURE_ARGS += --disable-atlas
-
WRKSRC = ${WRKDIST}/build/workspaces/gcc
-# most tests fail without nvtt
-CONFIGURE_ARGS += --without-tests
-# XXX built and packaged even without tests
-MAKE_FLAGS += mocks_test_config=''
-
-post-extract:
- # remove unused bundled sources
- rm -rf
${WRKSRC}/libraries/source/{cxxtest-4.4,enet,miniupnpc,nvtt,valgrind}
-
do-build:
ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python3 # ensure correct version
binary is used
+ cd ${WRKDIST}/libraries && \
+ ${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" SO_VERSION="${SO_VERSION}" \
+ ${CONFIGURE_ENV} verbose=1 \
+ ./build-source-libs.sh
+
cd ${WRKDIST}/build/workspaces && \
${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" SO_VERSION="${SO_VERSION}" \
${CONFIGURE_ENV} verbose=1 \
./update-workspaces.sh ${CONFIGURE_ARGS}
- cd ${WRKDIST}/libraries/source/fcollada/src && \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
- -f ${MAKE_FILE} ${ALL_TARGET}
cd ${WRKSRC} &&\
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-f ${MAKE_FILE} ${ALL_TARGET}
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 5964b7c7876ceaa85ba1c7d62b4ac5096d5216b0
file + games/0ad/base/distinfo
--- games/0ad/base/distinfo
+++ games/0ad/base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.0.26-alpha-unix-build.tar.gz) =
SpkFAE4iDXdP8H/TH+XKqzraOAfut79mSykEWDcRQhw=
-SIZE (0ad-0.0.26-alpha-unix-build.tar.gz) = 78065537
+SHA256 (0ad-0.27.0-unix-build.tar.gz) =
b97A4N780ipdu8L3fpTPEGA7qozQgch2N1olVF1MoGg=
+SIZE (0ad-0.27.0-unix-build.tar.gz) = 153796770
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 8dc6982a7590cdcec77e0591ccb43313eee27ea1
file + games/0ad/base/patches/patch-build_premake_extern_libs5_lua
--- games/0ad/base/patches/patch-build_premake_extern_libs5_lua
+++ games/0ad/base/patches/patch-build_premake_extern_libs5_lua
@@ -1,7 +1,7 @@
Index: build/premake/extern_libs5.lua
--- build/premake/extern_libs5.lua.orig
+++ build/premake/extern_libs5.lua
-@@ -675,7 +675,7 @@ extern_lib_defs = {
+@@ -723,7 +723,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({
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - f9e836ba288e461087b0d0e3ea67cdf2f31dc513
file + games/0ad/base/patches/patch-build_resources_0ad_sh
--- games/0ad/base/patches/patch-build_resources_0ad_sh
+++ games/0ad/base/patches/patch-build_resources_0ad_sh
@@ -5,18 +5,18 @@ Index: build/resources/0ad.sh
+++ 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)"
commit - 19533b28c657eea0040a6890ee74b1fb67a9e1d7
blob - /dev/null
file + games/0ad/base/patches/patch-libraries_build-source-libs_sh (mode 644)
--- /dev/null
+++ games/0ad/base/patches/patch-libraries_build-source-libs_sh
@@ -0,0 +1,12 @@
+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" ;;
+ *)
commit - 19533b28c657eea0040a6890ee74b1fb67a9e1d7
blob - /dev/null
file + games/0ad/base/patches/patch-libraries_source_cxxtest-4_4_build_sh (mode
644)
--- /dev/null
+++ games/0ad/base/patches/patch-libraries_source_cxxtest-4_4_build_sh
@@ -0,0 +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
+
+ # unpack
+ rm -Rf "cxxtest-${PV}"
+-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
commit - 19533b28c657eea0040a6890ee74b1fb67a9e1d7
blob - /dev/null
file + games/0ad/base/patches/patch-libraries_source_fcollada_build_sh (mode
644)
--- /dev/null
+++ games/0ad/base/patches/patch-libraries_source_fcollada_build_sh
@@ -0,0 +1,20 @@
+Index: libraries/source/fcollada/build.sh
+--- libraries/source/fcollada/build.sh.orig
++++ libraries/source/fcollada/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 fcollada-${PV}
+-tar xf fcollada-${PV}.tar.xz
++$TAR xf fcollada-${PV}.tar.xz
+
+ # build
+ (
commit - 19533b28c657eea0040a6890ee74b1fb67a9e1d7
blob - /dev/null
file + games/0ad/base/patches/patch-libraries_source_nvtt_build_sh (mode 644)
--- /dev/null
+++ games/0ad/base/patches/patch-libraries_source_nvtt_build_sh
@@ -0,0 +1,20 @@
+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
+ (
commit - 19533b28c657eea0040a6890ee74b1fb67a9e1d7
blob - /dev/null
file + games/0ad/base/patches/patch-libraries_source_premake-core_build_sh
(mode 644)
--- /dev/null
+++ games/0ad/base/patches/patch-libraries_source_premake-core_build_sh
@@ -0,0 +1,29 @@
+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
+ (
commit - 19533b28c657eea0040a6890ee74b1fb67a9e1d7
blob - /dev/null
file +
games/0ad/base/patches/patch-libraries_source_premake-core_patches_0006-disable_gethostname_r_diff
(mode 644)
--- /dev/null
+++
games/0ad/base/patches/patch-libraries_source_premake-core_patches_0006-disable_gethostname_r_diff
@@ -0,0 +1,16 @@
+Index: libraries/source/premake-core/patches/0006-disable_gethostname_r.diff
+--- libraries/source/premake-core/patches/0006-disable_gethostname_r.diff.orig
++++ libraries/source/premake-core/patches/0006-disable_gethostname_r.diff
+@@ -0,0 +1,12 @@
++--- contrib/curl/lib/config-linux.h.orig Tue Feb 4 18:37:46 2025
+++++ contrib/curl/lib/config-linux.h Tue Feb 4 18:38:14 2025
++@@ -185,7 +185,9 @@
++ #define HAVE_GETHOSTBYNAME 1
++
++ /* Define to 1 if you have the gethostbyname_r function. */
+++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__sun__)
++ #define HAVE_GETHOSTBYNAME_R 1
+++#endif
++
++ /* gethostbyname_r() takes 3 args */
++ /* #undef HAVE_GETHOSTBYNAME_R_3 */
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 5316402ad0516a451e723b7b914b3e9b4a8026ac
file + games/0ad/base/patches/patch-libraries_source_spidermonkey_build_sh
--- games/0ad/base/patches/patch-libraries_source_spidermonkey_build_sh
+++ games/0ad/base/patches/patch-libraries_source_spidermonkey_build_sh
@@ -1,41 +1,47 @@
Index: libraries/source/spidermonkey/build.sh
--- libraries/source/spidermonkey/build.sh.orig
+++ libraries/source/spidermonkey/build.sh
-@@ -128,8 +128,8 @@ else
- cd "$FOLDER"
- fi
+@@ -8,6 +8,7 @@ FOLDER="mozjs-115.16.1"
+ # If same-version changes are needed, increment this.
+ LIB_VERSION="115.16.1+1"
+ LIB_NAME="mozjs115"
++TAR=${TAR:-tar}
--# Debug version of SM is broken on FreeBSD.
--if [ "$(uname -s)" != "FreeBSD" ]; then
-+# Debug version of SM is broken on OpenBSD.
-+if [ "$(uname -s)" != "OpenBSD" ]; then
- mkdir -p build-debug
- cd build-debug
- # SM configure checks for autoconf, but we don't actually need it.
-@@ -171,7 +171,7 @@ else
- STATIC_LIB_SUFFIX=.a
- if [ "`uname -s`" = "OpenBSD" ];
- then
-- LIB_SUFFIX=.so.1.0
-+ LIB_SUFFIX=.so.$SO_VERSION
- elif [ "`uname -s`" = "Darwin" ];
- then
- LIB_SUFFIX=.a
-@@ -197,7 +197,7 @@ fi
- mkdir -p "${INCLUDE_DIR_RELEASE}"
- cp -R -L "${FOLDER}"/build-release/dist/include/* "${INCLUDE_DIR_RELEASE}/"
+ fetch()
+ {
+@@ -47,7 +48,7 @@ fi
--if [ "$(uname -s)" != "FreeBSD" ]; then
-+if [ "$(uname -s)" != "OpenBSD" ]; then
- mkdir -p "${INCLUDE_DIR_DEBUG}"
- cp -R -L "${FOLDER}"/build-debug/dist/include/* "${INCLUDE_DIR_DEBUG}/"
+ # unpack
+ rm -Rf "${FOLDER}"
+-tar xfJ "${FOLDER}.tar.xz"
++$TAR xfJ "${FOLDER}.tar.xz"
+
+ # patch
+ (
+@@ -158,7 +159,7 @@ else
+ LIB_SUFFIX=.so
+ STATIC_LIB_SUFFIX=.a
+ if [ "${OS}" = "OpenBSD" ]; then
+- LIB_SUFFIX=.so.1.0
++ LIB_SUFFIX=.so.$SO_VERSION
+ elif [ "${OS}" = "Darwin" ]; then
+ LIB_SUFFIX=.a
+ fi
+@@ -188,7 +189,7 @@ fi
+ mkdir include-release
+ cp -R -L "${FOLDER}"/build-release/dist/include/* include-release/
+
+-if [ "${OS}" != "FreeBSD" ]; then
++if [ "${OS}" != "OpenBSD" ]; then
+ mkdir include-debug
+ cp -R -L "${FOLDER}"/build-debug/dist/include/* include-debug/
fi
-@@ -238,7 +238,7 @@ else
- # Copy shared libs to both lib/ and binaries/ 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}"
- cp -L
"${FOLDER}/build-${REL}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}"
"../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}"
-- if [ "$(uname -s)" != "FreeBSD" ]; then
-+ if [ "$(uname -s)" != "OpenBSD" ]; then
- cp -L
"${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}"
"../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}"
- cp -L
"${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}"
"lib/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}"
- fi
+@@ -220,7 +221,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}"
+- if [ "${OS}" != "FreeBSD" ]; then
++ if [ "${OS}" != "OpenBSD" ]; then
+ cp -L
"${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}"
"lib/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}"
+ fi
+ fi
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 157a92f0e63ef01a706a7cc47003ac5929607a48
file + games/0ad/base/pkg/PLIST
--- games/0ad/base/pkg/PLIST
+++ games/0ad/base/pkg/PLIST
@@ -1,18 +1,24 @@
bin/0ad
@bin bin/pyrogenesis
+@static-lib lib/libAtlasObject.a
+@so lib/libAtlasUI.so
@so lib/libCollada.so
@static-lib lib/libatlas.a
@static-lib lib/libengine.a
@static-lib lib/libgladwrapper.a
-@static-lib lib/libglooxwrapper.a
@static-lib lib/libgraphics.a
@static-lib lib/libgui.a
@static-lib lib/liblobby.a
@static-lib lib/liblowlevel.a
@static-lib lib/libmocks_real.a
@static-lib lib/libmongoose.a
-@lib lib/libmozjs78-ps-release.so.${LIBmozjs78-ps-release_VERSION}
+@lib lib/libmozjs115-release.so.${LIBmozjs115-release_VERSION}
+@static-lib lib/libmozjs115-rust.a
@static-lib lib/libnetwork.a
+@so lib/libnvcore.so
+@so lib/libnvimage.so
+@so lib/libnvmath.so
+@so lib/libnvtt.so
@static-lib lib/librlinterface.a
@static-lib lib/libscriptinterface.a
@static-lib lib/libsimulation2.a
@@ -20,8 +26,6 @@ bin/0ad
share/0ad/l10n/
share/0ad/l10n/.tx/
share/0ad/l10n/.tx/config
-share/0ad/l10n/ast.engine.po
-share/0ad/l10n/ca.engine.po
share/0ad/l10n/cs.engine.po
share/0ad/l10n/de.engine.po
share/0ad/l10n/el.engine.po
@@ -31,7 +35,7 @@ share/0ad/l10n/es.engine.po
share/0ad/l10n/eu.engine.po
share/0ad/l10n/fi.engine.po
share/0ad/l10n/fr.engine.po
-share/0ad/l10n/gd.engine.po
+share/0ad/l10n/gl.engine.po
share/0ad/l10n/hu.engine.po
share/0ad/l10n/id.engine.po
share/0ad/l10n/it.engine.po
@@ -39,6 +43,7 @@ share/0ad/l10n/messages.json
share/0ad/l10n/nl.engine.po
share/0ad/l10n/pl.engine.po
share/0ad/l10n/pt_BR.engine.po
+share/0ad/l10n/pt_PT.engine.po
share/0ad/l10n/ru.engine.po
share/0ad/l10n/sk.engine.po
share/0ad/l10n/sv.engine.po
@@ -73,8 +78,6 @@ share/0ad/mods/_test.gui/gui/regainFocus/pushWithPopOn
share/0ad/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.xml
share/0ad/mods/_test.minimal/
share/0ad/mods/_test.minimal/art/
-share/0ad/mods/_test.minimal/art/actors/
-share/0ad/mods/_test.minimal/art/meshes/
share/0ad/mods/_test.minimal/art/textures/
share/0ad/mods/_test.minimal/art/textures/particles/
share/0ad/mods/_test.minimal/art/textures/particles/sprite.tga
@@ -121,6 +124,10 @@ share/0ad/mods/_test.minimal/shaders/postouv1.vs
share/0ad/mods/_test.minimal/shaders/water_high.fs
share/0ad/mods/_test.minimal/shaders/water_high.vs
share/0ad/mods/_test.minimal/shaders/water_high.xml
+share/0ad/mods/_test.scriptinterface/
+share/0ad/mods/_test.scriptinterface/promises/
+share/0ad/mods/_test.scriptinterface/promises/reject.js
+share/0ad/mods/_test.scriptinterface/promises/simple.js
share/0ad/mods/_test.sim/
share/0ad/mods/_test.sim/globalscripts/
share/0ad/mods/_test.sim/globalscripts/test-global-helper.js
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - b24b60f108540c66c1021cbd0a5ef195c51122d7
file + games/0ad/data/Makefile
--- games/0ad/data/Makefile
+++ games/0ad/data/Makefile
@@ -1,6 +1,6 @@
COMMENT = historical real-time strategy game data
-DISTNAME = 0ad-${V}-alpha-unix-data
+DISTNAME = 0ad-${V}-unix-data
PKGNAME = 0ad-data-${V}
PKG_ARCH = *
@@ -11,6 +11,6 @@ EXTRACT_ONLY =
do-install:
tar -zxf ${FULLDISTDIR}/${DISTFILES} -C ${PREFIX}/share \
- -s ",0ad-${V}-alpha/binaries/data/,0ad/,g"
+ -s ",0ad-${V}/binaries/data/,0ad/,g"
.include <bsd.port.mk>
commit - bda08b2b6dce33b396a82f6383070ae4c6b9d1d1
blob - 13f053a7c9422c558f2d9a67a3d35bc9679ea03b
file + games/0ad/data/distinfo
--- games/0ad/data/distinfo
+++ games/0ad/data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.0.26-alpha-unix-data.tar.gz) =
P9HJAYQS7JNQLEsa2FFUAYRThNKiH9dosD8R0d28iCg=
-SIZE (0ad-0.0.26-alpha-unix-data.tar.gz) = 1708638040
+SHA256 (0ad-0.27.0-unix-data.tar.gz) =
fXCsKob3y2f/2MLZNMv82OVStmDxOtHrtEUacBkXiM0=
+SIZE (0ad-0.27.0-unix-data.tar.gz) = 1729474590
