pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
0ad, 0ad-data: update, failing (presumably failing before)
Module Name: pkgsrc-wip
Committed By: nikita <nikita%NetBSD.org@localhost>
Pushed By: nikita
Date: Wed May 3 20:52:40 2023 +0200
Changeset: a0d24a6a09a42cabe1f6198d8a0c6b99e54575b4
Modified Files:
0ad-data/distinfo
0ad/Makefile
0ad/Makefile.common
0ad/distinfo
0ad/patches/patch-build_workspaces_clean-workspaces.sh
Added Files:
0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
0ad/patches/patch-libraries_source_spidermonkey_build.sh
0ad/patches/patch-source_lib_allocators_page__aligned.cpp
0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp
Log Message:
0ad, 0ad-data: update, failing (presumably failing before)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a0d24a6a09a42cabe1f6198d8a0c6b99e54575b4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
0ad-data/distinfo | 7 +++----
0ad/Makefile | 8 ++++++++
0ad/Makefile.common | 2 +-
0ad/distinfo | 13 ++++++++-----
.../patch-build_workspaces_clean-workspaces.sh | 11 ++++++-----
...ch-libraries_source_nvtt_src_src_nvcore_Debug.cpp | 12 ++++++++++++
.../patch-libraries_source_spidermonkey_build.sh | 20 ++++++++++++++++++++
.../patch-source_lib_allocators_page__aligned.cpp | 20 ++++++++++++++++++++
0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp | 20 ++++++++++++++++++++
9 files changed, 98 insertions(+), 15 deletions(-)
diffs:
diff --git a/0ad-data/distinfo b/0ad-data/distinfo
index 8a0bac12e6..f01bd4ee2d 100644
--- a/0ad-data/distinfo
+++ b/0ad-data/distinfo
@@ -1,6 +1,5 @@
$NetBSD$
-SHA1 (0ad-0.0.25b-alpha-unix-data.tar.xz) = c56cc4b51f13323521318204aa69dd1cb5dd010f
-RMD160 (0ad-0.0.25b-alpha-unix-data.tar.xz) = ae04e2c7d0c3e6ca4607b244608f2329c202e12b
-SHA512 (0ad-0.0.25b-alpha-unix-data.tar.xz) = d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1
-Size (0ad-0.0.25b-alpha-unix-data.tar.xz) = 1249684600 bytes
+BLAKE2s (0ad-0.0.26-alpha-unix-data.tar.xz) = ff2ad01dfdb3bfbd5f4f3f38301930e18a572e86aafe2239a083e5a9c3f29cac
+SHA512 (0ad-0.0.26-alpha-unix-data.tar.xz) = 8fe29fce68737d5b7001c8c2a7198766583b22556129cd2d927823da9b2c58f224fb1207f35bd03abea9380cf24d00ab6257b0dba86ce3ad1f357d7006f051d6
+Size (0ad-0.0.26-alpha-unix-data.tar.xz) = 1351511480 bytes
diff --git a/0ad/Makefile b/0ad/Makefile
index 4d8e5ee27f..c3d30c4724 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -19,6 +19,13 @@ USE_TOOLS+= gmake perl bash pkg-config
DEPENDS+= 0ad-data-${PKGVERSION}:../../wip/0ad-data
DEPENDS+= premake5-[0-9]*:../../devel/premake5
+SUBST_CLASSES+= sysincludedir
+SUBST_MESSAGE.sysincludedir= Fixing "/usr/local" path assumption
+SUBST_STAGE.sysincludedir= pre-configure
+SUBST_FILES.sysincludedir= build/premake/extern_libs5.lua
+SUBST_FILES.sysincludedir= build/premake/premake5.lua
+SUBST_SED.sysincludedir+= -e "s,/usr/local/,${PREFIX},g"
+
do-configure:
${RUN} cd ${WRKSRC}/build/workspaces && ./clean-workspaces.sh
${RUN} cd ${WRKSRC}/build/workspaces && ./update-workspaces.sh \
@@ -48,6 +55,7 @@ do-build:
.include "../../graphics/nvidia-texture-tools/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../lang/mozjs78/buildlink3.mk"
+.include "../../lang/rust/rust.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../net/enet/buildlink3.mk"
.include "../../net/miniupnpc/buildlink3.mk"
diff --git a/0ad/Makefile.common b/0ad/Makefile.common
index 8f3a58676e..8e87c3d593 100644
--- a/0ad/Makefile.common
+++ b/0ad/Makefile.common
@@ -1,7 +1,7 @@
# $NetBSD$
# used by wip/0ad-data/Makefile
-DISTVERSION= 0ad-0.0.25b-alpha-unix
+DISTVERSION= 0ad-0.0.26-alpha-unix
CATEGORIES= games
MASTER_SITES= http://releases.wildfiregames.com/
EXTRACT_SUFX= .tar.xz
diff --git a/0ad/distinfo b/0ad/distinfo
index b05ca02ece..5a173dfbcd 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -1,11 +1,10 @@
$NetBSD$
-SHA1 (0ad-0.0.25b-alpha-unix-build.tar.xz) = 130444c15e29c7fa1333b8719ae7c7da36741a26
-RMD160 (0ad-0.0.25b-alpha-unix-build.tar.xz) = 295ad0f386df10cc95cee7dea889ccd43224dd1e
-SHA512 (0ad-0.0.25b-alpha-unix-build.tar.xz) = e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
-Size (0ad-0.0.25b-alpha-unix-build.tar.xz) = 75579956 bytes
+BLAKE2s (0ad-0.0.26-alpha-unix-build.tar.xz) = c731d26db0269bc9de34bf75705eb2031a105b676217a1da916c79c2d2237015
+SHA512 (0ad-0.0.26-alpha-unix-build.tar.xz) = aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272
+Size (0ad-0.0.26-alpha-unix-build.tar.xz) = 75599800 bytes
SHA1 (patch-build_premake_extern__libs5.lua) = e3d804571682c04cada5c39c11313874039ead72
-SHA1 (patch-build_workspaces_clean-workspaces.sh) = fed7e867eb8e24e37860599269f9feb4d30c5a43
+SHA1 (patch-build_workspaces_clean-workspaces.sh) = 6c48565a0463d6f9e3ab914e2923811b121935cc
SHA1 (patch-build_workspaces_update-workspaces.sh) = 4a6ec008da64a98230173f3a242cea2503321631
SHA1 (patch-libraries_source_fcollada_include_FCDocument_FCDocument.h) = 96aef76c02ae4a3f47fdb7c31bf7d11490ba5d09
SHA1 (patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h) = 956ba6c19b0f3ea2a35f686bf1825efc07169b89
@@ -14,8 +13,12 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FCDocument_FCDocument.h) = ae
SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUCriticalSection.h) = fd181f746bba33ceb917a5de4794296c229213fc
SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) = f71f1f361601b2ce561c00a811d33bce6735a06d
SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
+SHA1 (patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp) = b5025ca19e462e3f3c36df167036e68d6bd28cb9
+SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92
SHA1 (patch-source_graphics_TextureConverter.cpp) = d4e3920cd507468adc37dc92e27e6cbb50b5c5e2
+SHA1 (patch-source_lib_allocators_page__aligned.cpp) = 72e04d6f1419fc464e238150c438286bef47f227
SHA1 (patch-source_lib_secure__crt.cpp) = 1e56aa627c8f2343884968ab4ebd4b4eec73b777
+SHA1 (patch-source_lib_sysdep_os_unix_uvm.cpp) = bc7cfbde200f700e19cdee999f58d2f36a41fe76
SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
diff --git a/0ad/patches/patch-build_workspaces_clean-workspaces.sh b/0ad/patches/patch-build_workspaces_clean-workspaces.sh
index e43c052a7b..3fb9d7668d 100644
--- a/0ad/patches/patch-build_workspaces_clean-workspaces.sh
+++ b/0ad/patches/patch-build_workspaces_clean-workspaces.sh
@@ -1,7 +1,8 @@
$NetBSD$
---- build/workspaces/clean-workspaces.sh.orig 2015-08-19 01:30:09.000000000 +0000
-+++ build/workspaces/clean-workspaces.sh
+
+--- -build/workspaces/clean-workspaces.sh.orig 2022-08-21 14:46:47.000000000 +0200
++++ build/workspaces/clean-workspaces.sh 2023-05-03 20:01:25.557929713 +0200
@@ -3,7 +3,7 @@
# Some of our makefiles depend on GNU make, so we set some sane defaults if MAKE
# is not set.
@@ -11,10 +12,10 @@ $NetBSD$
MAKE=${MAKE:="gmake"}
;;
* )
-@@ -37,7 +37,7 @@ fi
-
- echo "Removing generated test files..."
+@@ -64,7 +64,7 @@
+ echo "Removing generated stub and test files..."
+ find ../../source -name "stub_*.cpp" -type f -exec rm {} \;
-find ../../source -name "test_*.cpp" -type f -not -name "test_setup.cpp" -exec rm {} \;
+find ../../source -name "test_*.cpp" -type f ! -name "test_setup.cpp" -exec rm {} \;
diff --git a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp b/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
new file mode 100644
index 0000000000..dd627b8a3a
--- /dev/null
+++ b/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
@@ -0,0 +1,12 @@
+--- libraries/source/nvtt/src/src/nvcore/Debug.cpp.orig 2021-02-28 23:45:14 UTC
++++ libraries/source/nvtt/src/src/nvcore/Debug.cpp
+@@ -628,6 +628,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/0ad/patches/patch-libraries_source_spidermonkey_build.sh b/0ad/patches/patch-libraries_source_spidermonkey_build.sh
new file mode 100644
index 0000000000..da2280f601
--- /dev/null
+++ b/0ad/patches/patch-libraries_source_spidermonkey_build.sh
@@ -0,0 +1,20 @@
+$NetBSD$
+
+
+--- libraries/source/spidermonkey/build.sh.orig 2023-05-03 20:04:57.672955809 +0200
++++ libraries/source/spidermonkey/build.sh 2023-05-03 20:06:29.174827445 +0200
+@@ -51,12 +51,12 @@
+ then
+ ARCH=${ARCH:=""}
+ if [ -z "${ARCH}" ]; then
+- if [ "`uname -m`" == "arm64" ]; then
++ if [ "`uname -m`" = "arm64" ]; then
+ ARCH="aarch64"
+ else
+ ARCH="x86_64"
+ fi
+- elif [ $ARCH == "arm64" ]; then
++ elif [ $ARCH = "arm64" ]; then
+ # SM78 doesn't know about arm64 yet, and that's passed by build-osx-libs.sh, so fix it explicitly.
+ ARCH="aarch64"
+ fi
diff --git a/0ad/patches/patch-source_lib_allocators_page__aligned.cpp b/0ad/patches/patch-source_lib_allocators_page__aligned.cpp
new file mode 100644
index 0000000000..87d3081a43
--- /dev/null
+++ b/0ad/patches/patch-source_lib_allocators_page__aligned.cpp
@@ -0,0 +1,20 @@
+--- source/lib/allocators/page_aligned.cpp.orig 2017-07-28 19:57:26 UTC
++++ source/lib/allocators/page_aligned.cpp
+@@ -49,7 +49,7 @@ static const int mmap_flags = MAP_PRIVATE|MAP_ANONYMOU
+ Status mem_Reserve(size_t size, u8** pp)
+ {
+ errno = 0;
+- void* ret = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0);
++ void* ret = mmap(0, size, PROT_NONE, mmap_flags, -1, 0);
+ *pp = (u8*)ret;
+ return StatusFromMap(ret);
+ }
+@@ -76,7 +76,7 @@ Status mem_Commit(u8* p, size_t size, int prot)
+ Status mem_Decommit(u8* p, size_t size)
+ {
+ errno = 0;
+- void* ret = mmap(p, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0);
++ void* ret = mmap(p, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0);
+ return StatusFromMap(ret);
+ }
+
diff --git a/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp b/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp
new file mode 100644
index 0000000000..09152b8501
--- /dev/null
+++ b/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp
@@ -0,0 +1,20 @@
+--- source/lib/sysdep/os/unix/uvm.cpp.orig 2017-07-28 19:57:26 UTC
++++ source/lib/sysdep/os/unix/uvm.cpp
+@@ -40,7 +40,7 @@ namespace vm {
+ void* ReserveAddressSpace(size_t size, size_t UNUSED(commitSize), PageType UNUSED(pageType), int UNUSED(prot))
+ {
+ errno = 0;
+- void* p = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0);
++ void* p = mmap(0, size, PROT_NONE, mmap_flags, -1, 0);
+ if(p == MAP_FAILED)
+ return 0;
+ return p;
+@@ -77,7 +77,7 @@ bool Commit(uintptr_t address, size_t size, PageType U
+ bool Decommit(uintptr_t address, size_t size)
+ {
+ errno = 0;
+- if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0) == MAP_FAILED)
++ if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0) == MAP_FAILED)
+ return false;
+ return true;
+ }
Home |
Main Index |
Thread Index |
Old Index