commit: dbb3bdf4645d0f83d7112620f07500af44e86962 Author: Nils Freydank <holgersson <AT> posteo <DOT> de> AuthorDate: Thu Jun 17 20:11:50 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 17 23:23:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb3bdf4
games-strategy/0ad: Fix stopping the binary with USE="-nvtt" Closes: https://bugs.gentoo.org/779757 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Nils Freydank <holgersson <AT> posteo.de> Signed-off-by: Sam James <sam <AT> gentoo.org> games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 229 +++++++++++++++++++++ ...0.24b_alpha-fix-hang-on-quit-without-nvtt.patch | 98 +++++++++ 2 files changed, 327 insertions(+) diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild new file mode 100644 index 00000000000..94bf17e4928 --- /dev/null +++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild @@ -0,0 +1,229 @@ +# Copyright 2014-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{7..9} ) +inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/0ad/0ad"; +elif [[ ${PV} == *_pre* ]]; then + ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7" +else + MY_P="0ad-${PV/_/-}" +fi + +DESCRIPTION="A free, real-time strategy game" +HOMEPAGE="https://play0ad.com/"; + +if [[ ${PV} == 9999 ]]; then + S="${WORKDIR}/${P}" +elif [[ ${PV} == *_pre* ]]; then + SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" +else + SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"; + SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"; + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="editor +lobby nvtt pch test" +RESTRICT="test" + +# virtual/rust is for bundled SpiderMonkey +# Build-time Python dependency is for SM too +# TODO: Unbundle premake5 +# See bug #773472 which may help (bump for it) +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + virtual/rust + test? ( dev-lang/perl ) +" +# Removed dependency on nvtt as we use the bundled one +# bug #768930 +DEPEND=" + dev-libs/boost:= + dev-libs/icu:= + dev-libs/libfmt:0= + dev-libs/libsodium + dev-libs/libxml2 + 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 + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) + lobby? ( >=net-libs/gloox-1.0.20 ) +" +RDEPEND=" + ${DEPEND} + !games-strategy/0ad-data +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch + "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch + "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch + "${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch +) + +pkg_setup() { + use editor && setup-wxwidgets +} + +src_prepare() { + default + + # SpiderMonkey's configure no longer recognises --build for + # the build tuple + sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die + + # Originally from 0ad-data + rm binaries/data/tools/fontbuilder/fonts/*.txt || die +} + +src_configure() { + local myconf=( + --minimal-flags + $(usex nvtt "" "--without-nvtt") + $(usex pch "" "--without-pch") + $(usex test "" "--without-tests") + $(usex editor "--atlas" "") + $(usex lobby "" "--without-lobby") + --bindir="/usr/bin" + --libdir="/usr/$(get_libdir)"/${PN} + --datadir="/usr/share/${PN}" + ) + + tc-export AR CC CXX RANLIB + + # Stock premake5 does not work, use the shipped one + # TODO: revisit this, see above BDEPEND note re premake5 + emake -C "${S}"/build/premake/premake5/build/gmake2.unix + + # Regenerate scripts.c so our patch applies + cd "${S}"/build/premake/premake5 || die + "${S}"/build/premake/premake5/bin/release/premake5 embed || die + + # Rebuild premake again + emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean + emake -C "${S}"/build/premake/premake5/build/gmake2.unix + + # Run premake to create build scripts + cd "${S}"/build/premake || die + "${S}"/build/premake/premake5/bin/release/premake5 \ + --file="premake5.lua" \ + --outpath="../workspaces/gcc/" \ + --os=linux \ + "${myconf[@]}" \ + gmake2 \ + || die "Premake failed" +} + +src_compile() { + # Build 3rd party fcollada + einfo "Building bundled fcollada" + emake -C libraries/source/fcollada/src + + # Build bundled NVTT + # nvtt is abandoned upstream and 0ad have forked it and added fixes. + # Use their copy. bug #768930 + if use nvtt ; then + cd libraries/source/nvtt || die + elog "Building bundled NVTT (bug #768930)" + JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT" + cd "${S}" || die + fi + + # Build bundled SpiderMonkey + # We really can't use the system SpiderMonkey right now. + # Breakages occur even on minor bumps in upstream SM, + # e.g. bug #768840. + cd libraries/source/spidermonkey || die + elog "Building bundled SpiderMonkey (bug #768840)" + XARGS="${EPREFIX}/usr/bin/xargs" \ + JOBS="-j$(makeopts_jobs)" \ + ./build.sh \ + || die "Failed to build bundled SpiderMonkey" + + cd "${S}" || die + + # Build 0ad itself! + elog "Building 0ad" + JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc 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 + rm -r binaries/data/mods/_test.* || die + fi +} + +src_test() { + cd binaries/system || die + ./test -libdir "${S}/binaries/system" || die "Failed tests" +} + +src_install() { + 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 SpiderMonkey and nvtt + # bug #771147 (comment 1) + exeinto /usr/$(get_libdir)/${PN} + doexe binaries/system/{libCollada,libmozjs78-ps-release}.so + + use nvtt && doexe binaries/system/{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.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch new file mode 100644 index 00000000000..fe054eccac5 --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch @@ -0,0 +1,98 @@ +# Nils Freydank <[email protected]> (2021-06-17) +Apply the patch from upstream with minor adoption. + +Gentoo bug: https://bugs.gentoo.org/779757 +Upstream Bug: https://trac.wildfiregames.com/ticket/6107 +Upstream Patch: https://trac.wildfiregames.com/changeset/25766 + +--- a/source/graphics/TextureConverter.cpp (revision 25765) ++++ b/source/graphics/TextureConverter.cpp (revision 25766) +@@ -294,9 +294,8 @@ + m_VFS(vfs), m_HighQuality(highQuality), m_Shutdown(false) + { ++#if CONFIG2_NVTT + // Verify that we are running with at least the version we were compiled with, + // to avoid bugs caused by ABI changes +-#if CONFIG2_NVTT + ENSURE(nvtt::version() >= NVTT_VERSION); +-#endif + + m_WorkerThread = std::thread(Threading::HandleExceptions<RunThread>::Wrapper, this); +@@ -304,8 +303,10 @@ + // Maybe we should share some centralised pool of worker threads? + // For now we'll just stick with a single thread for this specific use. ++#endif // CONFIG2_NVTT + } + + CTextureConverter::~CTextureConverter() + { ++#if CONFIG2_NVTT + // Tell the thread to shut down + { +@@ -327,4 +328,5 @@ + // Wait for it to shut down cleanly + m_WorkerThread.join(); ++#endif // CONFIG2_NVTT + } + +@@ -477,8 +479,8 @@ + return true; + +-#else ++#else // CONFIG2_NVTT + LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8()); + return false; +-#endif ++#endif // !CONFIG2_NVTT + } + +@@ -529,22 +531,24 @@ + return true; + +-#else // #if CONFIG2_NVTT ++#else // CONFIG2_NVTT + return false; +-#endif ++#endif // !CONFIG2_NVTT + } + + bool CTextureConverter::IsBusy() + { ++#if CONFIG2_NVTT + std::lock_guard<std::mutex> lock(m_WorkerMutex); + return !m_RequestQueue.empty(); ++#else // CONFIG2_NVTT ++ return false; ++#endif // !CONFIG2_NVTT + } + + void CTextureConverter::RunThread(CTextureConverter* textureConverter) + { ++#if CONFIG2_NVTT + debug_SetThreadName("TextureConverter"); + g_Profiler2.RegisterCurrentThread("texconv"); +- +-#if CONFIG2_NVTT +- + // Wait until the main thread wakes us up + while (true) +@@ -596,4 +600,4 @@ + std::lock_guard<std::mutex> wait_lock(textureConverter->m_WorkerMutex); + textureConverter->m_Shutdown = false; +-#endif +-} ++#endif // CONFIG2_NVTT ++} + +--- a/source/graphics/TextureConverter.h (revision 25765) ++++ b/source/graphics/TextureConverter.h (revision 25766) +@@ -208,7 +208,9 @@ + bool m_HighQuality; + ++#if CONFIG2_NVTT + std::thread m_WorkerThread; + std::mutex m_WorkerMutex; + std::condition_variable m_WorkerCV; ++#endif // CONFIG2_NVTT + + struct ConversionRequest;
