commit:     d0cdd28cee7b12f4fe2e10949af2abb94f3533c5
Author:     Wolf-Dieter Rieck <wesen42 <AT> web <DOT> de>
AuthorDate: Mon Feb 22 21:19:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cdd28c

games-strategy/0ad: fix build and merge 0ad-data package

* Build was broken in former revision,
  as generated libs weren't in LD_LIBRARY_PATH.
  Also libs weren't correcly installed.

* 0ad-data pulled same archive as 0a package.
  Merged both ebuilds into this revision blocking the 0ad-data package.

Bug: https://bugs.gentoo.org/768930
Closes: https://bugs.gentoo.org/771147
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Wolf-Dieter Rieck <wesen42 <AT> web.de>
Closes: https://github.com/gentoo/gentoo/pull/19603
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../0ad-0.0.24_alpha_pre20210116040036-r2.ebuild   | 224 +++++++++++++++++++++
 1 file changed, 224 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild 
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
new file mode 100644
index 00000000000..7826f504366
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop toolchain-funcs wxwidgets xdg
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+
+       EGIT_REPO_URI="https://github.com/0ad/0ad";
+       ZEROAD_GIT_REVISION=""
+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
+       SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+       
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> 
${P}.tar.gz"
+else
+       SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+fi
+
+# merged with 0ad-data
+# addresses comment #3
+# bug #771147
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+       test? ( dev-lang/perl )"
+
+# remove 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 )"
+
+# add block on 0ad-data, as it is no longer needed.
+# addresses comment #3
+# bug #771147
+RDEPEND="${DEPEND}
+       !games-strategy/0ad-data"
+
+if [[ ${PV} == 9999 ]]; then
+       S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+       S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+       S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+       "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+       use editor && setup-wxwidgets
+}
+
+src_prepare() {
+       default
+
+       sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+       # merged from 0ad-data
+       # addresses comment #3
+       # bug #771147
+       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 CC CXX
+
+       # stock premake5 does not work, use the shipped one
+       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... this is the most stupid build system
+       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() {
+       tc-export AR
+
+       # 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)"
+               ./build.sh || die "Failed to build bundled nvtt"
+               cd "${S}" || die
+       fi
+
+       # build bundled spidermonkey
+       # We genuinely 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" ./build.sh || die "Failed to build 
bundled SpiderMonkey"
+       cd "${S}" || die
+
+       # build 0ad
+       elog "Building 0ad"
+       emake -C build/workspaces/gcc verbose=1
+
+       # merged from 0ad-data
+       # addresses comment #3
+       # bug #771147
+       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}"
+
+                       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
+
+                       if [[ -f "${archivebuild_input}/mod.json" ]]; then
+                               cp "${archivebuild_input}/mod.json" 
"${archivebuild_output}"
+                       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 "test phase failed"
+}
+
+src_install() {
+       newbin binaries/system/pyrogenesis 0ad
+       use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+       # merged with 0ad-data
+       # addresses comment #3
+       # bug #771147
+       insinto /usr/share/${PN}
+       doins -r binaries/data/{l10n,config,mods,tools}
+
+       # merged with 0ad-data
+       # addresses comment #3
+       # bug #771147
+       # install bundled SpiderMonkey and nvtt
+       # fixes comment #1
+       # bug #771147
+       exeinto /usr/$(get_libdir)/${PN}
+       doexe 
binaries/system/{libCollada,libmozjs78-ps-release,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}
+}

Reply via email to