1 |
commit: eb79d9ed21f592b47c1b49c01c8a4f090374174a |
2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
3 |
AuthorDate: Wed Aug 28 23:09:29 2013 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Wed Aug 28 23:09:29 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=eb79d9ed |
7 |
|
8 |
[media-libs/sdl, games-*] Fix for bug #482850 |
9 |
|
10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
11 |
|
12 |
--- |
13 |
games-arcade/capsized/capsized-06102013.ebuild | 7 +- |
14 |
games-arcade/edge/edge-20130703.ebuild | 2 +- |
15 |
games-arcade/rush/rush-20130703.ebuild | 2 +- |
16 |
games-arcade/tokitori/tokitori-20130703.ebuild | 2 +- |
17 |
games-fps/xonotic/xonotic-9999.ebuild | 4 +- |
18 |
games-puzzle/spirits/spirits-1.0.1.ebuild | 2 +- |
19 |
.../files/libsdl-universal_xdata32_check.patch | 49 -------- |
20 |
media-libs/libsdl/libsdl-2.0.0.ebuild | 134 --------------------- |
21 |
media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild | 116 ------------------ |
22 |
media-libs/libsdl/metadata.xml | 37 ------ |
23 |
media-libs/sdl-image/metadata.xml | 26 ---- |
24 |
media-libs/sdl-image/sdl-image-2.0.0_pre407.ebuild | 76 ------------ |
25 |
media-libs/sdl-ttf/metadata.xml | 19 --- |
26 |
media-libs/sdl-ttf/sdl-ttf-2.0.12_pre242.ebuild | 40 ------ |
27 |
14 files changed, 10 insertions(+), 506 deletions(-) |
28 |
|
29 |
diff --git a/games-arcade/capsized/capsized-06102013.ebuild b/games-arcade/capsized/capsized-06102013.ebuild |
30 |
index 77d39f9..c461bc6 100644 |
31 |
--- a/games-arcade/capsized/capsized-06102013.ebuild |
32 |
+++ b/games-arcade/capsized/capsized-06102013.ebuild |
33 |
@@ -25,11 +25,12 @@ RDEPEND=" |
34 |
media-libs/libvorbis |
35 |
dev-lang/mono |
36 |
media-libs/openal |
37 |
- media-libs/libsdl:2 |
38 |
+ media-libs/libsdl2 |
39 |
+ media-libs/sdl2-mixer |
40 |
" |
41 |
# dev-dotnet/monogame # someday |
42 |
# dev-dotnet/monogame-theoraplay # someday |
43 |
-# media-libs/sdl-mixer # when 2.0 tarball will be released |
44 |
+# media-libs/theoraplay # someday |
45 |
|
46 |
DOCS=( "Linux.README" ) |
47 |
|
48 |
@@ -74,7 +75,7 @@ src_install() { |
49 |
# Also installing bundled theoraplay, since in is no such package in |
50 |
# portage. |
51 |
insinto "${GAMEDIR}/$(get_libdir)" |
52 |
- doins "$(get_libdir)/libSDL2_mixer-2.0.so.0" |
53 |
+# doins "$(get_libdir)/libSDL2_mixer-2.0.so.0" |
54 |
doins "$(get_libdir)/libtheoraplay.so" |
55 |
|
56 |
games_make_wrapper "${PN}" "mono ./NePlusUltra.exe" "${GAMEDIR}" "${GAMEDIR}/$(get_libdir)" |
57 |
|
58 |
diff --git a/games-arcade/edge/edge-20130703.ebuild b/games-arcade/edge/edge-20130703.ebuild |
59 |
index 6ae14a5..6184fba 100644 |
60 |
--- a/games-arcade/edge/edge-20130703.ebuild |
61 |
+++ b/games-arcade/edge/edge-20130703.ebuild |
62 |
@@ -18,7 +18,7 @@ IUSE="" |
63 |
|
64 |
DEPEND="" |
65 |
RDEPEND="${DEPEND} |
66 |
- media-libs/libsdl:2 |
67 |
+ media-libs/libsdl2 |
68 |
media-libs/openal |
69 |
sys-libs/zlib |
70 |
" |
71 |
|
72 |
diff --git a/games-arcade/rush/rush-20130703.ebuild b/games-arcade/rush/rush-20130703.ebuild |
73 |
index 0ebf6e0..c5cc279 100644 |
74 |
--- a/games-arcade/rush/rush-20130703.ebuild |
75 |
+++ b/games-arcade/rush/rush-20130703.ebuild |
76 |
@@ -19,7 +19,7 @@ IUSE="" |
77 |
|
78 |
DEPEND="" |
79 |
RDEPEND="${DEPEND} |
80 |
- media-libs/libsdl:2 |
81 |
+ media-libs/libsdl2 |
82 |
media-libs/openal |
83 |
sys-libs/zlib |
84 |
" |
85 |
|
86 |
diff --git a/games-arcade/tokitori/tokitori-20130703.ebuild b/games-arcade/tokitori/tokitori-20130703.ebuild |
87 |
index 5c10462..eece263 100644 |
88 |
--- a/games-arcade/tokitori/tokitori-20130703.ebuild |
89 |
+++ b/games-arcade/tokitori/tokitori-20130703.ebuild |
90 |
@@ -18,7 +18,7 @@ IUSE="" |
91 |
|
92 |
DEPEND="" |
93 |
RDEPEND="${DEPEND} |
94 |
- media-libs/libsdl:2 |
95 |
+ media-libs/libsdl2 |
96 |
media-libs/openal |
97 |
sys-libs/zlib |
98 |
" |
99 |
|
100 |
diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild |
101 |
index 826433a..7f43629 100644 |
102 |
--- a/games-fps/xonotic/xonotic-9999.ebuild |
103 |
+++ b/games-fps/xonotic/xonotic-9999.ebuild |
104 |
@@ -49,8 +49,8 @@ RDEPEND=" |
105 |
) |
106 |
sdl? ( |
107 |
${UIRDEPEND} |
108 |
- !sdl2? ( media-libs/libsdl:0[X,audio,joystick,opengl,video] ) |
109 |
- sdl2? ( media-libs/libsdl:2[X,opengl,video] ) |
110 |
+ !sdl2? ( media-libs/libsdl[X,audio,joystick,opengl,video] ) |
111 |
+ sdl2? ( media-libs/libsdl2[X,opengl,video] ) |
112 |
) |
113 |
" |
114 |
DEPEND="${RDEPEND} |
115 |
|
116 |
diff --git a/games-puzzle/spirits/spirits-1.0.1.ebuild b/games-puzzle/spirits/spirits-1.0.1.ebuild |
117 |
index f4235ac..ffec38b 100644 |
118 |
--- a/games-puzzle/spirits/spirits-1.0.1.ebuild |
119 |
+++ b/games-puzzle/spirits/spirits-1.0.1.ebuild |
120 |
@@ -7,7 +7,7 @@ MY_PN="Spirits" |
121 |
|
122 |
inherit games |
123 |
|
124 |
-DESCRIPTION="a tetrominoes game (i.e.: a Tetris clone) that uses the Xbox 360 Kinect" |
125 |
+DESCRIPTION="Save the spirits of leaf litters" |
126 |
HOMEPAGE="http://www.spacesofplay.com/spirits/" |
127 |
SRC_URI="${PN}-linux-${PV}_120903-1348705231.zip" |
128 |
|
129 |
|
130 |
diff --git a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch |
131 |
deleted file mode 100644 |
132 |
index d741025..0000000 |
133 |
--- a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch |
134 |
+++ /dev/null |
135 |
@@ -1,49 +0,0 @@ |
136 |
-# HG changeset patch |
137 |
-# User Azamat H. Hackimov <azamat.hackimov@×××××.com> |
138 |
-# Date 1370413935 -21600 |
139 |
-# Node ID 00d5ada80b60f6e163a2ebbb5949515dd9646458 |
140 |
-# Parent 2a858d938e21eb4f6f4496f29557a1fa14b566b4 |
141 |
-Make _XData32 checking universal for 32 and 64 architectures. |
142 |
-_XData32 is used only for 64, so there should be no regression in 32bit |
143 |
-enviroment. |
144 |
-This commit intended for making universal SDL_config.h in mixed 32/64 |
145 |
-enviroment. |
146 |
- |
147 |
-diff -r 2a858d938e21 -r 00d5ada80b60 cmake/sdlchecks.cmake |
148 |
---- a/cmake/sdlchecks.cmake Wed Jun 05 12:28:53 2013 +0600 |
149 |
-+++ b/cmake/sdlchecks.cmake Wed Jun 05 12:32:15 2013 +0600 |
150 |
-@@ -357,6 +357,7 @@ |
151 |
- endif(HAVE_XGENERICEVENT) |
152 |
- |
153 |
- check_c_source_compiles(" |
154 |
-+ #define LONG64 |
155 |
- #include <X11/Xlibint.h> |
156 |
- extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
157 |
- int main(int argc, char **argv) {}" HAVE_CONST_XDATA32) |
158 |
-diff -r 2a858d938e21 -r 00d5ada80b60 configure.in |
159 |
---- a/configure.in Wed Jun 05 12:28:53 2013 +0600 |
160 |
-+++ b/configure.in Wed Jun 05 12:32:15 2013 +0600 |
161 |
-@@ -1147,14 +1147,15 @@ |
162 |
- AC_MSG_CHECKING(for const parameter to _XData32) |
163 |
- have_const_param_xdata32=no |
164 |
- AC_TRY_COMPILE([ |
165 |
-- #include <X11/Xlibint.h> |
166 |
-- extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
167 |
-- ],[ |
168 |
-- ],[ |
169 |
-- have_const_param_xdata32=yes |
170 |
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) |
171 |
-- ]) |
172 |
-- AC_MSG_RESULT($have_const_param_xdata32) |
173 |
-+ #define LONG64 |
174 |
-+ #include <X11/Xlibint.h> |
175 |
-+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
176 |
-+ ],[ |
177 |
-+ ],[ |
178 |
-+ have_const_param_xdata32=yes |
179 |
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) |
180 |
-+ ]) |
181 |
-+ AC_MSG_RESULT($have_const_param_xdata32) |
182 |
- |
183 |
- dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent])) |
184 |
- AC_MSG_CHECKING([for XGenericEvent]) |
185 |
|
186 |
diff --git a/media-libs/libsdl/libsdl-2.0.0.ebuild b/media-libs/libsdl/libsdl-2.0.0.ebuild |
187 |
deleted file mode 100644 |
188 |
index 61e76d2..0000000 |
189 |
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild |
190 |
+++ /dev/null |
191 |
@@ -1,134 +0,0 @@ |
192 |
-# Copyright 1999-2013 Gentoo Foundation |
193 |
-# Distributed under the terms of the GNU General Public License v2 |
194 |
-# $Header: $ |
195 |
- |
196 |
-EAPI=5 |
197 |
- |
198 |
-inherit cmake-multilib eutils |
199 |
- |
200 |
-MY_PV=${PV/_pre/-} |
201 |
- |
202 |
-DESCRIPTION="Simple Direct Media Layer" |
203 |
-HOMEPAGE="http://www.libsdl.org/" |
204 |
-SRC_URI="http://www.libsdl.org/release/SDL2-${MY_PV}.tar.gz" |
205 |
-LICENSE="ZLIB" |
206 |
-SLOT="2" |
207 |
-KEYWORDS="~amd64 ~x86" |
208 |
-IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver" |
209 |
- |
210 |
-#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage. |
211 |
-#FIXME: media-libs/nas no have emul-* ebuild |
212 |
-#FIXME: virtual/opengl for abi_x86_32 require additional handling |
213 |
-RDEPEND=" |
214 |
- nas? ( |
215 |
- media-libs/nas |
216 |
- ( || ( app-emulation/emul-linux-x86-xlibs |
217 |
- ( x11-libs/libX11[${MULTILIB_USEDEP}] |
218 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
219 |
- x11-libs/libXt[${MULTILIB_USEDEP}] ) |
220 |
- ) ) |
221 |
- ) |
222 |
- X? ( || ( app-emulation/emul-linux-x86-xlibs |
223 |
- ( x11-libs/libX11[${MULTILIB_USEDEP}] |
224 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
225 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
226 |
- x11-libs/libXi[${MULTILIB_USEDEP}] |
227 |
- x11-libs/libXt[${MULTILIB_USEDEP}] |
228 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
229 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
230 |
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}] ) |
231 |
- ) |
232 |
- ) |
233 |
- xinerama? ( || ( |
234 |
- app-emulation/emul-linux-x86-xlibs |
235 |
- x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) |
236 |
- xscreensaver? ( || ( |
237 |
- app-emulation/emul-linux-x86-xlibs |
238 |
- x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] ) ) |
239 |
- alsa? ( || ( |
240 |
- app-emulation/emul-linux-x86-soundlibs |
241 |
- media-libs/alsa-lib[${MULTILIB_USEDEP}] ) ) |
242 |
- fusionsound? ( >=media-libs/FusionSound-1.1.1 ) |
243 |
- pulseaudio? ( |
244 |
- amd64? ( app-emulation/emul-linux-x86-soundlibs ) |
245 |
- x86? ( media-sound/pulseaudio ) |
246 |
- ) |
247 |
- gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) |
248 |
- opengl? ( virtual/opengl ) |
249 |
- tslib? ( x11-libs/tslib ) |
250 |
-" |
251 |
- |
252 |
-DEPEND="${RDEPEND} |
253 |
- nas? ( |
254 |
- ( || ( app-emulation/emul-linux-x86-xlibs |
255 |
- ( x11-proto/xextproto[${MULTILIB_USEDEP}] |
256 |
- x11-proto/xproto[${MULTILIB_USEDEP}] ) |
257 |
- ) ) |
258 |
- ) |
259 |
- X? ( |
260 |
- ( || ( app-emulation/emul-linux-x86-xlibs |
261 |
- ( x11-proto/inputproto[${MULTILIB_USEDEP}] |
262 |
- x11-proto/xextproto[${MULTILIB_USEDEP}] |
263 |
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] |
264 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
265 |
- x11-proto/randrproto[${MULTILIB_USEDEP}] |
266 |
- x11-proto/renderproto[${MULTILIB_USEDEP}] ) |
267 |
- ) ) |
268 |
- ) |
269 |
- xinerama? ( || ( app-emulation/emul-linux-x86-xlibs |
270 |
- x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) ) |
271 |
- xscreensaver? ( || ( app-emulation/emul-linux-x86-xlibs |
272 |
- x11-proto/scrnsaverproto[${MULTILIB_USEDEP}] ) ) |
273 |
-" |
274 |
- |
275 |
-S=${WORKDIR}/SDL2-${MY_PV} |
276 |
- |
277 |
-DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt ) |
278 |
- |
279 |
-src_prepare() { |
280 |
- # Make headers more universal for 32/64 archs. |
281 |
- # See http://bugzilla.libsdl.org/show_bug.cgi?id=1893 |
282 |
- epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch" |
283 |
- |
284 |
- epatch_user |
285 |
-} |
286 |
- |
287 |
-src_configure() { |
288 |
- mycmakeargs=( |
289 |
- # Disable assertion tests. |
290 |
- -DASSERTIONS=disabled |
291 |
- # Avoid hard-coding RPATH entries into dynamically linked SDL libraries. |
292 |
- -DRPATH=NO |
293 |
- # Disable obsolete and/or inapplicable libraries. |
294 |
- -DARTS=NO |
295 |
- -DESD=NO |
296 |
- $(cmake-utils_use 3dnow 3DNOW) |
297 |
- $(cmake-utils_use alsa ALSA) |
298 |
- $(cmake-utils_use altivec ALTIVEC) |
299 |
- $(cmake-utils_use asm ASSEMBLY) |
300 |
- $(cmake-utils_use aqua VIDEO_COCOA) |
301 |
- $(cmake-utils_use fusionsound FUSIONSOUND) |
302 |
- $(cmake-utils_use gles VIDEO_OPENGLES) |
303 |
- $(cmake-utils_use mmx MMX) |
304 |
- $(cmake-utils_use nas NAS) |
305 |
- $(cmake-utils_use opengl VIDEO_OPENGL) |
306 |
- $(cmake-utils_use oss OSS) |
307 |
- $(cmake-utils_use pulseaudio PULSEAUDIO) |
308 |
- $(cmake-utils_use threads PTHREADS) |
309 |
- $(cmake-utils_use sse SSE) |
310 |
- $(cmake-utils_use sse SSEMATH) |
311 |
- $(cmake-utils_use sse2 SSE2) |
312 |
- $(cmake-utils_use static-libs SDL_STATIC) |
313 |
- $(cmake-utils_use tslib INPUT_TSLIB) |
314 |
- $(cmake-utils_use video VIDEO_DUMMY) |
315 |
- $(cmake-utils_use X VIDEO_X11) |
316 |
- $(cmake-utils_use X VIDEO_X11_XCURSOR) |
317 |
- $(cmake-utils_use xinerama VIDEO_X11_XINERAMA) |
318 |
- $(cmake-utils_use X VIDEO_X11_XINPUT) |
319 |
- $(cmake-utils_use X VIDEO_X11_XRANDR) |
320 |
- $(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER) |
321 |
- $(cmake-utils_use X VIDEO_X11_XVM) |
322 |
- #$(cmake-utils_use joystick SDL_JOYSTICK) |
323 |
- ) |
324 |
- cmake-multilib_src_configure |
325 |
-} |
326 |
|
327 |
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild |
328 |
deleted file mode 100644 |
329 |
index 52cd43d..0000000 |
330 |
--- a/media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild |
331 |
+++ /dev/null |
332 |
@@ -1,116 +0,0 @@ |
333 |
-# Copyright 1999-2013 Gentoo Foundation |
334 |
-# Distributed under the terms of the GNU General Public License v2 |
335 |
-# $Header: $ |
336 |
- |
337 |
-EAPI=5 |
338 |
- |
339 |
-inherit cmake-multilib eutils |
340 |
- |
341 |
-MY_PV=${PV/_pre/-} |
342 |
- |
343 |
-DESCRIPTION="Simple Direct Media Layer" |
344 |
-HOMEPAGE="http://www.libsdl.org/" |
345 |
-SRC_URI="http://www.libsdl.org/tmp/SDL-${MY_PV}.tar.gz" |
346 |
-LICENSE="ZLIB" |
347 |
-SLOT="2" |
348 |
-KEYWORDS="~amd64 ~x86" |
349 |
-IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver" |
350 |
- |
351 |
-#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage. |
352 |
-#FIXME: media-libs/nas no have emul-* ebuild |
353 |
-#FIXME: virtual/opengl for abi_x86_32 require additional handling |
354 |
-RDEPEND=" |
355 |
- nas? ( |
356 |
- media-libs/nas |
357 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
358 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
359 |
- x11-libs/libXt[${MULTILIB_USEDEP}] |
360 |
- ) |
361 |
- X? ( |
362 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
363 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
364 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
365 |
- x11-libs/libXi[${MULTILIB_USEDEP}] |
366 |
- x11-libs/libXt[${MULTILIB_USEDEP}] |
367 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
368 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
369 |
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}] |
370 |
- ) |
371 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
372 |
- xscreensaver? ( x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] ) |
373 |
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
374 |
- fusionsound? ( >=media-libs/FusionSound-1.1.1 ) |
375 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9 ) |
376 |
- gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) |
377 |
- opengl? ( virtual/opengl ) |
378 |
- tslib? ( x11-libs/tslib ) |
379 |
-" |
380 |
- |
381 |
-DEPEND="${RDEPEND} |
382 |
- nas? ( |
383 |
- x11-proto/xextproto[${MULTILIB_USEDEP}] |
384 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
385 |
- ) |
386 |
- X? ( |
387 |
- x11-proto/inputproto[${MULTILIB_USEDEP}] |
388 |
- x11-proto/xextproto[${MULTILIB_USEDEP}] |
389 |
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] |
390 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
391 |
- x11-proto/randrproto[${MULTILIB_USEDEP}] |
392 |
- x11-proto/renderproto[${MULTILIB_USEDEP}] |
393 |
- ) |
394 |
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
395 |
- xscreensaver? ( x11-proto/scrnsaverproto[${MULTILIB_USEDEP}] ) |
396 |
-" |
397 |
- |
398 |
-S=${WORKDIR}/SDL-${MY_PV} |
399 |
- |
400 |
-DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt ) |
401 |
- |
402 |
-src_prepare() { |
403 |
- # Make headers more universal for 32/64 archs. |
404 |
- # See http://bugzilla.libsdl.org/show_bug.cgi?id=1893 |
405 |
- epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch" |
406 |
- |
407 |
- epatch_user |
408 |
-} |
409 |
- |
410 |
-src_configure() { |
411 |
- mycmakeargs=( |
412 |
- # Disable assertion tests. |
413 |
- -DASSERTIONS=disabled |
414 |
- # Avoid hard-coding RPATH entries into dynamically linked SDL libraries. |
415 |
- -DRPATH=NO |
416 |
- # Disable obsolete and/or inapplicable libraries. |
417 |
- -DARTS=NO |
418 |
- -DESD=NO |
419 |
- $(cmake-utils_use 3dnow 3DNOW) |
420 |
- $(cmake-utils_use alsa ALSA) |
421 |
- $(cmake-utils_use altivec ALTIVEC) |
422 |
- $(cmake-utils_use asm ASSEMBLY) |
423 |
- $(cmake-utils_use aqua VIDEO_COCOA) |
424 |
- $(cmake-utils_use fusionsound FUSIONSOUND) |
425 |
- $(cmake-utils_use gles VIDEO_OPENGLES) |
426 |
- $(cmake-utils_use mmx MMX) |
427 |
- $(cmake-utils_use nas NAS) |
428 |
- $(cmake-utils_use opengl VIDEO_OPENGL) |
429 |
- $(cmake-utils_use oss OSS) |
430 |
- $(cmake-utils_use pulseaudio PULSEAUDIO) |
431 |
- $(cmake-utils_use threads PTHREADS) |
432 |
- $(cmake-utils_use sse SSE) |
433 |
- $(cmake-utils_use sse SSEMATH) |
434 |
- $(cmake-utils_use sse2 SSE2) |
435 |
- $(cmake-utils_use static-libs SDL_STATIC) |
436 |
- $(cmake-utils_use tslib INPUT_TSLIB) |
437 |
- $(cmake-utils_use video VIDEO_DUMMY) |
438 |
- $(cmake-utils_use X VIDEO_X11) |
439 |
- $(cmake-utils_use X VIDEO_X11_XCURSOR) |
440 |
- $(cmake-utils_use xinerama VIDEO_X11_XINERAMA) |
441 |
- $(cmake-utils_use X VIDEO_X11_XINPUT) |
442 |
- $(cmake-utils_use X VIDEO_X11_XRANDR) |
443 |
- $(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER) |
444 |
- $(cmake-utils_use X VIDEO_X11_XVM) |
445 |
- #$(cmake-utils_use joystick SDL_JOYSTICK) |
446 |
- ) |
447 |
- cmake-multilib_src_configure |
448 |
-} |
449 |
|
450 |
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml |
451 |
deleted file mode 100644 |
452 |
index 6a3aa9f..0000000 |
453 |
--- a/media-libs/libsdl/metadata.xml |
454 |
+++ /dev/null |
455 |
@@ -1,37 +0,0 @@ |
456 |
-<?xml version="1.0" encoding="UTF-8"?> |
457 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
458 |
-<pkgmetadata> |
459 |
- <maintainer> |
460 |
- <email>azamat.hackimov@×××××.com</email> |
461 |
- <name>Azamat H. Hackimov</name> |
462 |
- </maintainer> |
463 |
- <longdescription> |
464 |
-Simple DirectMedia Layer is a cross-platform multimedia library designed |
465 |
-to provide low level access to audio, keyboard, mouse, joystick, 3D |
466 |
-hardware via OpenGL, and 2D video framebuffer. It is used by MPEG |
467 |
-playback software, emulators, and many popular games, including the |
468 |
-award winning Linux port of "Civilization: Call To Power." |
469 |
- |
470 |
-SDL supports Linux, Windows, Windows CE, BeOS, MacOS, MacOS X, FreeBSD, |
471 |
-NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. The code also contains |
472 |
-support for AmigaOS, Dreamcast, Atari, AIX, OSF/Tru64, RISC OS, |
473 |
-SymbianOS, and OS/2, but these are not officially supported. |
474 |
- |
475 |
-SDL is written in C, but works with C++ natively, and has bindings to |
476 |
-several other languages, including Ada, C#, D, Eiffel, Erlang, Euphoria, |
477 |
-Go, Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP, |
478 |
-Pike, Pliant, Python, Ruby, Smalltalk, and Tcl. |
479 |
-</longdescription> |
480 |
- <upstream> |
481 |
- <doc lang="en">http://www.libsdl.org/cgi/docwiki.cgi</doc> |
482 |
- <bugs-to>http://bugzilla.libsdl.org</bugs-to> |
483 |
- </upstream> |
484 |
- <use> |
485 |
- <!--flag name="directx">Adds support for Windows DirectX audio and video</flag--> |
486 |
- <flag name="asm">Enable assembly for optimization (3dnow, mmx, sse, sse2)</flag> |
487 |
- <flag name="fusionsound">Enable FusionSound audio support</flag> |
488 |
- <flag name="gles">Enable OpenGL ES video support</flag> |
489 |
- <flag name="tslib">Enable tslib-based touchscreen device support</flag> |
490 |
- <flag name="video">Control video support (disable at your own risk)</flag> |
491 |
- </use> |
492 |
-</pkgmetadata> |
493 |
|
494 |
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml |
495 |
deleted file mode 100644 |
496 |
index 3b85aaf..0000000 |
497 |
--- a/media-libs/sdl-image/metadata.xml |
498 |
+++ /dev/null |
499 |
@@ -1,26 +0,0 @@ |
500 |
-<?xml version="1.0" encoding="UTF-8"?> |
501 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
502 |
-<pkgmetadata> |
503 |
- <maintainer> |
504 |
- <email>azamat.hackimov@×××××.com</email> |
505 |
- <name>Azamat H. Hackimov</name> |
506 |
- </maintainer> |
507 |
- <longdescription> |
508 |
-SDL_image is an image file loading library. It loads images as SDL surfaces, and |
509 |
-supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, |
510 |
-WEBP, XCF, XPM, XV. |
511 |
-</longdescription> |
512 |
- <upstream> |
513 |
- <doc lang="en">http://www.libsdl.org/projects/SDL_image/docs/index.html</doc> |
514 |
- </upstream> |
515 |
- <use> |
516 |
- <flag name="bmp">Enable BMP image format support</flag> |
517 |
- <flag name="lbm">Enable LBM image format support</flag> |
518 |
- <flag name="pcx">Enable PCX image format support</flag> |
519 |
- <flag name="pnm">Enable PNM image format support</flag> |
520 |
- <flag name="showimage">Install the "showimage" test command</flag> |
521 |
- <flag name="tga">Enable TGA image format support</flag> |
522 |
- <flag name="webp">Enable WEBP image format support</flag> |
523 |
- <flag name="xcf">Enable XCF image format support</flag> |
524 |
- </use> |
525 |
-</pkgmetadata> |
526 |
|
527 |
diff --git a/media-libs/sdl-image/sdl-image-2.0.0_pre407.ebuild b/media-libs/sdl-image/sdl-image-2.0.0_pre407.ebuild |
528 |
deleted file mode 100644 |
529 |
index 77d030d..0000000 |
530 |
--- a/media-libs/sdl-image/sdl-image-2.0.0_pre407.ebuild |
531 |
+++ /dev/null |
532 |
@@ -1,76 +0,0 @@ |
533 |
-# Copyright 1999-2013 Gentoo Foundation |
534 |
-# Distributed under the terms of the GNU General Public License v2 |
535 |
-# $Header: $ |
536 |
-EAPI=5 |
537 |
- |
538 |
-inherit eutils mercurial versionator |
539 |
- |
540 |
-MY_PV=${PV/_pre/-} |
541 |
-EHG_REVISION=$(get_version_component_range 4 ${MY_PV}) |
542 |
- |
543 |
-DESCRIPTION="Image file loading library" |
544 |
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image" |
545 |
-EHG_REPO_URI="http://hg.libsdl.org/SDL_image" |
546 |
- |
547 |
-LICENSE="ZLIB" |
548 |
-SLOT="2" |
549 |
-KEYWORDS="~amd64 ~x86" |
550 |
- |
551 |
-#FIXME: Add "test". |
552 |
-IUSE="showimage static-libs +bmp +gif +jpeg +lbm +pcx +png +pnm +tga +tiff +xcf +xv +xpm +webp" |
553 |
- |
554 |
-RDEPEND=" |
555 |
- media-libs/libsdl:2 |
556 |
- jpeg? ( virtual/jpeg ) |
557 |
- png? ( >=media-libs/libpng-1.5.7 >=sys-libs/zlib-1.2.5 ) |
558 |
- tiff? ( >=media-libs/tiff-4.0.0 ) |
559 |
- webp? ( >=media-libs/libwebp-0.1.3 ) |
560 |
-" |
561 |
-DEPEND="${RDEPEND}" |
562 |
- |
563 |
-S="${WORKDIR}/SDL_image-${MY_PV}" |
564 |
- |
565 |
-src_configure() { |
566 |
- local myeconfargs=( |
567 |
- # Disable support for OS X ImageIO library. |
568 |
- --disable-imageio |
569 |
- $(use_enable static-libs static) |
570 |
- $(use_enable bmp) |
571 |
- $(use_enable gif) |
572 |
- $(use_enable jpeg jpg) |
573 |
- $(use_enable lbm) |
574 |
- $(use_enable pcx) |
575 |
- $(use_enable png) |
576 |
- $(use_enable pnm) |
577 |
- $(use_enable tga) |
578 |
- $(use_enable tiff tif) |
579 |
- $(use_enable xcf) |
580 |
- $(use_enable xv) |
581 |
- $(use_enable xpm) |
582 |
- $(use_enable webp) |
583 |
- ) |
584 |
- |
585 |
- # SDL_image 2.0 ships with a demonstrably horrible "configure" script. By |
586 |
- # default, this script adds globals to the created "Makefile" resembling: |
587 |
- # |
588 |
- # AUTOCONF = /bin/sh /var/tmp/portage/media-libs/sdl-image-9999/work/SDL_image/missing --run autoconf-1.10 |
589 |
- # |
590 |
- # On running "make", "Makefile" then attempts to run the expansion of |
591 |
- # "$(AUTOCONF)". Since the system is unlikely to have autoconf-1.0, the |
592 |
- # "missing" script naturally fails with non-zero exit status. To sidestep |
593 |
- # this insanity, force "configure" to instead set globals resembling: |
594 |
- # |
595 |
- # AUTOCONF = true --run autoconf-1.10 |
596 |
- # |
597 |
- # Since "true" always succeeds with zero exit status, this forces sanity. |
598 |
- MISSING=true econf "${myeconfargs[@]}" |
599 |
-} |
600 |
- |
601 |
-src_install() { |
602 |
- emake DESTDIR="${D}" install |
603 |
- dodoc {CHANGES,README}.txt |
604 |
- use static-libs || prune_libtool_files --all |
605 |
- |
606 |
- # Prevent SDL 2.0's "showimage" from colliding with SDL 1.2's "showimage". |
607 |
- use showimage && newbin '.libs/showimage' "showimage2" |
608 |
-} |
609 |
|
610 |
diff --git a/media-libs/sdl-ttf/metadata.xml b/media-libs/sdl-ttf/metadata.xml |
611 |
deleted file mode 100644 |
612 |
index 5a35b71..0000000 |
613 |
--- a/media-libs/sdl-ttf/metadata.xml |
614 |
+++ /dev/null |
615 |
@@ -1,19 +0,0 @@ |
616 |
-<?xml version="1.0" encoding="UTF-8"?> |
617 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
618 |
-<pkgmetadata> |
619 |
- <maintainer> |
620 |
- <email>leycec@×××××.com</email> |
621 |
- <name>leycec</name> |
622 |
- </maintainer> |
623 |
- <longdescription> |
624 |
-This is a sample library which allows you to use TrueType fonts in your SDL |
625 |
-applications. It comes with an example program "showfont" which displays an |
626 |
-example string for a given TrueType font file. |
627 |
-</longdescription> |
628 |
- <upstream> |
629 |
- <doc lang="en">http://www.libsdl.org/projects/SDL_ttf/docs/index.html</doc> |
630 |
- </upstream> |
631 |
- <use> |
632 |
- <flag name="showfont">Install the "showfont" test command</flag> |
633 |
- </use> |
634 |
-</pkgmetadata> |
635 |
|
636 |
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.12_pre242.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.12_pre242.ebuild |
637 |
deleted file mode 100644 |
638 |
index 43f81be..0000000 |
639 |
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.12_pre242.ebuild |
640 |
+++ /dev/null |
641 |
@@ -1,40 +0,0 @@ |
642 |
-# Copyright 1999-2013 Gentoo Foundation |
643 |
-# Distributed under the terms of the GNU General Public License v2 |
644 |
-# $Header: $ |
645 |
-EAPI=5 |
646 |
- |
647 |
-inherit mercurial versionator |
648 |
- |
649 |
-MY_PV=${PV/_pre/-} |
650 |
-EHG_REVISION=$(get_version_component_range 4 ${MY_PV}) |
651 |
- |
652 |
-DESCRIPTION="TrueType font decoding add-on for SDL" |
653 |
-HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" |
654 |
-EHG_REPO_URI="http://hg.libsdl.org/SDL_ttf" |
655 |
- |
656 |
-LICENSE="ZLIB" |
657 |
-SLOT="2" |
658 |
-KEYWORDS="~amd64 ~x86" |
659 |
- |
660 |
-#FIXME: Add "test". |
661 |
-IUSE="showfont static-libs X" |
662 |
- |
663 |
-RDEPEND=" |
664 |
- media-libs/libsdl:2 |
665 |
- >=media-libs/freetype-2.3 |
666 |
- X? ( x11-libs/libXt ) |
667 |
-" |
668 |
-DEPEND="${RDEPEND}" |
669 |
- |
670 |
-src_configure() { |
671 |
- MISSING=true econf \ |
672 |
- $(use_enable static-libs static) \ |
673 |
- $(use_with X x) |
674 |
-} |
675 |
- |
676 |
-src_install() { |
677 |
- emake DESTDIR="${D}" install |
678 |
- use static-libs || prune_libtool_files --all |
679 |
- use showfont && newbin '.libs/showfont' "showfont2" |
680 |
- dodoc {CHANGES,README}.txt |
681 |
-} |