Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
Date: Tue, 01 Sep 2020 23:25:05
Message-Id: 1599002686.05e8951e0fa0ad2c41db7ad94e242aef6bcad871.sam@gentoo
1 commit: 05e8951e0fa0ad2c41db7ad94e242aef6bcad871
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 1 23:24:34 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 1 23:24:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e8951e
7
8 games-action/supertuxkart: bump to 1.2
9
10 Closes: https://bugs.gentoo.org/739480
11 Closes: https://bugs.gentoo.org/737250
12 Package-Manager: Portage-3.0.5, Repoman-3.0.1
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 games-action/supertuxkart/Manifest | 1 +
16 .../supertuxkart-1.2-irrlicht-system-libs.patch | 69 ++++++++++++++++
17 games-action/supertuxkart/metadata.xml | 2 +
18 games-action/supertuxkart/supertuxkart-1.2.ebuild | 92 ++++++++++++++++++++++
19 4 files changed, 164 insertions(+)
20
21 diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
22 index 4fd966710bc..cb598d30c27 100644
23 --- a/games-action/supertuxkart/Manifest
24 +++ b/games-action/supertuxkart/Manifest
25 @@ -1,2 +1,3 @@
26 +DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
27 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
28 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
29
30 diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
31 new file mode 100644
32 index 00000000000..2a23e51323d
33 --- /dev/null
34 +++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
35 @@ -0,0 +1,69 @@
36 +https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
37 +----
38 +Subject: [PATCH] debian/use-system-libs
39 +
40 +Path to build irrlicht using the system libraries for png,zlib and
41 +jpeg as well as the glext family of header files.
42 +
43 +Signed-off-by: Christoph Egger <debian@×××××××××××××××.org
44 +
45 +--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
46 ++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
47 +@@ -35,7 +35,7 @@
48 + #include <GL/gl.h>
49 + #ifdef _IRR_OPENGL_USE_EXTPOINTER_
50 + #define GLX_GLXEXT_PROTOTYPES
51 +-#include "glxext.h"
52 ++#include <GL/glxext.h>
53 + #endif
54 + #endif
55 +
56 +--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
57 ++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
58 +@@ -24,7 +24,7 @@
59 + #define NO_SDL_GLEXT
60 + #include <SDL_video.h>
61 + #include <SDL_opengl.h>
62 +- #include "glext.h"
63 ++ #include <GL/glext.h>
64 + #elif defined(_IRR_WINDOWS_API_)
65 + // include windows headers for HWND
66 + #define WIN32_LEAN_AND_MEAN
67 +@@ -34,7 +34,7 @@
68 + #endif
69 + #include <GL/gl.h>
70 + #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
71 +- #include "glext.h"
72 ++ #include <GL/glext.h>
73 + #endif
74 + #include "wglext.h"
75 +
76 +@@ -49,7 +49,7 @@
77 + #endif
78 + #include <OpenGL/gl.h>
79 + #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
80 +- #include "glext.h"
81 ++ #include <GL/glext.h>
82 + #endif
83 + #endif
84 +
85 +--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
86 ++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
87 +@@ -12,7 +12,7 @@
88 + #define WIN32_LEAN_AND_MEAN
89 + #include <windows.h>
90 + #include <GL/gl.h>
91 +- #include "glext.h"
92 ++ #include <GL/glext.h>
93 + #else
94 + #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
95 + #define GL_GLEXT_LEGACY 1
96 +@@ -26,7 +26,7 @@
97 + #include <GL/gl.h>
98 + #endif
99 + #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
100 +- #include "glext.h"
101 ++ #include <GL/glext.h>
102 + #endif
103 + #endif
104 +
105
106 diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
107 index ced8e3e6ee9..22a9fc08bd8 100644
108 --- a/games-action/supertuxkart/metadata.xml
109 +++ b/games-action/supertuxkart/metadata.xml
110 @@ -9,9 +9,11 @@
111 <flag name="fribidi">Support for right-to-left languages</flag>
112 <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
113 <flag name="recorder">Enable recording with <pkg>media-libs/libopenglrecorder</pkg></flag>
114 + <flag name="sqlite">Record IP bans, statistics in server mode with <pkg>dev-db/sqlite</pkg></flag>
115 <flag name="wiimote">Support for wiimote input devices</flag>
116 </use>
117 <upstream>
118 + <remote-id type="github">supertuxkart/stk-code</remote-id>
119 <remote-id type="sourceforge">supertuxkart</remote-id>
120 </upstream>
121 </pkgmetadata>
122
123 diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild b/games-action/supertuxkart/supertuxkart-1.2.ebuild
124 new file mode 100644
125 index 00000000000..d78f9737b39
126 --- /dev/null
127 +++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
128 @@ -0,0 +1,92 @@
129 +# Copyright 1999-2020 Gentoo Authors
130 +# Distributed under the terms of the GNU General Public License v2
131 +
132 +EAPI=7
133 +
134 +inherit cmake desktop xdg
135 +
136 +MY_P="SuperTuxKart-${PV}-src"
137 +DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
138 +HOMEPAGE="https://supertuxkart.net/"
139 +SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.xz
140 + mirror://gentoo/${PN}.png"
141 +
142 +LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
143 +SLOT="0"
144 +KEYWORDS="~amd64 ~x86"
145 +IUSE="debug fribidi libressl nettle recorder sqlite wiimote"
146 +
147 +# don't unbundle irrlicht and bullet
148 +# both are modified and system versions will break the game
149 +# https://sourceforge.net/p/irrlicht/feature-requests/138/
150 +
151 +RDEPEND="
152 + dev-cpp/libmcpp
153 + sqlite? ( dev-db/sqlite:3 )
154 + dev-libs/angelscript:=
155 + dev-libs/fribidi
156 + media-libs/freetype:2
157 + media-libs/glew:0=
158 + media-libs/harfbuzz:=
159 + media-libs/libpng:0=
160 + media-libs/libsdl2
161 + media-libs/libvorbis
162 + media-libs/openal
163 + net-libs/enet:1.3=
164 + net-misc/curl
165 + sys-libs/zlib
166 + virtual/glu
167 + virtual/jpeg:0
168 + virtual/libintl
169 + virtual/opengl
170 + x11-libs/libX11
171 + x11-libs/libXxf86vm
172 + nettle? ( dev-libs/nettle:= )
173 + !nettle? (
174 + libressl? ( dev-libs/libressl:= )
175 + !libressl? ( >=dev-libs/openssl-1.0.1d:0= )
176 + )
177 + recorder? ( media-libs/libopenglrecorder )
178 + wiimote? ( net-wireless/bluez )"
179 +DEPEND="${RDEPEND}"
180 +BDEPEND="
181 + sys-devel/gettext
182 + virtual/pkgconfig"
183 +
184 +S="${WORKDIR}/${MY_P}"
185 +
186 +PATCHES=(
187 + "${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
188 + "${FILESDIR}"/${PN}-1.2-irrlicht-system-libs.patch
189 +)
190 +
191 +src_prepare() {
192 + cmake_src_prepare
193 +}
194 +
195 +src_configure() {
196 + local mycmakeargs=(
197 + -DUSE_SQLITE3=$(usex sqlite)
198 + -DUSE_SYSTEM_ANGELSCRIPT=ON
199 + -DUSE_SYSTEM_ENET=ON
200 + -DUSE_SYSTEM_GLEW=ON
201 + -DUSE_SYSTEM_SQUISH=OFF
202 + -DUSE_SYSTEM_WIIUSE=OFF
203 + -DUSE_IPV6=OFF # not supported by system enet
204 + -DOpenGL_GL_PREFERENCE=GLVND
205 + -DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
206 + -DBUILD_RECORDER=$(usex recorder)
207 + -DUSE_WIIUSE=$(usex wiimote)
208 + -DSTK_INSTALL_BINARY_DIR=bin
209 + -DSTK_INSTALL_DATA_DIR=share/${PN}
210 + -DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
211 + )
212 + cmake_src_configure
213 +}
214 +
215 +src_install() {
216 + cmake_src_install
217 + dodoc CHANGELOG.md
218 +
219 + doicon -s 64 "${DISTDIR}"/${PN}.png
220 +}