1 |
commit: 97b25755a4c5f5e19c7fb0b38c6f00638d40668a |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 24 16:50:36 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 24 17:51:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b25755 |
7 |
|
8 |
games-sports/speed-dreams: drop 1.4.0-r1 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
games-sports/speed-dreams/Manifest | 1 - |
13 |
.../files/speed-dreams-1.4.0-asneeded.patch | 110 --------------------- |
14 |
.../files/speed-dreams-1.4.0-automake.patch | 35 ------- |
15 |
.../files/speed-dreams-1.4.0-libpng15.patch | 20 ---- |
16 |
.../files/speed-dreams-1.4.0-math-hack.patch | 25 ----- |
17 |
games-sports/speed-dreams/metadata.xml | 1 - |
18 |
.../speed-dreams/speed-dreams-1.4.0-r1.ebuild | 85 ---------------- |
19 |
7 files changed, 277 deletions(-) |
20 |
|
21 |
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest |
22 |
index cfdb3ed86f9..cbc10cc3761 100644 |
23 |
--- a/games-sports/speed-dreams/Manifest |
24 |
+++ b/games-sports/speed-dreams/Manifest |
25 |
@@ -1,4 +1,3 @@ |
26 |
-DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195 |
27 |
DIST speed-dreams-src-base-2.2.3-r7616.tar.xz 238067340 BLAKE2B 5250a295fd077ab5c773bfb066416a2b0abfbd667e99c5c7a360898121af9dc757cf6afd003e220b9e76e687040d80687f8f78d445d6b98064efa396f5b1b4b7 SHA512 a98913625a78a67f7428649c6f3c426d32537b5f1b9331540bb32926568d281e1ec0e80bf45e5d847f43ee00b2d0c5945be96d86ac36d840b79dd3da82920960 |
28 |
DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-r7616.tar.xz 578705056 BLAKE2B 8b354211686ca6183ada892c844fa0345f2b751b786194d2d52e37a25c8dcf048e91862f2964c337e02765fba4e7bafa81539355a2b00af68476704ddc85c817 SHA512 4a488daeb1161dbc61ca95c5152d38864f759bbc2d0d8cc4d4c4a258aa143dedab55f16ba3343657b2fe8544e1f33ee0bc82e2cdeda7a7087a283e2513a8b6c6 |
29 |
DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-r7616.tar.xz 668751780 BLAKE2B f4c528eebdecc337394a08100e45eb66a8ad5e85164813a27a406d6b54089cd640874d37680588bfffcf3f1fdc274fd2329defb9d052ef2833c86dec8be21c9d SHA512 e8256c28697dd78794c41f2dc659d7aa455f0e5967b3178fbe17eb4adf6ef93ed719621f38afd78c8d0a548bcb7b61bb0859755b4867fee21096fe0925acfd89 |
30 |
|
31 |
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch |
32 |
deleted file mode 100644 |
33 |
index 779119d995b..00000000000 |
34 |
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch |
35 |
+++ /dev/null |
36 |
@@ -1,110 +0,0 @@ |
37 |
---- a/configure.in |
38 |
-+++ b/configure.in |
39 |
-@@ -123,8 +123,7 @@ |
40 |
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@×××××××××××××××××.net with the subject \"Speed Dreams compilation problem\"])) |
41 |
- AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) |
42 |
- AC_CHECK_LIB(alut, alutLoadWAVFile, |
43 |
-- LDFLAGS="$LDFLAGS -lalut", |
44 |
-- LDFLAGS="$LDFLAGS") |
45 |
-+ LIBS="$LIBS -lalut", ) |
46 |
- |
47 |
- AC_CHECK_LIB(dl, dlopen) |
48 |
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@×××××××××××××××××.net with the subject \"Speed Dreams compilation problem\"])) |
49 |
-@@ -141,7 +140,7 @@ |
50 |
- AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/])) |
51 |
- |
52 |
- dnl Checks for plib libraries. |
53 |
--LDFLAGS="$LDFLAGS -lplibjs" |
54 |
-+AC_CHECK_LIB(plibjs, main,,AC_MSG_ERROR([Can't find libplibjs. PLIB can be found on http://plib.sourceforge.net/])) |
55 |
- AC_CHECK_LIB(plibul, main,,AC_MSG_ERROR([Can't find libplibul. PLIB can be found on http://plib.sourceforge.net/])) |
56 |
- AC_CHECK_LIB(plibsg, main,,AC_MSG_ERROR([Can't find libplibsg. PLIB can be found on http://plib.sourceforge.net/])) |
57 |
- AC_CHECK_LIB(plibsl, main,,AC_MSG_ERROR([Can't find libplibsl. PLIB can be found on http://plib.sourceforge.net/])) |
58 |
---- a/Make-default.mk |
59 |
-+++ b/Make-default.mk |
60 |
-@@ -402,7 +402,7 @@ |
61 |
- ifdef PROGRAM |
62 |
- |
63 |
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) |
64 |
-- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@ |
65 |
-+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} |
66 |
- |
67 |
- installprogram: ${PROGRAM} |
68 |
- @ createdir="${INSTLIBBASE}" ; \ |
69 |
-@@ -420,14 +420,14 @@ |
70 |
- ifdef LOCALTOOLS |
71 |
- |
72 |
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) |
73 |
-- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ |
74 |
-+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} |
75 |
- |
76 |
- endif |
77 |
- |
78 |
- ifdef TOOLS |
79 |
- |
80 |
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) |
81 |
-- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ |
82 |
-+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} |
83 |
- |
84 |
- installtools: ${TOOLS} |
85 |
- @createdir="${INSTBINBASE}/${TOOLSDIR}" ; \ |
86 |
-@@ -478,7 +478,7 @@ |
87 |
- ifdef SOLIBRARY |
88 |
- |
89 |
- ${SOLIBRARY}: ${OBJECTS} |
90 |
-- ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS} |
91 |
-+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} |
92 |
- @D=`pwd` ; \ |
93 |
- createdir="${EXPORTBASE}/lib" ; \ |
94 |
- $(mkinstalldirs) $$createdir ; \ |
95 |
-@@ -509,7 +509,7 @@ |
96 |
- ifdef MODULE |
97 |
- |
98 |
- ${MODULE}: ${OBJECTS} |
99 |
-- ${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} |
100 |
-+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} |
101 |
- @D=`pwd` ; \ |
102 |
- createdir="${EXPORTBASE}/${MODULEDIR}" ; \ |
103 |
- $(mkinstalldirs) $$createdir ; \ |
104 |
---- a/src/libs/client/Makefile |
105 |
-+++ b/src/libs/client/Makefile |
106 |
-@@ -23,6 +23,8 @@ |
107 |
- SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \ |
108 |
- optionmenu.cpp |
109 |
- |
110 |
-+SOLIBS = -lconfscreens -lraceengine |
111 |
-+ |
112 |
- LIBS = -lplibssg -lplibsg -lplibul |
113 |
- |
114 |
- EXPDIR = include |
115 |
---- a/src/libs/Makefile |
116 |
-+++ b/src/libs/Makefile |
117 |
-@@ -23,7 +23,7 @@ |
118 |
- |
119 |
- TOOLSUBDIRS = txml |
120 |
- |
121 |
--SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \ |
122 |
-+SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \ |
123 |
- portability math |
124 |
- |
125 |
- PKGSUBDIRS = $(SUBDIRS) |
126 |
---- a/src/libs/raceengineclient/Makefile |
127 |
-+++ b/src/libs/raceengineclient/Makefile |
128 |
-@@ -23,6 +23,8 @@ |
129 |
- SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \ |
130 |
- raceengine.cpp raceresults.cpp |
131 |
- |
132 |
-+SOLIBS = -lconfscreens -lrobottools -lracescreens |
133 |
-+ |
134 |
- EXPDIR = include |
135 |
- |
136 |
- EXPORTS = singleplayer.h raceinit.h |
137 |
---- a/src/libs/tgf/Makefile |
138 |
-+++ b/src/libs/tgf/Makefile |
139 |
-@@ -29,6 +29,7 @@ |
140 |
- profiler.cpp \ |
141 |
- hash.cpp |
142 |
- |
143 |
-+SOLIBS = -ltxml |
144 |
- |
145 |
- EXPDIR = include |
146 |
- |
147 |
|
148 |
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch |
149 |
deleted file mode 100644 |
150 |
index 72c755af9eb..00000000000 |
151 |
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch |
152 |
+++ /dev/null |
153 |
@@ -1,35 +0,0 @@ |
154 |
---- a/configure.in 2012-03-13 08:15:34.891163505 +0100 |
155 |
-+++ b/configure.in 2012-03-13 08:18:40.154092687 +0100 |
156 |
-@@ -14,9 +14,10 @@ |
157 |
- # |
158 |
- ############################################################################## |
159 |
- |
160 |
--AC_INIT(Make-config.in) |
161 |
-+AC_INIT([speed-dreams], [1.4.0-r2307]) |
162 |
-+AC_CONFIG_SRCDIR([Make-config.in]) |
163 |
- AC_CONFIG_HEADERS(config.h) |
164 |
--AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307) |
165 |
-+AC_DEFINE(VERSION, ["1.4.0-r2307"], [Version]) |
166 |
- |
167 |
- dnl Checks for programs. |
168 |
- AC_PROG_CC |
169 |
---- a/Makefile 2012-03-13 10:43:30.563720337 +0100 |
170 |
-+++ b/Makefile 2012-03-13 10:44:26.339794119 +0100 |
171 |
-@@ -88,17 +88,7 @@ |
172 |
- -include ${MAKE_DEFAULT} |
173 |
- |
174 |
- Make-config: configure Make-config.in |
175 |
-- rm -f config.status config.log config.cache |
176 |
- ./configure |
177 |
-- rm -f config.status config.log config.cache |
178 |
-- |
179 |
--configure: configure.in config.h.in aclocal.m4 |
180 |
-- rm -f config.status config.log config.cache |
181 |
-- autoheader |
182 |
-- autoconf |
183 |
-- |
184 |
--aclocal.m4: acinclude.m4 |
185 |
-- aclocal |
186 |
- |
187 |
- distclean: clean |
188 |
- rm -f config.status config.log config.cache |
189 |
|
190 |
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch |
191 |
deleted file mode 100644 |
192 |
index 6b09ce2a41c..00000000000 |
193 |
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch |
194 |
+++ /dev/null |
195 |
@@ -1,20 +0,0 @@ |
196 |
---- a/src/libs/tgfclient/img.cpp |
197 |
-+++ b/src/libs/tgfclient/img.cpp |
198 |
-@@ -98,7 +98,7 @@ |
199 |
- return (unsigned char *)NULL; |
200 |
- } |
201 |
- |
202 |
-- if (setjmp(png_ptr->jmpbuf)) |
203 |
-+ if (setjmp(png_jmpbuf(png_ptr))) |
204 |
- { |
205 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
206 |
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); |
207 |
-@@ -229,7 +229,7 @@ |
208 |
- return -1; |
209 |
- } |
210 |
- |
211 |
-- if (setjmp(png_ptr->jmpbuf)) { |
212 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
213 |
- png_destroy_write_struct(&png_ptr, &info_ptr); |
214 |
- fclose(fp); |
215 |
- return -1; |
216 |
|
217 |
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch |
218 |
deleted file mode 100644 |
219 |
index 32b4f85a200..00000000000 |
220 |
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch |
221 |
+++ /dev/null |
222 |
@@ -1,25 +0,0 @@ |
223 |
-https://sourceforge.net/p/speed-dreams/tickets/952/ |
224 |
-https://bugs.gentoo.org/580054 |
225 |
- |
226 |
---- a/src/modules/simu/simuv2/simu.cpp |
227 |
-+++ b/src/modules/simu/simuv2/simu.cpp |
228 |
-@@ -61,7 +61,7 @@ |
229 |
- if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; |
230 |
- if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0; |
231 |
- if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0; |
232 |
-- if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0; |
233 |
-+ if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0; |
234 |
- #else |
235 |
- if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0; |
236 |
- if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; |
237 |
---- a/src/modules/simu/simuv3/simu.cpp |
238 |
-+++ b/src/modules/simu/simuv3/simu.cpp |
239 |
-@@ -61,7 +61,7 @@ |
240 |
- if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; |
241 |
- if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0; |
242 |
- if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0; |
243 |
-- if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0; |
244 |
-+ if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0; |
245 |
- #else |
246 |
- if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0; |
247 |
- if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; |
248 |
|
249 |
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml |
250 |
index 98a79c4a7da..11c234f855b 100644 |
251 |
--- a/games-sports/speed-dreams/metadata.xml |
252 |
+++ b/games-sports/speed-dreams/metadata.xml |
253 |
@@ -8,7 +8,6 @@ |
254 |
<use> |
255 |
<flag name="osggraph">Enable the new work-in-progress 3D engine using <pkg>dev-games/openscenegraph</pkg></flag> |
256 |
<flag name="webstats">Enable support for sending racing statistics to a web server (experimental)</flag> |
257 |
- <flag name="xrandr">Enable support for the X xrandr extension</flag> |
258 |
</use> |
259 |
<upstream> |
260 |
<remote-id type="sourceforge">speed-dreams</remote-id> |
261 |
|
262 |
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild |
263 |
deleted file mode 100644 |
264 |
index d57867be7fb..00000000000 |
265 |
--- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild |
266 |
+++ /dev/null |
267 |
@@ -1,85 +0,0 @@ |
268 |
-# Copyright 1999-2021 Gentoo Authors |
269 |
-# Distributed under the terms of the GNU General Public License v2 |
270 |
- |
271 |
-EAPI=6 |
272 |
- |
273 |
-inherit autotools desktop versionator |
274 |
- |
275 |
-DESCRIPTION="A fork of the famous open racing car simulator TORCS" |
276 |
-HOMEPAGE="http://speed-dreams.sourceforge.net/" |
277 |
-SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2" |
278 |
- |
279 |
-LICENSE="GPL-2" |
280 |
-SLOT="0" |
281 |
-KEYWORDS="~amd64 ~x86" |
282 |
-IUSE="xrandr" |
283 |
- |
284 |
-RDEPEND="virtual/opengl |
285 |
- virtual/glu |
286 |
- media-libs/freealut |
287 |
- media-libs/freeglut |
288 |
- >=media-libs/libpng-1.2.40:0 |
289 |
- media-libs/openal |
290 |
- sys-libs/zlib |
291 |
- x11-libs/libX11 |
292 |
- x11-libs/libXxf86vm |
293 |
- xrandr? ( x11-libs/libXrandr )" |
294 |
-DEPEND="${RDEPEND} |
295 |
- >=media-libs/plib-1.8.3 |
296 |
- x11-libs/libICE |
297 |
- x11-libs/libSM |
298 |
- x11-libs/libXext |
299 |
- x11-libs/libXi |
300 |
- x11-libs/libXt |
301 |
- x11-libs/libXmu |
302 |
- x11-libs/libXrender |
303 |
- x11-base/xorg-proto" |
304 |
- |
305 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src |
306 |
- |
307 |
-PATCHES=( |
308 |
- "${FILESDIR}"/${P}-asneeded.patch |
309 |
- "${FILESDIR}"/${P}-automake.patch |
310 |
- "${FILESDIR}"/${P}-libpng15.patch |
311 |
- "${FILESDIR}"/${P}-math-hack.patch |
312 |
-) |
313 |
- |
314 |
-src_prepare() { |
315 |
- default |
316 |
- |
317 |
- # https://sourceforge.net/apps/trac/speed-dreams/ticket/111 |
318 |
- MAKEOPTS="${MAKEOPTS} -j1" |
319 |
- |
320 |
- sed -i \ |
321 |
- -e '/ADDCFLAGS/s: -O2::' \ |
322 |
- configure.in || die |
323 |
- sed -i \ |
324 |
- -e '/COPYING/s:=.*:= \\:' \ |
325 |
- Makefile || die |
326 |
- sed -i \ |
327 |
- -e '/LDFLAGS/s:-L/usr/lib::' \ |
328 |
- -e "/^datadir/s:=.*:= /usr/share/games/${PN}:" \ |
329 |
- Make-config.in || die |
330 |
- |
331 |
- eautoreconf |
332 |
-} |
333 |
- |
334 |
-src_configure() { |
335 |
- addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g') |
336 |
- [[ -e /dev/dsp ]] && addpredict /dev/dsp |
337 |
- econf \ |
338 |
- --prefix=/usr \ |
339 |
- --bindir=/usr/bin \ |
340 |
- $(use_enable xrandr) |
341 |
-} |
342 |
- |
343 |
-src_install() { |
344 |
- emake DESTDIR="${ED}" install datainstall |
345 |
- |
346 |
- find "${ED}" -name Makefile -exec rm -f {} + || die |
347 |
- |
348 |
- dodoc CHANGES README TODO |
349 |
- |
350 |
- newicon icon.svg ${PN}.svg |
351 |
- make_desktop_entry ${PN} "Speed Dreams" |
352 |
-} |