public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
@ 2018-03-25 16:33 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2018-03-25 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ec3bd08eda216b433e9757ef6fdd119fcf1c35a3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 16:30:42 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 16:33:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec3bd08e

games-action/trine-enchanted-edition: New package

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-action/trine-enchanted-edition/Manifest      |  1 +
 games-action/trine-enchanted-edition/metadata.xml  | 11 +++
 .../trine-enchanted-edition-2.12.508.ebuild        | 85 ++++++++++++++++++++++
 3 files changed, 97 insertions(+)

diff --git a/games-action/trine-enchanted-edition/Manifest b/games-action/trine-enchanted-edition/Manifest
new file mode 100644
index 00000000000..5c5f1cb6ae9
--- /dev/null
+++ b/games-action/trine-enchanted-edition/Manifest
@@ -0,0 +1 @@
+DIST trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip 1226749814 BLAKE2B 9803f78279bcf83a2a54f25e2498664b73ba1c0ae5c540bb4479345ae05495cc11527937876fb7c9dbb34d05dbbdb4575cc6c1899923c782ff67ea23bd2cfac9 SHA512 e883763efe89f09a84c2896bfd0a9a13319dd14bb840e67f1812a0bab45bcab7a144f4c9399194e5aabad0435e350c6a903a542c9101a37c602855ebd0884d9d

diff --git a/games-action/trine-enchanted-edition/metadata.xml b/games-action/trine-enchanted-edition/metadata.xml
new file mode 100644
index 00000000000..b26a6baa412
--- /dev/null
+++ b/games-action/trine-enchanted-edition/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>

diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
new file mode 100644
index 00000000000..87871dfbf50
--- /dev/null
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils
+
+MY_P="${PV//./_}"
+MY_P="${PN//-/_}_v${MY_P%_*}_build_${MY_P##*_}"
+MY_PN="Trine Enchanted Edition"
+
+DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+SRC_URI="${MY_P}_humble_linux_full.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch splitdebug"
+
+QA_PREBUILT="opt/${PN}/${PN}*"
+
+DEPEND="app-arch/unzip"
+
+# SDL 1.3 is bundled but the game appears to be statically linked
+# against SDL 2.0.3. This is unfortunate as there are bugs. For example,
+# it doesn't respect the DISPLAY variable under Zaphod mode.
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/alsa-lib[abi_x86_32]
+	media-libs/freetype:2[abi_x86_32]
+	media-libs/libogg[abi_x86_32]
+	>=media-libs/libvorbis-1.3[abi_x86_32]
+	>=media-libs/openal-1.15[abi_x86_32]
+	sys-libs/zlib[abi_x86_32]
+	virtual/glu[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	launcher? (
+		dev-libs/glib:2[abi_x86_32]
+		media-libs/libpng:1.2[abi_x86_32]
+		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/pango[abi_x86_32,X]
+	)"
+
+S="${WORKDIR}/linux/_enchanted_edition_"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r *.fbq data
+
+	exeinto "${dir}"
+	newexe bin/trine1_linux_32bit ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "${MY_PN}"
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe bin/trine1_linux_launcher_32bit ${PN}-launcher
+
+		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}"
+		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ../${PN} "${dir}"/bin/trine1_bin_starter.sh
+	fi
+
+	newicon -s 64 trine1.png ${PN}.png
+	dodoc readme_changelog.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
@ 2018-03-25 21:22 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2018-03-25 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     74e5cd998b4c014cb649eaf067434e595e04687e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 21:22:08 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 21:22:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e5cd99

games-action/trine-enchanted-edition: Add missing gcc and glibc deps

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
index 87871dfbf50..fcff32bee8f 100644
--- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
@@ -33,6 +33,8 @@ RDEPEND="
 	media-libs/libogg[abi_x86_32]
 	>=media-libs/libvorbis-1.3[abi_x86_32]
 	>=media-libs/openal-1.15[abi_x86_32]
+	>=sys-devel/gcc-4.6[cxx]
+	>=sys-libs/glibc-2.15
 	sys-libs/zlib[abi_x86_32]
 	virtual/glu[abi_x86_32]
 	virtual/opengl[abi_x86_32]


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
@ 2018-10-31 21:53 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2018-10-31 21:53 UTC (permalink / raw
  To: gentoo-commits

commit:     bc136377c77f0ea077c87592f911b4683da94331
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 21:35:57 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 21:53:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc136377

games-action/trine-enchanted-edition: Use our SDL with SDL_DYNAMIC_API

This is a magic environment variable that allows us to bypass the
static version of SDL 2 that the game was built with.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 ...8.ebuild => trine-enchanted-edition-2.12.508-r1.ebuild} | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
similarity index 81%
rename from games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
rename to games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
index fcff32bee8f..d15a55db5f7 100644
--- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,14 +23,15 @@ QA_PREBUILT="opt/${PN}/${PN}*"
 DEPEND="app-arch/unzip"
 
 # SDL 1.3 is bundled but the game appears to be statically linked
-# against SDL 2.0.3. This is unfortunate as there are bugs. For example,
-# it doesn't respect the DISPLAY variable under Zaphod mode.
+# against SDL 2.0.3. We can bypass this and use our own SDL 2 by setting
+# the SDL_DYNAMIC_API environment variable.
 
 RDEPEND="
 	media-gfx/nvidia-cg-toolkit[abi_x86_32]
 	media-libs/alsa-lib[abi_x86_32]
 	media-libs/freetype:2[abi_x86_32]
 	media-libs/libogg[abi_x86_32]
+	>=media-libs/libsdl2-2.0.3[abi_x86_32,joystick,opengl,sound,threads,video]
 	>=media-libs/libvorbis-1.3[abi_x86_32]
 	>=media-libs/openal-1.15[abi_x86_32]
 	>=sys-devel/gcc-4.6[cxx]
