[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
Date: Mon, 25 Jul 2022 06:11:20 +0000 (UTC)	[thread overview]
Message-ID: <1658729466.63627009500213a3f055a4f9152b61f51e8c1605.ionen@gentoo> (raw)

commit:     63627009500213a3f055a4f9152b61f51e8c1605
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 03:10:36 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 06:11:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63627009

games-strategy/freeorion: sync and update live

changes on top of sync with 0.4.10.2-r1:
* no longer exclude SmokeTest* (currently everything passes)
* drop [X] on libglvnd (uses libOpenGL by default now)
* swap HEADLESS for CLIENT_GG (leaving experimental GODOT off for now)

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/freeorion-9999.ebuild | 118 ++++++++++++++++---------
 1 file changed, 78 insertions(+), 40 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 8931083dbe88..d725cfe38806 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -4,74 +4,112 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="https://www.freeorion.org"
+inherit check-reqs cmake multiprocessing python-single-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
 else
+	FREEORION_BUILD_ID=""
+	SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_${FREEORION_BUILD_ID}_Source.tar.gz"
+	S="${WORKDIR}/src-tarball"
 	KEYWORDS="~amd64"
-	if [[ ${PV} = *_p* ]]; then
-		COMMIT=""
-		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${COMMIT}"
-	else
-		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${PV/_/-}"
-	fi
 fi
 
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE="dedicated"
+DESCRIPTION="Free turn-based space empire and galactic conquest game"
+HOMEPAGE="https://www.freeorion.org/"
 
+LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+"
+SLOT="0"
+IUSE="dedicated doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}]
-	')
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
+	sys-libs/zlib:=
 	!dedicated? (
-		media-libs/freealut
-		>=media-libs/freetype-2.5.5
+		media-libs/freetype
 		media-libs/glew:=
-		>=media-libs/libogg-1.1.3
-		media-libs/libpng:0=
-		media-libs/libsdl2[X,opengl,video]
-		>=media-libs/libvorbis-1.1.2
+		media-libs/libglvnd
+		media-libs/libogg
+		media-libs/libpng:=
+		media-libs/libsdl2[opengl,video]
+		media-libs/libvorbis
 		media-libs/openal
-		sci-physics/bullet:=
-		virtual/opengl
-	)
-	sys-libs/zlib
+	)"
+RDEPEND="
+	${DEPEND}
+	!dedicated? (
+		media-fonts/dejavu
+		media-fonts/roboto
+	)"
+BDEPEND="
 	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
 
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
+freeorion_check-reqs() {
+	# cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB
+	# if debug symbols) then far less for the rest, check minimal jobs*1.5
+	local CHECKREQS_MEMORY=$(($(makeopts_jobs)*1500))M
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
 
+pkg_pretend() {
+	freeorion_check-reqs
+}
+
+pkg_setup() {
+	freeorion_check-reqs
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
 	cmake_src_prepare
+
+	sed -i 's/-O3//' CMakeLists.txt || die
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HEADLESS="$(usex dedicated)"
+		-DBUILD_CLIENT_GG=$(usex !dedicated)
+		-DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot (experimental)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	cmake_src_test -j1 # avoid running 2 conflicting servers
+
+	epytest -o cache_dir="${T}"/pytest_cache default/python/tests
+}
+
 src_install() {
+	local DOCS=( ChangeLog.md README.md )
 	cmake_src_install
 
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+	use doc && dodoc -r "${BUILD_DIR}"/doc/cpp-apidoc/html
+
+	if use dedicated; then
+		rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die
+	else
+		local font
+		for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do
+			dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/}
+		done
+		rm "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die
+	fi
 }

next             reply	other threads:[~2022-07-25  6:11 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-25  6:11 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-22  3:07 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/ Ionen Wolkens
2024-06-01  5:32 Ionen Wolkens
2024-05-26 14:52 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2023-02-08 13:45 Ionen Wolkens
2023-02-08 12:32 Ionen Wolkens
2022-07-25  6:11 Ionen Wolkens
2022-07-24 15:03 Ionen Wolkens
2022-07-24 15:03 Ionen Wolkens
2022-05-14  2:32 Sam James
2022-05-14  2:32 Sam James
2021-07-01 16:02 Adam Feldman
2021-07-01 16:02 Adam Feldman
2021-06-18 19:18 David Seifert
2020-10-12  3:19 Adam Feldman
2020-10-06 18:12 Adam Feldman
2020-05-09 15:31 Adam Feldman
2020-04-09 20:55 Adam Feldman
2020-04-09 20:55 Adam Feldman
2020-02-09 16:25 Michał Górny
2019-08-12 19:58 Michał Górny
2019-05-11  8:24 Andreas Sturmlechner
2019-05-11  8:24 Andreas Sturmlechner
2019-04-23 10:05 Lars Wendler
2018-03-27  4:06 NP Hardass
2017-12-08  0:35 NP Hardass
2017-12-04  6:27 NP Hardass
2017-09-13 19:48 NP Hardass
2017-05-07  6:36 NP Hardass
2017-04-26 18:43 NP Hardass
2017-04-25 18:58 NP Hardass
2017-03-16  4:24 NP Hardass
2017-03-16  4:24 NP Hardass
2016-10-25  8:55 Thomas Kahle
2015-09-29 12:16 Thomas Kahle

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8931083dbe8 dfblob:d725cfe3880 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1658729466.63627009500213a3f055a4f9152b61f51e8c1605.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox