Date: Wed, 11 Aug 2021 13:09:12 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a56fdac32bef - main - games/0ad: Update to Alpha 25 Message-ID: <202108111309.17BD9ChS077966@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a56fdac32befe5de5dac0ffae2b7b34ef9cab579 commit a56fdac32befe5de5dac0ffae2b7b34ef9cab579 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-08-11 13:08:19 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-08-11 13:08:19 +0000 games/0ad: Update to Alpha 25 --- games/0ad/Makefile | 7 +- games/0ad/distinfo | 10 +-- games/0ad/files/patch-D3590-FixRust150 | 85 ---------------------- games/0ad/files/patch-build_premake_premake5.lua | 22 +----- games/0ad/files/patch-source_lib_byte__order.h | 11 --- games/0ad/files/patch-source_lib_sysdep_arch.h | 18 ----- .../files/patch-source_ps_GameSetup_HWDetect.cpp | 10 --- ..._AtlasUI_CustomControls_MapDialog_MapDialog.cpp | 34 --------- ...atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp | 47 ------------ 9 files changed, 8 insertions(+), 236 deletions(-) diff --git a/games/0ad/Makefile b/games/0ad/Makefile index dead5c8bfa0a..65a4eac30492 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -1,6 +1,5 @@ PORTNAME= 0ad -PORTVERSION= 0.0.24b -PORTREVISION= 7 +PORTVERSION= 0.0.25 CATEGORIES= games MASTER_SITES= http://releases.wildfiregames.com/ \ SF/zero-ad/releases @@ -68,10 +67,6 @@ post-patch: -e '1441s/"execinfo",/& "ssp_nonshared",/' \ ${WRKSRC}/build/premake/premake5.lua .endif - @${REINPLACE_CMD} 's,^\(Exec=\)/usr/local,\1${PREFIX},' \ - ${WRKSRC}/build/resources/0ad.desktop - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ - ${WRKSRC}/build/resources/0ad.sh pre-build: (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) diff --git a/games/0ad/distinfo b/games/0ad/distinfo index d83ebf5c95f5..0fa299f7cf3d 100644 --- a/games/0ad/distinfo +++ b/games/0ad/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1614244045 -SHA256 (0ad-0.0.24b-alpha-unix-build.tar.xz) = 325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8 -SIZE (0ad-0.0.24b-alpha-unix-build.tar.xz) = 75546740 -SHA256 (0ad-0.0.24b-alpha-unix-data.tar.xz) = 41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c -SIZE (0ad-0.0.24b-alpha-unix-data.tar.xz) = 828553992 +TIMESTAMP = 1628578878 +SHA256 (0ad-0.0.25-alpha-unix-build.tar.xz) = 592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f +SIZE (0ad-0.0.25-alpha-unix-build.tar.xz) = 75788348 +SHA256 (0ad-0.0.25-alpha-unix-data.tar.xz) = 97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5 +SIZE (0ad-0.0.25-alpha-unix-data.tar.xz) = 1272283892 diff --git a/games/0ad/files/patch-D3590-FixRust150 b/games/0ad/files/patch-D3590-FixRust150 deleted file mode 100644 index 5db0d03a301c..000000000000 --- a/games/0ad/files/patch-D3590-FixRust150 +++ /dev/null @@ -1,85 +0,0 @@ -Index: libraries/source/spidermonkey/FixRust150.diff -=================================================================== ---- /dev/null -+++ libraries/source/spidermonkey/FixRust150.diff -@@ -0,0 +1,65 @@ -+ -+# HG changeset patch -+# User Emilio Cobos Álvarez <emilio@crisal.io> -+# Date 1609006565 0 -+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582 -+# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0 -+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM -+ -+Fixes errors like: -+ -+ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. -+ -+I've left the most specific dependency, but for wgpu the rev is not -+right, so I've kept the branch which effectively preserves behavior. -+ -+Differential Revision: https://phabricator.services.mozilla.com/D100485 -+ -+diff --git a/.cargo/config.in b/.cargo/config.in -+--- a/.cargo/config.in -++++ b/.cargo/config.in -+@@ -1,16 +1,16 @@ -+ # This file contains vendoring instructions for cargo. -+ # It was generated by `mach vendor rust`. -+ # Please do not edit. -+ -+ [source."https://github.com/shravanrn/nix/"] -+-branch = "r0.13.1" -+ git = "https://github.com/shravanrn/nix/" -+ replace-with = "vendored-sources" -++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" -+ -+ [source."https://github.com/mozilla/rkv"] -+ git = "https://github.com/mozilla/rkv" -+ replace-with = "vendored-sources" -+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731" -+ -+ [source."https://github.com/mozilla/neqo"] -+ git = "https://github.com/mozilla/neqo" -+diff --git a/Cargo.lock b/Cargo.lock -+--- a/Cargo.lock -++++ b/Cargo.lock -+@@ -3200,7 +3200,7 @@ -+ [[package]] -+ name = "nix" -+ version = "0.13.1" -+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" -++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" -+ dependencies = [ -+ "bitflags", -+ "cc", -+diff --git a/Cargo.toml b/Cargo.toml -+--- a/Cargo.toml -++++ b/Cargo.toml -+@@ -60,8 +60,8 @@ -+ [patch.crates-io] -+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } -+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } -+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } -+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } -++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } -++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } -+ # failure's backtrace feature might break our builds, see bug 1608157. -+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } -+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } -+ -Index: libraries/source/spidermonkey/patch.sh -=================================================================== ---- libraries/source/spidermonkey/patch.sh -+++ libraries/source/spidermonkey/patch.sh -@@ -39,6 +39,10 @@ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 - patch -p1 < ../FixRpiUnalignedFpAccess.diff - -+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb -+# Note that this isn't quite the upstream patch to match our version. -+patch -p1 < ../FixRust150.diff -+ - # Patch those separately, as they might interfere with normal behaviour. - if [ "$(uname -s)" = "FreeBSD" ]; - then diff --git a/games/0ad/files/patch-build_premake_premake5.lua b/games/0ad/files/patch-build_premake_premake5.lua index 44ba5e2f0eb4..2d771dbba940 100644 --- a/games/0ad/files/patch-build_premake_premake5.lua +++ b/games/0ad/files/patch-build_premake_premake5.lua @@ -1,15 +1,6 @@ ---- build/premake/premake5.lua.orig 2021-02-28 23:45:14 UTC +--- build/premake/premake5.lua.orig 2021-07-27 21:57:08 UTC +++ build/premake/premake5.lua -@@ -87,6 +87,8 @@ else - arch = "aarch64" - elseif string.find(machine, "e2k") == 1 then - arch = "e2k" -+ elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then -+ arch = "ppc64" - else - print("WARNING: Cannot determine architecture from GCC, assuming x86") - end -@@ -365,7 +365,7 @@ function project_set_build_flags() +@@ -367,7 +367,7 @@ function project_set_build_flags() if os.istarget("linux") or os.istarget("bsd") then if _OPTIONS["prefer-local-libs"] then @@ -18,12 +9,3 @@ end -- To use our local shared libraries, they need to be found in the -@@ -865,6 +867,8 @@ function setup_all_libs () - table.insert(source_dirs, "lib/sysdep/arch/aarch64"); - elseif arch == "e2k" then - table.insert(source_dirs, "lib/sysdep/arch/e2k"); -+ elseif arch == "ppc64" then -+ table.insert(source_dirs, "lib/sysdep/arch/ppc64"); - end - - -- OS-specific diff --git a/games/0ad/files/patch-source_lib_byte__order.h b/games/0ad/files/patch-source_lib_byte__order.h deleted file mode 100644 index e958977b3e36..000000000000 --- a/games/0ad/files/patch-source_lib_byte__order.h +++ /dev/null @@ -1,11 +0,0 @@ ---- source/lib/byte_order.h.orig 2021-02-28 23:45:13 UTC -+++ source/lib/byte_order.h -@@ -33,7 +33,7 @@ - #ifndef BYTE_ORDER - # define LITTLE_ENDIAN 0x4321 - # define BIG_ENDIAN 0x1234 --# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__) -+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__) - # define BYTE_ORDER LITTLE_ENDIAN - # else - # define BYTE_ORDER BIG_ENDIAN diff --git a/games/0ad/files/patch-source_lib_sysdep_arch.h b/games/0ad/files/patch-source_lib_sysdep_arch.h deleted file mode 100644 index 06a36ba819a0..000000000000 --- a/games/0ad/files/patch-source_lib_sysdep_arch.h +++ /dev/null @@ -1,18 +0,0 @@ ---- source/lib/sysdep/arch.h.orig 2021-02-28 23:45:13 UTC -+++ source/lib/sysdep/arch.h -@@ -76,9 +76,14 @@ - #else - # define ARCH_E2K 0 - #endif -+#if defined(__PPC64__) -+# define ARCH_PPC64 1 -+#else -+# define ARCH_PPC64 0 -+#endif - - // ensure exactly one architecture has been detected --#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1 -+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1 - # error "architecture not correctly detected (either none or multiple ARCH_* defined)" - #endif - diff --git a/games/0ad/files/patch-source_ps_GameSetup_HWDetect.cpp b/games/0ad/files/patch-source_ps_GameSetup_HWDetect.cpp deleted file mode 100644 index 298e09b23966..000000000000 --- a/games/0ad/files/patch-source_ps_GameSetup_HWDetect.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- source/ps/GameSetup/HWDetect.cpp.orig 2021-02-28 23:45:13 UTC -+++ source/ps/GameSetup/HWDetect.cpp -@@ -124,6 +124,7 @@ void RunHardwareDetection() - scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM); - scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64); - scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K); -+ scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64); - - #ifdef NDEBUG - scriptInterface.SetProperty(settings, "build_debug", 0); diff --git a/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp b/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp deleted file mode 100644 index be5ea675d3b6..000000000000 --- a/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp.orig 2020-12-07 06:38:29 UTC -+++ source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp -@@ -166,11 +166,11 @@ void MapDialog::OnListBox(wxCommandEvent& evt) - else - { - wxString filePath = GetSelectedFilePath(); -- AtlasMessage::qVFSFileExists fileExistsQuery(filePath.wc_str()); -+ AtlasMessage::qVFSFileExists fileExistsQuery(filePath.ToStdWstring()); - fileExistsQuery.Post(); - if (!filePath.IsEmpty() && fileExistsQuery.exists) - { -- AtlasMessage::qVFSFileRealPath pathQuery(filePath.wc_str()); -+ AtlasMessage::qVFSFileRealPath pathQuery(filePath.ToStdWstring()); - pathQuery.Post(); - wxDynamicCast(FindWindow(ID_MapDialogFilename), wxTextCtrl)->ChangeValue(*pathQuery.realPath); - } -@@ -221,7 +221,7 @@ void MapDialog::OpenFile() - if (filePath.empty()) - return; - -- AtlasMessage::qVFSFileExists qry(filePath.wc_str()); -+ AtlasMessage::qVFSFileExists qry(filePath.ToStdWstring()); - qry.Post(); - if (!qry.exists) - return; -@@ -236,7 +236,7 @@ void MapDialog::SaveFile() - return; - - // TODO: this test would work better outside the VFS -- AtlasMessage::qVFSFileExists qry(filePath.wc_str()); -+ AtlasMessage::qVFSFileExists qry(filePath.ToStdWstring()); - qry.Post(); - if (qry.exists) - { diff --git a/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp b/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp deleted file mode 100644 index f4a472dce5d3..000000000000 --- a/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp.orig 2020-12-07 06:38:29 UTC -+++ source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp -@@ -719,7 +719,7 @@ bool ScenarioEditor::OpenFile(const wxString& name, co - wxBusyInfo busy(_("Loading ") + name); - wxBusyCursor busyc; - -- AtlasMessage::qVFSFileExists qry(filename.wc_str()); -+ AtlasMessage::qVFSFileExists qry(filename.ToStdWstring()); - qry.Post(); - if (!qry.exists) - return false; -@@ -729,7 +729,7 @@ bool ScenarioEditor::OpenFile(const wxString& name, co - m_ToolManager.SetCurrentTool(_T("")); - // TODO: clear the undo buffer, etc - -- std::wstring map(filename.wc_str()); -+ std::wstring map(filename.ToStdWstring()); - POST_MESSAGE(LoadMap, (map)); - - SetOpenFilename(name); -@@ -782,7 +782,7 @@ void ScenarioEditor::OnImportHeightmap(wxCommandEvent& - - OpenFile(_T(""), _T("maps/scenarios/_default.xml")); - -- std::wstring image(dlg.GetPath().wc_str()); -+ std::wstring image(dlg.GetPath().ToStdWstring()); - POST_MESSAGE(ImportHeightmap, (image)); - - // TODO: Make this a non-undoable command -@@ -826,7 +826,7 @@ void ScenarioEditor::OnSave(wxCommandEvent& event) - // the preview units.) - m_ToolManager.SetCurrentTool(_T("")); - -- std::wstring map(m_OpenFilename.wc_str()); -+ std::wstring map(m_OpenFilename.ToStdWstring()); - POST_MESSAGE(SaveMap, (map)); - - // Wait for it to finish saving -@@ -848,7 +848,7 @@ void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED - - m_ToolManager.SetCurrentTool(_T("")); - -- std::wstring map(filePath.wc_str()); -+ std::wstring map(filePath.ToStdWstring()); - POST_MESSAGE(SaveMap, (map)); - - SetOpenFilename(filePath);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108111309.17BD9ChS077966>