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/supertuxkart/, games-action/supertuxkart/files/
Date: Fri, 29 Oct 2021 22:40:48
Message-Id: 1635547232.3ee8ba23ed1b7768f1501a946bc9a18b9bbd7dc3.chewi@gentoo
1 commit: 3ee8ba23ed1b7768f1501a946bc9a18b9bbd7dc3
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 29 22:40:32 2021 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 29 22:40:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee8ba23
7
8 games-action/supertuxkart: Drop old 1.1
9
10 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
11
12 games-action/supertuxkart/Manifest | 1 -
13 .../supertuxkart-0.9.3-irrlicht-system-libs.patch | 56 -------------
14 games-action/supertuxkart/supertuxkart-1.1.ebuild | 91 ----------------------
15 3 files changed, 148 deletions(-)
16
17 diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
18 index cf24edce24e..c6449222002 100644
19 --- a/games-action/supertuxkart/Manifest
20 +++ b/games-action/supertuxkart/Manifest
21 @@ -1,4 +1,3 @@
22 DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
23 DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086 SHA512 42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed
24 -DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
25 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
26
27 diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
28 deleted file mode 100644
29 index ce7ce63fa66..00000000000
30 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
31 +++ /dev/null
32 @@ -1,56 +0,0 @@
33 -Subject: [PATCH] debian/use-system-libs
34 -
35 -Path to build irrlicht using the system libraries for png,zlib and
36 -jpeg as well as the glext family of header files.
37 -
38 -Signed-off-by: Christoph Egger <debian@×××××××××××××××.org
39 -
40 ---- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
41 -+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
42 -@@ -21,7 +21,7 @@
43 - #endif
44 - #include <GL/gl.h>
45 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
46 -- #include "glext.h"
47 -+ #include <GL/glext.h>
48 - #endif
49 - #include "wglext.h"
50 -
51 -@@ -36,7 +36,7 @@
52 - #endif
53 - #include <OpenGL/gl.h>
54 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
55 -- #include "glext.h"
56 -+ #include <GL/glext.h>
57 - #endif
58 - #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
59 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
60 -@@ -50,7 +50,7 @@
61 - #include <SDL/SDL_video.h>
62 - #include <SDL/SDL_opengl.h>
63 - typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
64 -- #include "glext.h"
65 -+ #include <GL/glext.h>
66 - #else
67 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
68 - #define GL_GLEXT_LEGACY 1
69 ---- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
70 -+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
71 -@@ -12,7 +12,7 @@
72 - #define WIN32_LEAN_AND_MEAN
73 - #include <windows.h>
74 - #include <GL/gl.h>
75 -- #include "glext.h"
76 -+ #include <GL/glext.h>
77 - #else
78 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
79 - #define GL_GLEXT_LEGACY 1
80 -@@ -25,7 +25,7 @@
81 - #include <GL/gl.h>
82 - #endif
83 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
84 -- #include "glext.h"
85 -+ #include <GL/glext.h>
86 - #endif
87 - #endif
88 -
89
90 diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild b/games-action/supertuxkart/supertuxkart-1.1.ebuild
91 deleted file mode 100644
92 index 1b75dbc88d8..00000000000
93 --- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
94 +++ /dev/null
95 @@ -1,91 +0,0 @@
96 -# Copyright 1999-2021 Gentoo Authors
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=7
100 -
101 -inherit cmake desktop xdg
102 -
103 -DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
104 -HOMEPAGE="https://supertuxkart.net/"
105 -SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
106 - mirror://gentoo/${PN}.png"
107 -
108 -LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
109 -SLOT="0"
110 -KEYWORDS="~amd64 ~x86"
111 -IUSE="debug nettle recorder wiimote"
112 -
113 -# don't unbundle irrlicht and bullet
114 -# both are modified and system versions will break the game
115 -# https://sourceforge.net/p/irrlicht/feature-requests/138/
116 -
117 -RDEPEND="
118 - dev-libs/angelscript:=
119 - dev-libs/fribidi
120 - media-libs/freetype:2
121 - media-libs/glew:0=
122 - media-libs/harfbuzz:=
123 - media-libs/libpng:0=
124 - media-libs/libvorbis
125 - media-libs/openal
126 - net-libs/enet:1.3=
127 - net-misc/curl
128 - sys-libs/zlib
129 - virtual/glu
130 - virtual/jpeg:0
131 - virtual/libintl
132 - virtual/opengl
133 - x11-libs/libX11
134 - x11-libs/libXxf86vm
135 - nettle? ( dev-libs/nettle:= )
136 - !nettle? (
137 - >=dev-libs/openssl-1.0.1d:0=
138 - )
139 - recorder? ( media-libs/libopenglrecorder )
140 - wiimote? ( net-wireless/bluez )"
141 -DEPEND="${RDEPEND}"
142 -BDEPEND="
143 - sys-devel/gettext
144 - virtual/pkgconfig"
145 -
146 -S="${WORKDIR}/${P}-src"
147 -
148 -PATCHES=(
149 - "${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
150 - "${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
151 - "${FILESDIR}"/${PN}-1.1-fix-buildsystem.patch
152 -)
153 -
154 -src_prepare() {
155 - cmake_src_prepare
156 -
157 - # remove bundled libraries, just to be sure
158 - rm -r lib/{angelscript,enet,glew,jpeglib,libpng,zlib} || die
159 -}
160 -
161 -src_configure() {
162 - local mycmakeargs=(
163 - -DUSE_SYSTEM_ANGELSCRIPT=ON
164 - -DUSE_SYSTEM_ENET=ON
165 - -DUSE_SYSTEM_GLEW=ON
166 - -DUSE_SYSTEM_SQUISH=OFF
167 - -DUSE_SYSTEM_WIIUSE=OFF
168 - -DUSE_IPV6=OFF # not supported by system enet
169 - -DOpenGL_GL_PREFERENCE=GLVND
170 - -DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
171 - -DENABLE_WAYLAND_DEVICE=OFF
172 - -DBUILD_RECORDER=$(usex recorder)
173 - -DUSE_WIIUSE=$(usex wiimote)
174 - -DSTK_INSTALL_BINARY_DIR=bin
175 - -DSTK_INSTALL_DATA_DIR=share/${PN}
176 - -DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
177 - )
178 - cmake_src_configure
179 -}
180 -
181 -src_install() {
182 - cmake_src_install
183 - dodoc CHANGELOG.md
184 -
185 - doicon -s 64 "${DISTDIR}"/${PN}.png
186 -}