commit: a20d1767d9139b4bd9e8475b361694aa13060d6f Author: Ralph Sennhauser <ralph.sennhauser <AT> gmail <DOT> com> AuthorDate: Sun Mar 1 16:09:24 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 1 18:34:42 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20d1767
games-strategy/0ad-0.28.0-r1: Fix USE=-lobby Upstream pr https://gitea.wildfiregames.com/0ad/0ad/pulls/8772 Closes: https://bugs.gentoo.org/970657 Signed-off-by: Ralph Sennhauser <ralph.sennhauser <AT> gmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/189 Merges: https://codeberg.org/gentoo/gentoo/pulls/189 Signed-off-by: Sam James <sam <AT> gentoo.org> games-strategy/0ad/0ad-0.28.0-r1.ebuild | 230 +++++++++++++++++++++ .../0ad-0.28.0-Allow-building-without-lobby.patch | 74 +++++++ 2 files changed, 304 insertions(+) diff --git a/games-strategy/0ad/0ad-0.28.0-r1.ebuild b/games-strategy/0ad/0ad-0.28.0-r1.ebuild new file mode 100644 index 000000000000..9fa483d5d8bd --- /dev/null +++ b/games-strategy/0ad/0ad-0.28.0-r1.ebuild @@ -0,0 +1,230 @@ +# Copyright 2014-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{12,13,14} ) +WX_GTK_VER="3.2-gtk3" +inherit desktop flag-o-matic python-any-r1 toolchain-funcs multiprocessing wxwidgets xdg + +if [[ ${PV} != 9999 && ${PV} != *_pre* ]]; then + VERIFY_SIG_METHOD=minisig + # The public key can be found upstream - last update was w/ alpha 26: + # https://gitea.wildfiregames.com/0ad/0ad/wiki/VerifyingYourDownloads + VERIFY_SIG_OPENPGP_KEY_PATH=${FILESDIR}/0ad-minisign.pub + inherit verify-sig +fi + +DESCRIPTION="A free, real-time strategy game" +HOMEPAGE="https://play0ad.com/"; +LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/0ad/0ad"; + S="${WORKDIR}/${P}" +elif [[ ${PV} == *_pre* ]]; then + ZEROAD_GIT_REVISION="" + SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" +elif [[ ${PV} == *_rc* ]]; then + MY_P="0ad-${PV/_/-}" + SRC_URI=" + https://releases.wildfiregames.com/rc/${MY_P}-unix-build.tar.xz + https://releases.wildfiregames.com/rc/${MY_P}-unix-data.tar.xz + verify-sig? ( + https://releases.wildfiregames.com/rc/${MY_P}-unix-build.tar.xz.minisig + https://releases.wildfiregames.com/rc/${MY_P}-unix-data.tar.xz.minisig + ) + " + S="${WORKDIR}/${MY_P/-rc*/}" +else + MY_P="0ad-${PV/_/-}" + SRC_URI=" + https://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz + https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz + verify-sig? ( + https://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig + https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig + ) + " + S="${WORKDIR}/${MY_P}" +fi +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="editor +lobby nvtt pch test" + +RESTRICT="!test? ( test )" +CHECKREQS_DISK_BUILD="4000M" # 3842680 KiB (3.6 GiB) for alpha 27 +CHECKREQS_DISK_USR="3500M" # 3452564 KiB (3.2 GiB) + +BDEPEND=" + >=dev-util/premake-5.0.0_beta5:5 + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" + +# Removed dependency on nvtt as we use the bundled one. +# bug #768930 +# TODO: use system cxxtest +DEPEND=" + dev-lang/spidermonkey:128 + dev-libs/boost:= + dev-libs/icu:= + dev-libs/libfmt:0= + dev-libs/libsodium:= + dev-libs/libxml2:= + media-libs/freetype + media-libs/libpng:0 + media-libs/libsdl2[X,opengl,video] + media-libs/libvorbis + media-libs/openal + net-libs/enet:1.3 + net-libs/miniupnpc:= + net-misc/curl + virtual/zlib:= + virtual/opengl + x11-libs/libX11 + editor? ( x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] ) + lobby? ( net-libs/gloox ) +" +RDEPEND=" + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}/${P}-Allow-building-without-lobby.patch" +) + +src_prepare() { + default + + # bundled nvtt: -Wodr + filter-lto + + # Delete test needing network access + rm source/network/tests/test_StunClient.h || die +} + +src_configure() { + # 0AD uses premake:5 to generate the Makefiles, so let's + # 1. configure the configure args, + # 2. export some toolchain args, + # 3. configure premake args, + # 4. run premake5. + local myconf=( + --minimal-flags + --with-system-mozjs + $(usex nvtt "" "--without-nvtt") + $(usex pch "" "--without-pch") + $(usex test "" "--without-tests") + $(usex editor "" "--without-atlas") + $(usex lobby "" "--without-lobby") + --bindir="/usr/bin" + --libdir="/usr/$(get_libdir)"/${PN} + --datadir="/usr/share/${PN}" + ) + + tc-export AR CC CXX PKG_CONFIG RANLIB + + local mypremakeargs=( + --file=build/premake/premake5.lua + --os=linux + --verbose + ) + + use editor && setup-wxwidgets + + premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake \ + || die "Premake failed" +} + +src_compile() { + # Build 3rd party fcollada + einfo "Building bundled fcollada" + JOBS="-j$(makeopts_jobs)" ./libraries/source/fcollada/build.sh || die "Failed to build bundled fcollada" + + # Build bundled NVTT + # nvtt is abandoned upstream and 0ad has forked it and added fixes. + # Use their copy. bug #768930 + if use nvtt; then + elog "Building bundled NVTT (bug #768930)" + JOBS="-j$(makeopts_jobs)" ./libraries/source/nvtt/build.sh || die "Failed to build bundled NVTT" + fi + + # Shouldn't be needed with tests disabled, unfortunatly it still is for a27 + # https://gitea.wildfiregames.com/0ad/0ad/issues/7537 + einfo "Building bundled cxxtest" + JOBS="-j$(makeopts_jobs)" ./libraries/source/cxxtest-4.4/build.sh || die "Failed to build bundled cxxtest" + + # Build 0ad itself! + elog "Building 0ad" + emake -C build/workspaces/default config=release verbose=1 + + # Build assets + # (We only do this if we're using a snapshot/non-release) + # See bug #771147 (comment 3) and the old 0ad-data ebuild + # Warning: fragile! + if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then + # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing. + addpredict /proc/self/task + + # Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh. + local archivebuild_input archivebuild_output mod_name + for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do + mod_name="${archivebuild_input##*/}" + archivebuild_output="archives/${mod_name}" + + mkdir -p "${archivebuild_output}" || die + + einfo pyrogenesis -archivebuild="${archivebuild_input}" \ + -archivebuild-output="${archivebuild_output}/${mod_name}.zip" + LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \ + -archivebuild="${archivebuild_input}" \ + -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \ + || die "Failed to build assets" + + if [[ -f "${archivebuild_input}/mod.json" ]]; then + cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die + fi + + rm -r "${archivebuild_input}" || die + mv "${archivebuild_output}" "${archivebuild_input}" || die + done + + # Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh. + rm binaries/data/config/dev.cfg || die + fi +} + +# Removed test requiring network access in src_configure +src_test() { + LD_LIBRARY_PATH=$(realpath libraries/source/nvtt/lib/) \ + ./binaries/system/test --libdir "${S}/binaries/system" || die "Failed tests" +} + +src_install() { + # Remove transifex tooling configuration + rm -r binaries/data/l10n/{.tx,messages.json} || die + # Remove test only data + rm -r binaries/data/mods/_test.* || die + + newbin binaries/system/pyrogenesis 0ad + use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor + + # Merged from 0ad-data + # bug #771147 (comment 3) + insinto /usr/share/${PN} + doins -r binaries/data/{l10n,config,mods,tools} + + # Install bundled nvtt + # bug #771147 (comment 1) + exeinto /usr/$(get_libdir)/${PN} + doexe binaries/system/libCollada.so + use nvtt && doexe libraries/source/nvtt/lib/{libnvtt,libnvcore,libnvimage,libnvmath}.so + use editor && doexe binaries/system/libAtlasUI.so + + dodoc binaries/system/readme.txt + doicon -s 128 build/resources/${PN}.png + make_desktop_entry ${PN} +} diff --git a/games-strategy/0ad/files/0ad-0.28.0-Allow-building-without-lobby.patch b/games-strategy/0ad/files/0ad-0.28.0-Allow-building-without-lobby.patch new file mode 100644 index 000000000000..ef9c54709d24 --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.28.0-Allow-building-without-lobby.patch @@ -0,0 +1,74 @@ +From 7d19d213139c630725d232fc06b0dcc868d87c45 Mon Sep 17 00:00:00 2001 +From: Ralph Sennhauser <[email protected]> +Date: Sun, 1 Mar 2026 16:38:33 +0100 +Subject: [PATCH] Allow building without lobby + +Commit 6a8366b99a0ad14bdefd4509ce33a2510cb0082c added additional +libraries to the report but didn't consider gloox be optional. Address +this false assumption allowing to build pyrogenesis without lobby +support. + +Signed-off-by: Ralph Sennhauser <[email protected]> +--- + build/premake/premake5.lua | 4 +++- + source/ps/GameSetup/HWDetect.cpp | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua +index f0695e9afd..d316fcf130 100644 +--- a/build/premake/premake5.lua ++++ b/build/premake/premake5.lua +@@ -865,7 +865,6 @@ function setup_all_libs () + "zlib", + "boost", + "enet", +- "gloox", + "libcurl", + "tinygettext", + "icu", +@@ -877,6 +876,9 @@ function setup_all_libs () + "cpp_httplib", + } + ++ if not _OPTIONS["without-lobby"] then ++ table.insert(extern_libs, "gloox") ++ end + + if not _OPTIONS["without-miniupnpc"] then + table.insert(extern_libs, "miniupnpc") +diff --git a/source/ps/GameSetup/HWDetect.cpp b/source/ps/GameSetup/HWDetect.cpp +index 6c3197856f..d7d294fd4e 100644 +--- a/source/ps/GameSetup/HWDetect.cpp ++++ b/source/ps/GameSetup/HWDetect.cpp +@@ -23,7 +23,6 @@ + #include "lib/debug.h" + #include "lib/external_libraries/curl.h" + #include "lib/external_libraries/enet.h" +-#include "lib/external_libraries/gloox.h" + #include "lib/external_libraries/png.h" + #include "lib/external_libraries/libsdl.h" + #include "lib/path.h" +@@ -94,6 +93,10 @@ + #include <fstream> + #endif + ++#if CONFIG2_LOBBY ++#include "lib/external_libraries/gloox.h" ++#endif ++ + #if CONFIG2_NVTT + #include "nvtt/nvtt.h" + #endif +@@ -208,7 +211,9 @@ void ReportLibraries(const ScriptRequest& rq, JS::HandleValue settings) + appendLibrary(LibraryReporter{rq, "boost"}.Add("version", BOOST_VERSION).MakeReport()); + appendLibrary(LibraryReporter{rq, "enet"}.Add("version", std::to_string(ENET_VERSION)).MakeReport()); + appendLibrary(LibraryReporter{rq, "fmt"}.Add("version", FMT_VERSION).MakeReport()); ++#if CONFIG2_LOBBY + appendLibrary(LibraryReporter{rq, "gloox"}.Add("version", gloox_version()).MakeReport()); ++#endif + appendLibrary(LibraryReporter{rq, "libicu"}.Add("version", U_ICU_VERSION).MakeReport()); + appendLibrary(LibraryReporter{rq, "libcurl"}.Add("version", std::string(curl_version())).MakeReport()); + #if CONFIG2_AUDIO +-- +2.52.0 +
