summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/endless-sky/Manifest8
-rw-r--r--games-strategy/endless-sky/endless-sky-0.10.10.ebuild87
-rw-r--r--games-strategy/endless-sky/endless-sky-0.10.6.ebuild73
-rw-r--r--games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch20
-rw-r--r--games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch42
-rw-r--r--games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch13
-rw-r--r--games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch10
7 files changed, 89 insertions, 164 deletions
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
index f034fbb..8e389d1 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1,7 +1,3 @@
-AUX endless-sky-0.9.14-dont-compress-man-page.patch 602 BLAKE2B 9aaa08338ed26e53f5eaa3e42a0aaa8c9c8f56099518a688d3f91fd860945a883252345bd8f9df9b6d591751afc171f6d6e845c86083bc246316fec6e5d3eb7e SHA512 a3b951be268b8e6689da97b7ec77ebb7a5d65a6381dbbdfd0b607c62d2d0418f78290189b6cf94c33acfd238c7c8b1b5b0737629486ca2af18d9022ada1789ec
-AUX endless-sky-0.9.14-no-games-path.patch 1919 BLAKE2B 7650a1e3a355a0e9a591f191fbc2eb0f5400924cac7fa2ac0ef3419a6c7c6524e19956907c3904267c9ba1e1bedbceb7b5fa19af07316c6137c9075f9a051c03 SHA512 c9b867fb0d8c82a1ebaa5bc04ba615d39d81031bcec204b5e5a3d0daff040ae30f59ba4f80e76ca671db0a9073c63ad0b3cb8f125ca628bbaa1774c212e6c2b3
-AUX endless-sky-0.9.16.1-respect-cflags.patch 389 BLAKE2B 1dc481b771fc9ab5af455c623aae6941d3b81b7b74ad031e7702dfc6a3832713ea040130a81ddee1c1e129758d85a0e25eff74bca4fba66b7cd940a9373bccf9 SHA512 a309b981791ea81538d8ee47aef4b590cf01af024280e73f883ce8145621a533daa404b87c04f7545bc8922be9dec77c8c4c0142dc2b3e490cd5e252d0087cf0
-AUX endless-sky-0.9.16.1-test-libs.patch 448 BLAKE2B 41c7617f7087140cee0540e432540098f47d6c2037b02da2a594899b8140db32c40676611a081f56767f48707daf9e5eaebf48eb81ec0ee03d57cb2afa1d0d1c SHA512 fe4a698de27a48439e7a205ce36b0eed29e8f5264422717c412be5726dedf236ac20668a20e850d2cb14782b5a1351d20582dc065b502bef978ab89416658ae0
-DIST endless-sky-0.10.6.tar.gz 256438340 BLAKE2B 39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff SHA512 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530
-EBUILD endless-sky-0.10.6.ebuild 1720 BLAKE2B 7a5687d7b956134c892262757a7d248d91486158a439f6b8c557a1954b44a7a47986ca11b17667b8a16979dd5f8515c42db6d8d9e9a69845374be574db67df1f SHA512 a61bddf9a8c05cf15e709d849c690a58c507372f7a9b4ef76e43d9ced6ff5dc57e075271a15ff7a2a57b21342b1bbf7725c7ae7b047f441c4a862349f170c1e3
+DIST endless-sky-0.10.10.tar.gz 271561866 BLAKE2B be312b00851bc91226a9b5a1462d9587ee38371d0a001afb5e2bad4deb51da3b3e56b03efeaa052afc832c47fb6fe48481dfa43ddf17ff80f4f9cdbcf44d5ce6 SHA512 85fd33b6da11aa35ec27283a80b8f2308ebea237fe9b2941ea0046c7b57bf17bcc24a9893e83cf490a21f47595d32617a7225948ce34d38ba94a1dac9303c892
+EBUILD endless-sky-0.10.10.ebuild 2077 BLAKE2B fda16b09d2f8bb729b2bf6ee4cbe332cf9ad5478e35b2c8c3925dc9614ccf13ad179df42d0dda1281996e139cd8ef66fadcc8ebd0a511c3c67a301948c2df97b SHA512 429c3d421ce9432e73dc9d6015a1bde8ef28d2053ec5e466ba439aa05f113437e0adbc57359ef31e000cd60eb2459f8facc60a8547fe3dc85a672752c64c446a
MISC metadata.xml 732 BLAKE2B 05e221e5b8bc45baf62a5361a1fa11affd5bfce04bb1ed4127251c151771df72c873e9c2deab4aa9b4800fa3314fa768c635e61bf941e3eb74241ee5f2a8aabf SHA512 2aefeccd986719aab4be77af1bf4458b36a873918c04905f9b432a591a44dfdd001faf29ab16ced565c069e846bfe5a96e2c12ffa1e4d62a7b202cf7fc356949
diff --git a/games-strategy/endless-sky/endless-sky-0.10.10.ebuild b/games-strategy/endless-sky/endless-sky-0.10.10.ebuild
new file mode 100644
index 0000000..d1f1437
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.10.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake prefix xdg
+
+DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
+HOMEPAGE="https://endless-sky.github.io/"
+SRC_URI="
+ https://github.com/endless-sky/endless-sky/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz
+"
+
+LICENSE="
+ GPL-3+
+ CC-BY-2.0 CC-BY-3.0 CC-BY-4.0
+ CC-BY-SA-3.0 CC-BY-SA-4.0
+ CC0-1.0 public-domain
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gles2-only test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libglvnd
+ media-libs/libjpeg-turbo:=
+ media-libs/libmad
+ media-libs/libpng:=
+ media-libs/libsdl2[video]
+ media-libs/openal
+ sys-apps/util-linux
+ gles2-only? ( media-libs/libsdl2[gles2] )
+ !gles2-only? (
+ media-libs/glew:0=
+ media-libs/libsdl2[opengl]
+ )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # no /usr/*games/ on Gentoo, adjust docdir, install even if != Release,
+ # and GLEW is unused if USE=gles2-only (using sed for less rebasing)
+ sed -e '/install(/s: games: bin:' \
+ -e '/install(/s: share/games: share:' \
+ -e "/install(/s: share/doc/endless-sky: share/doc/${PF}:" \
+ -e '/install(/s: CONFIGURATIONS Release::' \
+ -e 's:GLEW REQUIRED:GLEW:' \
+ -i CMakeLists.txt || die
+ sed -i '/PATH/s:share/games:share:' source/Files.cpp || die
+
+ hprefixify -w /PATH/ source/Files.cpp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DES_GLES=$(usex gles2-only)
+ -DES_USE_SYSTEM_LIBRARIES=yes
+ -DES_USE_VCPKG=no
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ gzip -d -- "${ED}"/usr/share/man/man6/${PN}.6.gz || die
+ rm -- "${ED}"/usr/share/doc/${PF}/{copyright,license.txt} || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "Endless Sky provides high-res sprites for high-dpi screens."
+ elog "If you want to use them, download:"
+ elog
+ elog " https://github.com/endless-sky/endless-sky-high-dpi/releases"
+ elog
+ elog "and extract it to ~/.local/share/endless-sky/plugins/"
+ fi
+}
diff --git a/games-strategy/endless-sky/endless-sky-0.10.6.ebuild b/games-strategy/endless-sky/endless-sky-0.10.6.ebuild
deleted file mode 100644
index 3d0b78c..0000000
--- a/games-strategy/endless-sky/endless-sky-0.10.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 scons-utils toolchain-funcs xdg
-
-DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
-HOMEPAGE="https://endless-sky.github.io/"
-SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gles2-only"
-
-RDEPEND="
- media-libs/libjpeg-turbo:=
- media-libs/libmad
- media-libs/libpng:=
- media-libs/openal
- sys-apps/util-linux
- gles2-only? (
- media-libs/libglvnd
- media-libs/libsdl2[gles2,video]
- )
- !gles2-only? (
- media-libs/glew:0=
- media-libs/libglvnd[X]
- media-libs/libsdl2[opengl,video]
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.14-no-games-path.patch
- "${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
- "${FILESDIR}"/${PN}-0.9.16.1-respect-cflags.patch
- "${FILESDIR}"/${PN}-0.9.16.1-test-libs.patch
-)
-
-src_compile() {
- tc-export AR CXX
-
- MYSCONSARGS=(
- PREFIX="${EPREFIX}"/usr
- opengl=$(usex gles2-only gles desktop)
- )
-
- escons "${MYSCONSARGS[@]}"
-}
-
-src_test() {
- # TODO: unbundle dev-cpp/catch if upstream migrates to catch v3
- escons "${MYSCONSARGS[@]}" test
-}
-
-src_install() {
- escons "${MYSCONSARGS[@]}" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Endless Sky provides high-res sprites for high-dpi screens."
- einfo "If you want to use them, download"
- einfo
- einfo " https://github.com/endless-sky/endless-sky-high-dpi/releases"
- einfo
- einfo "and extract it to ~/.local/share/endless-sky/plugins/."
- einfo
- einfo "Enjoy."
-}
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
deleted file mode 100644
index d3836c0..0000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 07f273e6f72a01158934158c3e8ff84c530367c9 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 6 Jan 2022 23:57:32 +0000
-Subject: [PATCH 2/2] Don't compress man page
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -176,10 +176,9 @@ if env.get("PREFIX").startswith("/usr/"):
- "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/")
-
- # Install the man page.
--env.Command(
-+env.Install(
- "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz",
-- "endless-sky.6",
-- "gzip -c $SOURCE > $TARGET")
-+ "endless-sky.6")
-
- # Install the data files.
- def RecursiveInstall(env, target, source):
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
deleted file mode 100644
index bdec820..0000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://src.fedoraproject.org/rpms/endless-sky/raw/rawhide/f/endless-sky-0.9.13-remove-games-path.patch
---- a/SConstruct
-+++ b/SConstruct
-@@ -191,11 +191,11 @@
- RecursiveInstall(env, pathjoin(target, name), node.abspath)
- else:
- env.Install(target, node)
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data")
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images")
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds")
--env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt")
--env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds")
-+env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt")
-+env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt")
-
- # Make the word "install" in the command line do an installation.
- env.Alias("install", "$DESTDIR$PREFIX")
---- a/SConstruct
-+++ b/SConstruct
-@@ -142,7 +142,7 @@
-
-
- # Install the binary:
--env.Install("$DESTDIR$PREFIX/games", sky)
-+env.Install("$DESTDIR$PREFIX/bin", sky)
-
- # Install the desktop file:
- env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
---- a/source/Files.cpp
-+++ b/source/Files.cpp
-@@ -119,7 +119,7 @@
- // the executable, but are under the same prefix (/usr or /usr/local).
- static const string LOCAL_PATH = "/usr/local/";
- static const string STANDARD_PATH = "/usr/";
-- static const string RESOURCE_PATH = "share/games/endless-sky/";
-+ static const string RESOURCE_PATH = "share/endless-sky/";
- if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH))
- resources = LOCAL_PATH + RESOURCE_PATH;
- else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
deleted file mode 100644
index 6790f7d..0000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -53,10 +53,2 @@
- flags = ["-std=c++11", "-Wall", "-Wold-style-cast", "-fno-rtti"]
--if env["mode"] != "debug":
-- flags += ["-Werror", "-O3", "-flto"]
-- env.Append(LINKFLAGS = ["-O3", "-flto"])
--if env["mode"] == "debug":
-- flags += ["-g"]
--elif env["mode"] == "profile":
-- flags += ["-pg"]
-- env.Append(LINKFLAGS = ["-pg"])
- env.Append(CCFLAGS = flags)
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
deleted file mode 100644
index 31b27de..0000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Even if not actually used, ensure all symbols are available when linking
-tests to handle cases where unused symbols were not optimized out.
-https://bugs.gentoo.org/894702
---- a/SConstruct
-+++ b/SConstruct
-@@ -172,4 +172,2 @@
- CPPPATH=(env.get('CPPPATH', []) + [pathjoin('tests', 'unit', 'include')]),
-- # Do not link against the actual implementations of SDL, OpenGL, etc.
-- LIBS=sys_libs,
- # Pass the necessary link flags for a console program.