[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/files/, games-strategy/endless-sky/
commit: 4b0087904d720f62a2c8c9d49edea8b9f34b502a
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun May 12 20:02:22 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun May 12 20:02:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b008790
games-strategy/endless-sky: drop 0.9.16.1
Signed-off-by: Ionen Wolkens gentoo.org>
games-strategy/endless-sky/Manifest| 1 -
.../endless-sky/endless-sky-0.9.16.1.ebuild| 74 --
...endless-sky-0.9.14-dont-compress-man-page.patch | 20 --
.../files/endless-sky-0.9.14-no-games-path.patch | 42
.../files/endless-sky-0.9.16.1-gcc13.patch | 45 -
.../endless-sky-0.9.16.1-respect-cflags.patch | 13
.../files/endless-sky-0.9.16.1-test-libs.patch | 10 ---
7 files changed, 205 deletions(-)
diff --git a/games-strategy/endless-sky/Manifest
b/games-strategy/endless-sky/Manifest
index 69ff9993f8da..dc163477cf80 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1,2 +1 @@
DIST endless-sky-0.10.6.tar.gz 256438340 BLAKE2B
39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff
SHA512
815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530
-DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B
3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650
SHA512
83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56
diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
deleted file mode 100644
index 709d7de7ed87..
--- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+++ /dev/null
@@ -1,74 +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
- "${FILESDIR}"/${PN}-0.9.16.1-gcc13.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 d3836c088f31..
---
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
-Date: Thu, 6 Jan 2022 23:57:32 +
-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",
--
[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/files/, games-strategy/endless-sky/
commit: d03d4f49bef52ea4562876316d494cbcc6b2f7f3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Feb 16 08:45:44 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 16 08:54:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03d4f49
games-strategy/endless-sky: hopefully fix tests without -flto
Upstream defaults to -flto, but we yank it to let users set as wanted.
Simplest seem to be to just let the libraries get used.
Closes: https://bugs.gentoo.org/894702
Signed-off-by: Ionen Wolkens gentoo.org>
games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild | 1 +
.../endless-sky/files/endless-sky-0.9.16.1-test-libs.patch | 10 ++
2 files changed, 11 insertions(+)
diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
index c07e76bb4888..3d0b78c57dff 100644
--- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+++ b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
@@ -36,6 +36,7 @@ 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() {
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
new file mode 100644
index ..31b27de1d569
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
@@ -0,0 +1,10 @@
+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.
[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/files/, games-strategy/endless-sky/
commit: 02c104a6e2e2b9c2f7702b16c304bdb0a967e489
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Feb 16 06:55:21 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 16 07:29:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c104a6
games-strategy/endless-sky: add 0.9.16.1, enable py3.11
- re-enable tests, seem to work in this version
- add IUSE=gles2-only and tighten sdl2+GL deps
- revert to bundled dev-cpp/catch (it's newer/suitable at 2.13.9,
and using system's without pinning would require migration to v3
which further needs -std=c++14 -- left note to unbundle later)
Closes: https://bugs.gentoo.org/830718
Closes: https://bugs.gentoo.org/887483
Signed-off-by: Ionen Wolkens gentoo.org>
games-strategy/endless-sky/Manifest| 1 +
.../endless-sky/endless-sky-0.9.16.1.ebuild| 72 ++
.../endless-sky-0.9.16.1-respect-cflags.patch | 13
3 files changed, 86 insertions(+)
diff --git a/games-strategy/endless-sky/Manifest
b/games-strategy/endless-sky/Manifest
index 75a855912828..3c3a337e0421 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1 +1,2 @@
DIST endless-sky-0.9.14.tar.gz 124358153 BLAKE2B
5845c3b595f0feba7fc5f6ce1ead88b34e9426c3db53cf013fc67f9197d2cabad8fae39056fa6f4d6da76fceb43a9709397b95daba855d1b1ebf3c25a04ba007
SHA512
861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5
+DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B
3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650
SHA512
83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56
diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
new file mode 100644
index ..c07e76bb4888
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
@@ -0,0 +1,72 @@
+# 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
+)
+
+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.16.1-respect-cflags.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
new file mode 100644
index ..6790f7de647f
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
@@ -0,0 +1,13 @@
+--- 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)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/files/, games-strategy/endless-sky/
commit: 72aa2845bba14a3291d5c73d178278a448e11d7f
Author: Sam James gentoo org>
AuthorDate: Thu Jan 6 23:06:22 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 6 23:06:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72aa2845
games-strategy/endless-sky: initial import (restore at 0.9.14)
Closes: https://bugs.gentoo.org/735542
Signed-off-by: Sam James gentoo.org>
games-strategy/endless-sky/Manifest| 1 +
.../endless-sky/endless-sky-0.9.14.ebuild | 59 ++
.../files/endless-sky-0.9.14-no-games-path.patch | 42 +++
.../files/endless-sky-0.9.14-respect-cflags.patch | 20
games-strategy/endless-sky/metadata.xml| 16 ++
5 files changed, 138 insertions(+)
diff --git a/games-strategy/endless-sky/Manifest
b/games-strategy/endless-sky/Manifest
new file mode 100644
index ..75a855912828
--- /dev/null
+++ b/games-strategy/endless-sky/Manifest
@@ -0,0 +1 @@
+DIST endless-sky-0.9.14.tar.gz 124358153 BLAKE2B
5845c3b595f0feba7fc5f6ce1ead88b34e9426c3db53cf013fc67f9197d2cabad8fae39056fa6f4d6da76fceb43a9709397b95daba855d1b1ebf3c25a04ba007
SHA512
861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5
diff --git a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
new file mode 100644
index ..f0f7509aa8a8
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+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"
+
+# Needs work; doesn't link against SDL 2
+RESTRICT="test"
+
+RDEPEND="media-libs/glew:0=
+ media-libs/libsdl2
+ media-libs/libjpeg-turbo:=
+ media-libs/libmad
+ media-libs/libpng:=
+ media-libs/openal
+ virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.14-respect-cflags.patch
+ "${FILESDIR}"/${PN}-0.9.14-no-games-path.patch
+)
+
+src_compile() {
+ tc-export CXX
+
+ escons
+}
+
+src_test() {
+ escons test
+}
+
+src_install() {
+ escons PREFIX="${ED}"/usr/ 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-no-games-path.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
new file mode 100644
index ..bdec820de1e1
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
@@ -0,0 +1,42 @@
+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
