Date: Sun, 28 Feb 2021 21:33:39 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566819 - in head/games/0ad: . files Message-ID: <202102282133.11SLXdpB025932@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Feb 28 21:33:38 2021 New Revision: 566819 URL: https://svnweb.freebsd.org/changeset/ports/566819 Log: - Update 0ad to Alpha 24 - Undeprecate, this version works fine with python3 - Mark BROKEN on 11.x due to errors linking against gloox on this OS version - While here move the other BROKEN messages in the appropriate Makefile stanza - Remove patches integrated upstream Many thanks to upstream developers for help and support. Added: head/games/0ad/files/patch-D3590-FixRust150 (contents, props changed) Deleted: head/games/0ad/files/patch-icu68 head/games/0ad/files/patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp head/games/0ad/files/patch-libraries_source_fcollada_src_Makefile head/games/0ad/files/patch-libraries_source_spidermonkey_FixpsutilFreeBSD.diff head/games/0ad/files/patch-libraries_source_spidermonkey_build.sh head/games/0ad/files/patch-source_tools_atlas_AtlasObject_AtlasObjectImpl.cpp Modified: head/games/0ad/Makefile head/games/0ad/distinfo head/games/0ad/files/patch-build_premake_extern__libs5.lua head/games/0ad/files/patch-build_premake_premake5.lua head/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp head/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp head/games/0ad/pkg-plist Modified: head/games/0ad/Makefile ============================================================================== --- head/games/0ad/Makefile Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/Makefile Sun Feb 28 21:33:38 2021 (r566819) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= 0ad -PORTVERSION= 0.0.23b -PORTREVISION= 12 +PORTVERSION= 0.0.24b CATEGORIES= games MASTER_SITES= http://releases.wildfiregames.com/ \ SF/zero-ad/releases @@ -12,10 +11,14 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build MAINTAINER= madpilot@FreeBSD.org COMMENT= Real-time strategy (RTS) game of ancient warfare -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-12-31 +BROKEN_FreeBSD_11= fails to link: undefined reference to gloox::Client::Client(...) +BROKEN_aarch64= fails to compile: no member named verifyHeapAccessDisassembly +BROKEN_armv6= fails to link: fatal error: conftest: Unknown error: -1 +BROKEN_armv7= fails to link: fatal error: conftest: Unknown error: -1 +BROKEN_powerpc64= fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no member named 'xt_tp' -BUILD_DEPENDS= zip:archivers/zip \ +BUILD_DEPENDS= ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ + zip:archivers/zip \ cmake:devel/cmake LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ @@ -28,10 +31,11 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libnspr4.so:devel/nspr \ libenet.so:net/enet \ libtiff.so:graphics/tiff \ - libsodium.so:security/libsodium + libsodium.so:security/libsodium \ + libfmt.so:devel/libfmt USES= compiler:c++11-lib desktop-file-utils dos2unix gl gmake gnome \ - iconv jpeg openal:al pkgconfig python:2.7,build sdl tar:xz xorg + iconv jpeg openal:al pkgconfig python:build sdl tar:xz xorg USE_GNOME= libxml2 USE_GL= gl USE_SDL= sdl2 @@ -41,19 +45,15 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release verbose=1 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 +CFLAGS+= -msse2 BUNDLE_LIBS= yes DOS2UNIX_REGEX= .*\.([ch]p{0,2}|make) -BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS= python3=${PYTHON_CMD} USE_WX= 3.0+ WX_COMPS= wx:lib MAKE_ENV+= JOBS=${_MAKE_JOBS} -BROKEN_aarch64= fails to compile: no member named verifyHeapAccessDisassembly -BROKEN_armv6= fails to link: fatal error: conftest: Unknown error: -1 -BROKEN_armv7= fails to link: fatal error: conftest: Unknown error: -1 -BROKEN_powerpc64= fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no member named 'xt_tp' - PORTDATA= * .include <bsd.port.pre.mk> @@ -80,7 +80,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libmozjs38-ps-release.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libmozjs78-ps-release.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/0ad/distinfo ============================================================================== --- head/games/0ad/distinfo Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/distinfo Sun Feb 28 21:33:38 2021 (r566819) @@ -1,5 +1,5 @@ -TIMESTAMP = 1545588170 -SHA256 (0ad-0.0.23b-alpha-unix-build.tar.xz) = 01bff7641ee08cac896c54d518d7e4b01752513105558f212e3199d747512a37 -SIZE (0ad-0.0.23b-alpha-unix-build.tar.xz) = 31922812 -SHA256 (0ad-0.0.23b-alpha-unix-data.tar.xz) = e11b4ade7ede954cbbdc1fe6e2e4b25ac6b8d5a644133b640ffc9b099338a713 -SIZE (0ad-0.0.23b-alpha-unix-data.tar.xz) = 691280800 +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 Added: head/games/0ad/files/patch-D3590-FixRust150 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/0ad/files/patch-D3590-FixRust150 Sun Feb 28 21:33:38 2021 (r566819) @@ -0,0 +1,85 @@ +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 Modified: head/games/0ad/files/patch-build_premake_extern__libs5.lua ============================================================================== --- head/games/0ad/files/patch-build_premake_extern__libs5.lua Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/files/patch-build_premake_extern__libs5.lua Sun Feb 28 21:33:38 2021 (r566819) @@ -1,21 +1,11 @@ ---- build/premake/extern_libs5.lua.orig 2018-04-29 15:44:48 UTC +--- build/premake/extern_libs5.lua.orig 2021-02-06 00:32:37 UTC +++ build/premake/extern_libs5.lua -@@ -191,7 +191,7 @@ extern_lib_defs = { +@@ -193,7 +193,7 @@ extern_lib_defs = { end -- TODO: This actually applies to most libraries we use on BSDs, make this a global setting. if os.istarget("bsd") then - sysincludedirs { "/usr/local/include" } + sysincludedirs { "%%LOCALBASE%%/include" } - end - end, - link_settings = function() -@@ -301,9 +301,6 @@ extern_lib_defs = { - elseif os.istarget("macosx") then - add_default_include_paths("iconv") - defines { "LIBICONV_STATIC" } -- elseif os.getversion().description == "FreeBSD" then -- defines { "HAVE_ICONV_CONST" } -- defines { "ICONV_CONST=const" } end end, link_settings = function() Modified: head/games/0ad/files/patch-build_premake_premake5.lua ============================================================================== --- head/games/0ad/files/patch-build_premake_premake5.lua Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/files/patch-build_premake_premake5.lua Sun Feb 28 21:33:38 2021 (r566819) @@ -1,17 +1,11 @@ ---- build/premake/premake5.lua.orig 2018-04-22 18:14:45 UTC +--- build/premake/premake5.lua.orig 2021-02-06 00:32:37 UTC +++ build/premake/premake5.lua -@@ -376,11 +376,11 @@ function project_add_x11_dirs() - sysincludedirs { - "/usr/X11R6/include/X11", - "/usr/X11R6/include", -- "/usr/local/include/X11", -- "/usr/local/include", -+ "%%LOCALBASE%%/include/X11", -+ "%%LOCALBASE%%/include", - "/usr/include/X11" - } -- libdirs { "/usr/X11R6/lib" } -+ libdirs { "%%LOCALBASE%%/lib" } - end - end +@@ -365,7 +365,7 @@ function project_set_build_flags() + if os.istarget("linux") or os.istarget("bsd") then + if _OPTIONS["prefer-local-libs"] then +- libdirs { "/usr/local/lib" } ++ libdirs { "%%LOCALBASE%%/lib" } + end + + -- To use our local shared libraries, they need to be found in the Modified: head/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp ============================================================================== --- head/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/files/patch-source_tools_atlas_AtlasUI_CustomControls_MapDialog_MapDialog.cpp Sun Feb 28 21:33:38 2021 (r566819) @@ -1,18 +1,18 @@ ---- source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp.orig 2018-03-13 20:26:30 UTC +--- 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 qry(filePath.wc_str()); -+ AtlasMessage::qVFSFileExists qry(filePath.ToStdWstring()); - qry.Post(); - if (!filePath.IsEmpty() && qry.exists) +- AtlasMessage::qVFSFileExists fileExistsQuery(filePath.wc_str()); ++ AtlasMessage::qVFSFileExists fileExistsQuery(filePath.ToStdWstring()); + fileExistsQuery.Post(); + if (!filePath.IsEmpty() && fileExistsQuery.exists) { -- AtlasMessage::qVFSFileRealPath qry(filePath.wc_str()); -+ AtlasMessage::qVFSFileRealPath qry(filePath.ToStdWstring()); - qry.Post(); - wxDynamicCast(FindWindow(ID_MapDialogFilename), wxTextCtrl)->ChangeValue(*qry.realPath); +- 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()) Modified: head/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp ============================================================================== --- head/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/files/patch-source_tools_atlas_AtlasUI_ScenarioEditor_ScenarioEditor.cpp Sun Feb 28 21:33:38 2021 (r566819) @@ -1,6 +1,6 @@ ---- source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp.orig 2018-03-13 20:20:45 UTC +--- source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp.orig 2020-12-07 06:38:29 UTC +++ source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp -@@ -723,7 +723,7 @@ bool ScenarioEditor::OpenFile(const wxString& name, co +@@ -719,7 +719,7 @@ bool ScenarioEditor::OpenFile(const wxString& name, co wxBusyInfo busy(_("Loading ") + name); wxBusyCursor busyc; @@ -9,7 +9,7 @@ qry.Post(); if (!qry.exists) return false; -@@ -733,7 +733,7 @@ bool ScenarioEditor::OpenFile(const wxString& name, co +@@ -729,7 +729,7 @@ bool ScenarioEditor::OpenFile(const wxString& name, co m_ToolManager.SetCurrentTool(_T("")); // TODO: clear the undo buffer, etc @@ -18,7 +18,7 @@ POST_MESSAGE(LoadMap, (map)); SetOpenFilename(name); -@@ -786,7 +786,7 @@ void ScenarioEditor::OnImportHeightmap(wxCommandEvent& +@@ -782,7 +782,7 @@ void ScenarioEditor::OnImportHeightmap(wxCommandEvent& OpenFile(_T(""), _T("maps/scenarios/_default.xml")); @@ -27,7 +27,7 @@ POST_MESSAGE(ImportHeightmap, (image)); // TODO: Make this a non-undoable command -@@ -830,7 +830,7 @@ void ScenarioEditor::OnSave(wxCommandEvent& event) +@@ -826,7 +826,7 @@ void ScenarioEditor::OnSave(wxCommandEvent& event) // the preview units.) m_ToolManager.SetCurrentTool(_T("")); @@ -36,7 +36,7 @@ POST_MESSAGE(SaveMap, (map)); // Wait for it to finish saving -@@ -852,7 +852,7 @@ void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED +@@ -848,7 +848,7 @@ void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED m_ToolManager.SetCurrentTool(_T("")); @@ -45,12 +45,3 @@ POST_MESSAGE(SaveMap, (map)); SetOpenFilename(filePath); -@@ -920,7 +920,7 @@ void ScenarioEditor::OnJavaScript(wxCommandEvent& WXUN - wxString cmd = ::wxGetTextFromUser(_T(""), _("JS command"), _T(""), this); - if (cmd.IsEmpty()) - return; -- POST_MESSAGE(JavaScript, ((std::wstring)cmd.wc_str())); -+ POST_MESSAGE(JavaScript, ((std::wstring)cmd.ToStdWstring())); - } - - void ScenarioEditor::OnCameraReset(wxCommandEvent& WXUNUSED(event)) Modified: head/games/0ad/pkg-plist ============================================================================== --- head/games/0ad/pkg-plist Sun Feb 28 21:31:09 2021 (r566818) +++ head/games/0ad/pkg-plist Sun Feb 28 21:33:38 2021 (r566819) @@ -3,7 +3,7 @@ bin/0ad bin/ActorEditor lib/0ad/libAtlasUI.so lib/0ad/libCollada.so -lib/0ad/libmozjs38-ps-release.so +lib/0ad/libmozjs78-ps-release.so lib/0ad/libnvcore.so lib/0ad/libnvimage.so lib/0ad/libnvmath.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102282133.11SLXdpB025932>