[gentoo-commits] repo/gentoo:master commit in: games-rpg/openglad/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/openglad/

[Michael Sterrett]

commit:     ef3f8ff00d40da13aafe38990f1d76daa19100ac
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri May  6 02:16:52 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri May  6 02:49:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3f8ff0

games-rpg/openglad: set RDEPEND

Package-Manager: portage-2.2.26

 games-rpg/openglad/openglad-0.98.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-rpg/openglad/openglad-0.98.ebuild b/games-rpg/openglad/openglad-0.98.ebuild
index b6e2112..739a94c 100644
--- a/games-rpg/openglad/openglad-0.98.ebuild
+++ b/games-rpg/openglad/openglad-0.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,6 +18,7 @@ IUSE=""
 DEPEND="media-libs/sdl-mixer
 	media-libs/sdl-image
 	media-libs/libsdl[joystick,sound,video]"
+RDEPEND=${DEPEND}
 
 src_prepare() {
 	epatch \

[gentoo-commits] repo/gentoo:master commit in: games-rpg/openglad/

[Ionen Wolkens]

commit:     445c58728bba63b0bb937416a1cfec699ffe5f82
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 05:43:07 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 09:34:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445c5872

games-rpg/openglad: add github remote-id

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

 games-rpg/openglad/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
index b093b0fee1e..7be52b700c6 100644
--- a/games-rpg/openglad/metadata.xml
+++ b/games-rpg/openglad/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">openglad/openglad</remote-id>
 		<remote-id type="sourceforge">snowstorm</remote-id>
 	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: games-rpg/openglad/

[Ionen Wolkens]

commit:     de5530983b6c1e7fa9bbaade0d924671123c1466
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 08:36:23 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 09:34:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de553098

games-rpg/openglad: add 0.98_p20200907 snapshot

openglad-0.98 dates back to 2003, is prone to segfaults,
and stuck on SDL1. With no release in sight, use snapshot
of seemingly stable SDL2 version.

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

 games-rpg/openglad/Manifest                       |  1 +
 games-rpg/openglad/openglad-0.98_p20200907.ebuild | 73 +++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
index cf749afecb0..031d8ed8b48 100644
--- a/games-rpg/openglad/Manifest
+++ b/games-rpg/openglad/Manifest
@@ -1,2 +1,3 @@
 DIST openglad-0.98.tar.gz 724106 BLAKE2B 6cd9df5fd260af9902997bc0708c8285e48081e52fff7af05f432ae94f2f6fdbfba162c664ac4f531796a0372f1be3be064843dad75163e68b7e324b9b6d506d SHA512 3f9165fbf8fff081a862bfe81401a3b2ac227da58b84409beee8b0441f88b1a6deb3d24a1af6e71bd3a3484fc90de5574950fd54be82d837021a07f06302f0e1
+DIST openglad-0.98_p20200907.tar.gz 2060013 BLAKE2B 5ea16c0ab13e45f1723ceb0b4167fcbf5863d040e1fc54cd27fa59df14200f84e0e22c0cba87f9ad3294a90850d5b36199cba8e78804d1994fb2dea6ea493fff SHA512 b3bf582a780d90408fc585b28418f462602ec35434c018d6315fb8b119b34cb0dceabcd6b5a6450ba6beb2ab5dc931d6e21ecf46e76853c7f5051c9b3be9014c
 DIST openglad.png 5593 BLAKE2B 1fbc5a32861dc4cc5bb4aae4b1b42e92411756618ccfa4172e1494c4f98eb527f6bd36273a250cd7ce721baa76ba80548d75ec1e89b3da134c78d0a7b415b6bd SHA512 27419fcbbbf8640718968304a4824101860736c2091f494defcd111b5cc252856b5373c0e7a2bca1c79f9c7551012b0ba04577f9ed97769e436637ee25f5caeb

diff --git a/games-rpg/openglad/openglad-0.98_p20200907.ebuild b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
new file mode 100644
index 00000000000..132a5ea3979
--- /dev/null
+++ b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+MY_COMMIT="80e33b15cfa6d7d288b4b3db4dcca0349f13691f"
+
+DESCRIPTION="SDL clone of Gladiator, a classic RPG game"
+HOMEPAGE="http://snowstorm.sourceforge.net/"
+SRC_URI="
+	https://github.com/openglad/openglad/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/${PN}.png"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Boost-1.0 GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libyaml
+	dev-libs/libzip:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,sound,video]
+	media-libs/sdl2-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/premake:4
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# game uses the binary's location for assets even with a wrapper
+	sed -e '/^std::string get_asset_path/!b;n' \
+		-e "a\\return \"${EPREFIX}/usr/share/${PN}/\";" \
+		-i src/io.cpp || die
+
+	# unbundle (delete + add to pkg-config below is enough)
+	# physfs: need missing physfsrwops.h matching system's to unbundle
+	rm -r src/external/{libyaml,libzip} || die
+
+	# cleanup not to install
+	rm sound/Makefile.am || die
+}
+
+src_configure() {
+	# premake4.lua assumes a lot (e.g. no SDL2 include path), check ourselves
+	local pkgs=( SDL2_mixer libpng libzip sdl2 yaml-0.1 )
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags "${pkgs[@]}" || die)
+	append-libs $($(tc-getPKG_CONFIG) --libs "${pkgs[@]}" || die)
+
+	premake4 gmake || die
+}
+
+src_compile() {
+	emake verbose=y ARCH= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LIBS="${LIBS}"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r builtin cfg extra_campaigns pix sound
+	# note: extra_campaigns not directly used, but users may want them
+
+	dodoc {cheats,classes,scen}.txt
+	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry openglad Openglad
+}

[gentoo-commits] repo/gentoo:master commit in: games-rpg/openglad/

[Ionen Wolkens]

commit:     cc94c41489790dde45313e0f4d890e1b39b0c43e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 16:24:06 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 16:45:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc94c414

games-rpg/openglad: switch to premake:5 to handle race condition

5 works even with old premake4.lua and generates different rules that
doesn't seem like can race to create objects before the object dir
(not that 100% sure that fixes it).

Given nothing else in the tree depends on premake:4, also little
reason to hold on to that version if this works.

Closes: https://bugs.gentoo.org/804154
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-rpg/openglad/openglad-0.98_p20200907.ebuild | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/games-rpg/openglad/openglad-0.98_p20200907.ebuild b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
index 132a5ea3979..33e42ea2dce 100644
--- a/games-rpg/openglad/openglad-0.98_p20200907.ebuild
+++ b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	media-libs/sdl2-mixer"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-util/premake:4
+	dev-util/premake:5
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -51,15 +51,25 @@ src_configure() {
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags "${pkgs[@]}" || die)
 	append-libs $($(tc-getPKG_CONFIG) --libs "${pkgs[@]}" || die)
 
-	premake4 gmake || die
+	premake5 gmake || die
 }
 
 src_compile() {
-	emake verbose=y ARCH= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LIBS="${LIBS}"
+	local emakeargs=(
+		config=release
+		verbose=y
+		ARCH= # build assumes this is -m64 and tries to pass it to the compiler
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LIBS="${LIBS}"
+		ALL_LDFLAGS="${LDFLAGS}" # only used to override -s
+	)
+
+	emake "${emakeargs[@]}"
 }
 
 src_install() {
-	dobin ${PN}
+	dobin bin/Release/${PN}
 
 	insinto /usr/share/${PN}
 	doins -r builtin cfg extra_campaigns pix sound
@@ -69,5 +79,5 @@ src_install() {
 	einstalldocs
 
 	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry openglad Openglad
+	make_desktop_entry ${PN} ${PN^}
 }