Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/trine-enchanted-edition/
Date: Wed, 31 Oct 2018 21:53:31
Message-Id: 1541022791.bc136377c77f0ea077c87592f911b4683da94331.chewi@gentoo
1 commit: bc136377c77f0ea077c87592f911b4683da94331
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 31 21:35:57 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 31 21:53:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc136377
7
8 games-action/trine-enchanted-edition: Use our SDL with SDL_DYNAMIC_API
9
10 This is a magic environment variable that allows us to bypass the
11 static version of SDL 2 that the game was built with.
12
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14 Package-Manager: Portage-2.3.51, Repoman-2.3.11
15
16 ...8.ebuild => trine-enchanted-edition-2.12.508-r1.ebuild} | 14 +++++++-------
17 1 file changed, 7 insertions(+), 7 deletions(-)
18
19 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
20 similarity index 81%
21 rename from games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
22 rename to games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
23 index fcff32bee8f..d15a55db5f7 100644
24 --- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
25 +++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r1.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2018 Gentoo Foundation
28 +# Copyright 1999-2018 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=6
32 @@ -23,14 +23,15 @@ QA_PREBUILT="opt/${PN}/${PN}*"
33 DEPEND="app-arch/unzip"
34
35 # SDL 1.3 is bundled but the game appears to be statically linked
36 -# against SDL 2.0.3. This is unfortunate as there are bugs. For example,
37 -# it doesn't respect the DISPLAY variable under Zaphod mode.
38 +# against SDL 2.0.3. We can bypass this and use our own SDL 2 by setting
39 +# the SDL_DYNAMIC_API environment variable.
40
41 RDEPEND="
42 media-gfx/nvidia-cg-toolkit[abi_x86_32]
43 media-libs/alsa-lib[abi_x86_32]
44 media-libs/freetype:2[abi_x86_32]
45 media-libs/libogg[abi_x86_32]
46 + >=media-libs/libsdl2-2.0.3[abi_x86_32,joystick,opengl,sound,threads,video]
47 >=media-libs/libvorbis-1.3[abi_x86_32]
48 >=media-libs/openal-1.15[abi_x86_32]
49 >=sys-devel/gcc-4.6[cxx]
50 @@ -56,7 +57,7 @@ pkg_nofetch() {
51 }
52
53 src_install() {
54 - local dir=/opt/${PN}
55 + local dir=/opt/${PN} SDL=${EPREFIX}/usr/$(ABI=x86 get_libdir)/libSDL2-2.0.so.0
56
57 insinto "${dir}"
58 doins -r *.fbq data
59 @@ -64,14 +65,14 @@ src_install() {
60 exeinto "${dir}"
61 newexe bin/trine1_linux_32bit ${PN}
62
63 - make_wrapper ${PN} ./${PN} "${dir}"
64 + make_wrapper ${PN} "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}" "${dir}"
65 make_desktop_entry ${PN} "${MY_PN}"
66
67 if use launcher ; then
68 exeinto "${dir}"
69 newexe bin/trine1_linux_launcher_32bit ${PN}-launcher
70
71 - make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}"
72 + make_wrapper ${PN}-launcher "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}-launcher" "${dir}"
73 make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
74
75 # Launcher binary has hardcoded the game path.
76 @@ -82,6 +83,5 @@ src_install() {
77 dodoc readme_changelog.txt
78 }
79
80 -pkg_preinst() { gnome2_icon_savelist; }
81 pkg_postinst() { gnome2_icon_cache_update; }
82 pkg_postrm() { gnome2_icon_cache_update; }