@@ -56,7 +57,7 @@ pkg_nofetch() {
 }
 
 src_install() {
-	local dir=/opt/${PN}
+	local dir=/opt/${PN} SDL=${EPREFIX}/usr/$(ABI=x86 get_libdir)/libSDL2-2.0.so.0
 
 	insinto "${dir}"
 	doins -r *.fbq data
@@ -64,14 +65,14 @@ src_install() {
 	exeinto "${dir}"
 	newexe bin/trine1_linux_32bit ${PN}
 
-	make_wrapper ${PN} ./${PN} "${dir}"
+	make_wrapper ${PN} "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}" "${dir}"
 	make_desktop_entry ${PN} "${MY_PN}"
 
 	if use launcher ; then
 		exeinto "${dir}"
 		newexe bin/trine1_linux_launcher_32bit ${PN}-launcher
 
-		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}"
+		make_wrapper ${PN}-launcher "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}-launcher" "${dir}"
 		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
 
 		# Launcher binary has hardcoded the game path.
@@ -82,6 +83,5 @@ src_install() {
 	dodoc readme_changelog.txt
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
 pkg_postinst() { gnome2_icon_cache_update; }
 pkg_postrm() { gnome2_icon_cache_update; }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
@ 2019-11-08  6:48 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-11-08  6:48 UTC (permalink / raw
  To: gentoo-commits

commit:     7b05a2de190ab5546ae673d68d306b9b7efe6dd0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 19:29:55 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 06:48:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b05a2de

games-action/trine-enchanted-edition: Switch to libpng-compat

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...-2.12.508-r1.ebuild => trine-enchanted-edition-2.12.508-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild
similarity index 96%
rename from games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
rename to games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild
index d15a55db5f7..661020e5bcc 100644
--- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ RDEPEND="
 	virtual/opengl[abi_x86_32]
 	launcher? (
 		dev-libs/glib:2[abi_x86_32]
-		media-libs/libpng:1.2[abi_x86_32]
+		media-libs/libpng-compat:1.2[abi_x86_32]
 		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
 		x11-libs/gtk+:2[abi_x86_32]
 		x11-libs/libX11[abi_x86_32]


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
@ 2020-11-11 20:50 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2020-11-11 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     6fe933dd635736bb604fdcfe16e77c04142e9b33
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 20:48:48 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 20:50:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe933dd

games-action/trine-enchanted-edition: Drop gdk-pixbuf[X] dep, EAPI 7

The dependency on gdk-pixbuf-xlib was bogus.

Closes: https://bugs.gentoo.org/753926
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...8-r2.ebuild => trine-enchanted-edition-2.12.508-r3.ebuild} | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild
similarity index 91%
rename from games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild
rename to games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild
index 661020e5bcc..f33d1cb8946 100644
--- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop eutils gnome2-utils
+inherit desktop wrapper xdg
 
 MY_P="${PV//./_}"
 MY_P="${PN//-/_}_v${MY_P%_*}_build_${MY_P##*_}"
@@ -42,7 +42,7 @@ RDEPEND="
 	launcher? (
 		dev-libs/glib:2[abi_x86_32]
 		media-libs/libpng-compat:1.2[abi_x86_32]
-		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
+		x11-libs/gdk-pixbuf:2[abi_x86_32]
 		x11-libs/gtk+:2[abi_x86_32]
 		x11-libs/libX11[abi_x86_32]
 		x11-libs/pango[abi_x86_32,X]
@@ -82,6 +82,3 @@ src_install() {
 	newicon -s 64 trine1.png ${PN}.png
 	dodoc readme_changelog.txt
 }
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
@ 2024-05-19 16:17 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2024-05-19 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4f53cb5dc684ca1f63a571688f04b16ce071db24
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 15:47:26 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 19 16:16:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f53cb5d

games-action/trine-enchanted-edition: libsdl2 will drop threads USE flag, EAPI 8

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...08-r3.ebuild => trine-enchanted-edition-2.12.508-r4.ebuild} | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r4.ebuild
similarity index 97%
rename from games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild
rename to games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r4.ebuild
index 28b20274fd43..4da88ca90795 100644
--- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop wrapper xdg
 
@@ -12,7 +12,7 @@ MY_PN="Trine Enchanted Edition"
 DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine"
 HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
 SRC_URI="${MY_P}_humble_linux_full.zip"
-
+S="${WORKDIR}/linux/_enchanted_edition_"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -32,7 +32,7 @@ RDEPEND="
 	media-libs/alsa-lib[abi_x86_32]
 	media-libs/freetype:2[abi_x86_32]
 	media-libs/libogg[abi_x86_32]
-	>=media-libs/libsdl2-2.0.3[abi_x86_32,joystick,opengl,sound,threads,video]
+	>=media-libs/libsdl2-2.0.3[abi_x86_32,joystick,opengl,sound,threads(+),video]
 	>=media-libs/libvorbis-1.3[abi_x86_32]
 	>=media-libs/openal-1.15[abi_x86_32]
 	>=sys-devel/gcc-4.6[cxx]
@@ -49,8 +49,6 @@ RDEPEND="
 		x11-libs/pango[abi_x86_32,X]
 	)"
 
-S="${WORKDIR}/linux/_enchanted_edition_"
-
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
 	einfo "  https://www.humblebundle.com/store/${PN}"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-05-19 16:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-25 21:22 [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2024-05-19 16:17 James Le Cuirot
2020-11-11 20:50 James Le Cuirot
2019-11-08  6:48 Michał Górny
2018-10-31 21:53 James Le Cuirot
2018-03-25 16:33 James Le Cuirot

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