1 |
commit: 79f874d07b7fee8ac9128fe85fb057912aecd487 |
2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 18 23:09:58 2015 +0000 |
4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 18 23:09:58 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f874d0 |
7 |
|
8 |
Patch to attempt to fix building with gcc5 (bug #568618) |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
.../files/mirrormagic-2.0.2-editor.patch | 20 + |
13 |
.../files/mirrormagic-2.0.2-gcc41.patch | 4 +- |
14 |
.../mirrormagic/files/mirrormagic-2.0.2-gcc5.patch | 483 +++++++++++++++++++++ |
15 |
.../files/mirrormagic-2.0.2-parallel.patch | 4 +- |
16 |
.../mirrormagic/mirrormagic-2.0.2-r1.ebuild | 8 +- |
17 |
5 files changed, 512 insertions(+), 7 deletions(-) |
18 |
|
19 |
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch |
20 |
new file mode 100644 |
21 |
index 0000000..459ffa6 |
22 |
--- /dev/null |
23 |
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch |
24 |
@@ -0,0 +1,20 @@ |
25 |
+--- mirrormagic-2.0.2/src/editor.c.orig |
26 |
++++ mirrormagic-2.0.2/src/editor.c |
27 |
+@@ -2751,7 +2751,7 @@ |
28 |
+ break; |
29 |
+ } |
30 |
+ |
31 |
+- if (!LevelContainsPlayer) |
32 |
++ if (!LevelContainsPlayer()) |
33 |
+ Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM); |
34 |
+ else |
35 |
+ { |
36 |
+@@ -2766,7 +2766,7 @@ |
37 |
+ break; |
38 |
+ |
39 |
+ case GADGET_ID_TEST: |
40 |
+- if (!LevelContainsPlayer) |
41 |
++ if (!LevelContainsPlayer()) |
42 |
+ Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM); |
43 |
+ else |
44 |
+ { |
45 |
|
46 |
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch |
47 |
index 316aa3b..c8d386f 100644 |
48 |
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch |
49 |
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch |
50 |
@@ -1,5 +1,5 @@ |
51 |
---- src/main.h.old 2006-05-19 22:24:24.000000000 +0200 |
52 |
-+++ src/main.h 2006-05-19 22:25:57.000000000 +0200 |
53 |
+--- src/main.h.old |
54 |
++++ src/main.h |
55 |
@@ -459,7 +459,6 @@ |
56 |
#endif |
57 |
extern struct HiScore highscore[]; |
58 |
|
59 |
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch |
60 |
new file mode 100644 |
61 |
index 0000000..de2cc80 |
62 |
--- /dev/null |
63 |
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch |
64 |
@@ -0,0 +1,483 @@ |
65 |
+gcc5 inline semantics changed and caused a build fauilure (bug #568618). |
66 |
+ |
67 |
+--- mirrormagic-2.0.2.orig/src/libgame/misc.h |
68 |
++++ mirrormagic-2.0.2/src/libgame/misc.h |
69 |
+@@ -137,8 +137,8 @@ |
70 |
+ void sortLevelDirInfo(struct LevelDirInfo **, |
71 |
+ int (*compare_function)(const void *, const void *)); |
72 |
+ |
73 |
+-inline void swap_numbers(int *, int *); |
74 |
+-inline void swap_number_pairs(int *, int *, int *, int *); |
75 |
++extern inline void swap_numbers(int *, int *); |
76 |
++extern inline void swap_number_pairs(int *, int *, int *, int *); |
77 |
+ |
78 |
+ char *getUserDataDir(void); |
79 |
+ char *getSetupDir(void); |
80 |
+--- mirrormagic-2.0.2.orig/src/libgame/msdos.h |
81 |
++++ mirrormagic-2.0.2/src/libgame/msdos.h |
82 |
+@@ -711,7 +711,7 @@ |
83 |
+ Pixmap XCreatePixmap(Display *, Drawable, unsigned int, unsigned int, |
84 |
+ unsigned int); |
85 |
+ void XSync(Display *, Bool); |
86 |
+-inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int, |
87 |
++extern inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int, |
88 |
+ unsigned int, unsigned int, int, int); |
89 |
+ int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *); |
90 |
+ int XReadBitmapFile(Display *, Drawable, char *, |
91 |
+--- mirrormagic-2.0.2.orig/src/libgame/sdl.h |
92 |
++++ mirrormagic-2.0.2/src/libgame/sdl.h |
93 |
+@@ -314,20 +314,20 @@ |
94 |
+ |
95 |
+ /* SDL function definitions */ |
96 |
+ |
97 |
+-inline void SDLInitVideoDisplay(void); |
98 |
+-inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean); |
99 |
+-inline boolean SDLSetVideoMode(DrawBuffer **, boolean); |
100 |
+-inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int); |
101 |
+-inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int); |
102 |
+-inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int); |
103 |
+-inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32); |
104 |
+-inline Pixel SDLGetPixel(Bitmap *, int, int); |
105 |
++extern inline void SDLInitVideoDisplay(void); |
106 |
++extern inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean); |
107 |
++extern inline boolean SDLSetVideoMode(DrawBuffer **, boolean); |
108 |
++extern inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int); |
109 |
++extern inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int); |
110 |
++extern inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int); |
111 |
++extern inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32); |
112 |
++extern inline Pixel SDLGetPixel(Bitmap *, int, int); |
113 |
+ |
114 |
+ Bitmap *SDLLoadImage(char *); |
115 |
+ |
116 |
+-inline void SDLOpenAudio(void); |
117 |
+-inline void SDLCloseAudio(void); |
118 |
++extern inline void SDLOpenAudio(void); |
119 |
++extern inline void SDLCloseAudio(void); |
120 |
+ |
121 |
+-inline void SDLNextEvent(Event *); |
122 |
++extern inline void SDLNextEvent(Event *); |
123 |
+ |
124 |
+ #endif /* SDL_H */ |
125 |
+--- mirrormagic-2.0.2.orig/src/libgame/system.c |
126 |
++++ mirrormagic-2.0.2/src/libgame/system.c |
127 |
+@@ -172,12 +172,12 @@ |
128 |
+ /* video functions */ |
129 |
+ /* ========================================================================= */ |
130 |
+ |
131 |
+-inline static int GetRealDepth(int depth) |
132 |
++static int GetRealDepth(int depth) |
133 |
+ { |
134 |
+ return (depth == DEFAULT_DEPTH ? video.default_depth : depth); |
135 |
+ } |
136 |
+ |
137 |
+-inline void InitVideoDisplay(void) |
138 |
++void InitVideoDisplay(void) |
139 |
+ { |
140 |
+ #if defined(TARGET_SDL) |
141 |
+ SDLInitVideoDisplay(); |
142 |
+@@ -186,7 +186,7 @@ |
143 |
+ #endif |
144 |
+ } |
145 |
+ |
146 |
+-inline void CloseVideoDisplay(void) |
147 |
++void CloseVideoDisplay(void) |
148 |
+ { |
149 |
+ KeyboardAutoRepeatOn(); |
150 |
+ |
151 |
+@@ -198,7 +198,7 @@ |
152 |
+ #endif |
153 |
+ } |
154 |
+ |
155 |
+-inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, |
156 |
++void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, |
157 |
+ int width, int height, int depth, |
158 |
+ boolean fullscreen) |
159 |
+ { |
160 |
+@@ -215,7 +215,7 @@ |
161 |
+ #endif |
162 |
+ } |
163 |
+ |
164 |
+-inline Bitmap *CreateBitmapStruct(void) |
165 |
++Bitmap *CreateBitmapStruct(void) |
166 |
+ { |
167 |
+ #ifdef TARGET_SDL |
168 |
+ return checked_calloc(sizeof(struct SDLSurfaceInfo)); |
169 |
+@@ -224,7 +224,7 @@ |
170 |
+ #endif |
171 |
+ } |
172 |
+ |
173 |
+-inline Bitmap *CreateBitmap(int width, int height, int depth) |
174 |
++Bitmap *CreateBitmap(int width, int height, int depth) |
175 |
+ { |
176 |
+ Bitmap *new_bitmap = CreateBitmapStruct(); |
177 |
+ int real_depth = GetRealDepth(depth); |
178 |
+@@ -265,7 +265,7 @@ |
179 |
+ return new_bitmap; |
180 |
+ } |
181 |
+ |
182 |
+-inline void FreeBitmap(Bitmap *bitmap) |
183 |
++void FreeBitmap(Bitmap *bitmap) |
184 |
+ { |
185 |
+ if (bitmap == NULL) |
186 |
+ return; |
187 |
+@@ -287,7 +287,7 @@ |
188 |
+ free(bitmap); |
189 |
+ } |
190 |
+ |
191 |
+-inline void CloseWindow(DrawWindow *window) |
192 |
++void CloseWindow(DrawWindow *window) |
193 |
+ { |
194 |
+ #ifdef TARGET_X11 |
195 |
+ if (window->drawable) |
196 |
+@@ -300,7 +300,7 @@ |
197 |
+ #endif |
198 |
+ } |
199 |
+ |
200 |
+-inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, |
201 |
++void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, |
202 |
+ int src_x, int src_y, |
203 |
+ int width, int height, |
204 |
+ int dst_x, int dst_y) |
205 |
+@@ -314,7 +314,7 @@ |
206 |
+ #endif |
207 |
+ } |
208 |
+ |
209 |
+-inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) |
210 |
++void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) |
211 |
+ { |
212 |
+ #ifdef TARGET_SDL |
213 |
+ SDLFillRectangle(bitmap, x, y, width, height, 0x000000); |
214 |
+@@ -329,7 +329,7 @@ |
215 |
+ #endif |
216 |
+ #endif |
217 |
+ |
218 |
+-inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) |
219 |
++void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) |
220 |
+ { |
221 |
+ #ifdef TARGET_X11 |
222 |
+ if (clip_gc) |
223 |
+@@ -343,7 +343,7 @@ |
224 |
+ #endif |
225 |
+ } |
226 |
+ |
227 |
+-inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) |
228 |
++void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) |
229 |
+ { |
230 |
+ #ifdef TARGET_X11 |
231 |
+ if (clip_gc) |
232 |
+@@ -357,7 +357,7 @@ |
233 |
+ #endif |
234 |
+ } |
235 |
+ |
236 |
+-inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, |
237 |
++void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, |
238 |
+ int src_x, int src_y, |
239 |
+ int width, int height, |
240 |
+ int dst_x, int dst_y) |
241 |
+@@ -371,7 +371,7 @@ |
242 |
+ #endif |
243 |
+ } |
244 |
+ |
245 |
+-inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, |
246 |
++void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, |
247 |
+ int to_x, int to_y) |
248 |
+ { |
249 |
+ #ifdef TARGET_SDL |
250 |
+@@ -384,7 +384,7 @@ |
251 |
+ } |
252 |
+ |
253 |
+ #if !defined(TARGET_X11_NATIVE) |
254 |
+-inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, |
255 |
++void DrawLine(Bitmap *bitmap, int from_x, int from_y, |
256 |
+ int to_x, int to_y, Pixel pixel, int line_width) |
257 |
+ { |
258 |
+ int x, y; |
259 |
+@@ -414,7 +414,7 @@ |
260 |
+ } |
261 |
+ #endif |
262 |
+ |
263 |
+-inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, |
264 |
++void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, |
265 |
+ Pixel pixel) |
266 |
+ { |
267 |
+ #if !defined(TARGET_X11_NATIVE) |
268 |
+@@ -438,7 +438,7 @@ |
269 |
+ #endif |
270 |
+ } |
271 |
+ |
272 |
+-inline Pixel GetPixel(Bitmap *bitmap, int x, int y) |
273 |
++Pixel GetPixel(Bitmap *bitmap, int x, int y) |
274 |
+ { |
275 |
+ #if defined(TARGET_SDL) |
276 |
+ return SDLGetPixel(bitmap, x, y); |
277 |
+@@ -458,7 +458,7 @@ |
278 |
+ #endif |
279 |
+ } |
280 |
+ |
281 |
+-inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, |
282 |
++Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, |
283 |
+ unsigned int color_g, unsigned int color_b) |
284 |
+ { |
285 |
+ Pixel pixel; |
286 |
+@@ -481,7 +481,7 @@ |
287 |
+ return pixel; |
288 |
+ } |
289 |
+ |
290 |
+-inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) |
291 |
++Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) |
292 |
+ { |
293 |
+ unsigned int color_r = (color >> 16) & 0xff; |
294 |
+ unsigned int color_g = (color >> 8) & 0xff; |
295 |
+@@ -491,7 +491,7 @@ |
296 |
+ } |
297 |
+ |
298 |
+ /* execute all pending screen drawing operations */ |
299 |
+-inline void FlushDisplay(void) |
300 |
++void FlushDisplay(void) |
301 |
+ { |
302 |
+ #ifndef TARGET_SDL |
303 |
+ XFlush(display); |
304 |
+@@ -499,14 +499,14 @@ |
305 |
+ } |
306 |
+ |
307 |
+ /* execute and wait for all pending screen drawing operations */ |
308 |
+-inline void SyncDisplay(void) |
309 |
++void SyncDisplay(void) |
310 |
+ { |
311 |
+ #ifndef TARGET_SDL |
312 |
+ XSync(display, FALSE); |
313 |
+ #endif |
314 |
+ } |
315 |
+ |
316 |
+-inline void KeyboardAutoRepeatOn(void) |
317 |
++void KeyboardAutoRepeatOn(void) |
318 |
+ { |
319 |
+ #ifdef TARGET_SDL |
320 |
+ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, |
321 |
+@@ -518,7 +518,7 @@ |
322 |
+ #endif |
323 |
+ } |
324 |
+ |
325 |
+-inline void KeyboardAutoRepeatOff(void) |
326 |
++void KeyboardAutoRepeatOff(void) |
327 |
+ { |
328 |
+ #ifdef TARGET_SDL |
329 |
+ SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); |
330 |
+@@ -529,7 +529,7 @@ |
331 |
+ #endif |
332 |
+ } |
333 |
+ |
334 |
+-inline boolean PointerInWindow(DrawWindow *window) |
335 |
++boolean PointerInWindow(DrawWindow *window) |
336 |
+ { |
337 |
+ #ifdef TARGET_SDL |
338 |
+ return TRUE; |
339 |
+@@ -546,7 +546,7 @@ |
340 |
+ #endif |
341 |
+ } |
342 |
+ |
343 |
+-inline boolean SetVideoMode(boolean fullscreen) |
344 |
++boolean SetVideoMode(boolean fullscreen) |
345 |
+ { |
346 |
+ #ifdef TARGET_SDL |
347 |
+ return SDLSetVideoMode(&backbuffer, fullscreen); |
348 |
+@@ -567,7 +567,7 @@ |
349 |
+ #endif |
350 |
+ } |
351 |
+ |
352 |
+-inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) |
353 |
++boolean ChangeVideoModeIfNeeded(boolean fullscreen) |
354 |
+ { |
355 |
+ #ifdef TARGET_SDL |
356 |
+ if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)|| |
357 |
+@@ -600,7 +600,7 @@ |
358 |
+ /* audio functions */ |
359 |
+ /* ========================================================================= */ |
360 |
+ |
361 |
+-inline void OpenAudio(void) |
362 |
++void OpenAudio(void) |
363 |
+ { |
364 |
+ /* always start with reliable default values */ |
365 |
+ audio.sound_available = FALSE; |
366 |
+@@ -627,7 +627,7 @@ |
367 |
+ #endif |
368 |
+ } |
369 |
+ |
370 |
+-inline void CloseAudio(void) |
371 |
++void CloseAudio(void) |
372 |
+ { |
373 |
+ #if defined(TARGET_SDL) |
374 |
+ SDLCloseAudio(); |
375 |
+@@ -640,7 +640,7 @@ |
376 |
+ audio.sound_enabled = FALSE; |
377 |
+ } |
378 |
+ |
379 |
+-inline void SetAudioMode(boolean enabled) |
380 |
++void SetAudioMode(boolean enabled) |
381 |
+ { |
382 |
+ if (!audio.sound_available) |
383 |
+ return; |
384 |
+@@ -653,7 +653,7 @@ |
385 |
+ /* event functions */ |
386 |
+ /* ========================================================================= */ |
387 |
+ |
388 |
+-inline void InitEventFilter(EventFilter filter_function) |
389 |
++void InitEventFilter(EventFilter filter_function) |
390 |
+ { |
391 |
+ #ifdef TARGET_SDL |
392 |
+ /* set event filter to filter out certain events */ |
393 |
+@@ -661,7 +661,7 @@ |
394 |
+ #endif |
395 |
+ } |
396 |
+ |
397 |
+-inline boolean PendingEvent(void) |
398 |
++boolean PendingEvent(void) |
399 |
+ { |
400 |
+ #ifdef TARGET_SDL |
401 |
+ return (SDL_PollEvent(NULL) ? TRUE : FALSE); |
402 |
+@@ -670,7 +670,7 @@ |
403 |
+ #endif |
404 |
+ } |
405 |
+ |
406 |
+-inline void NextEvent(Event *event) |
407 |
++void NextEvent(Event *event) |
408 |
+ { |
409 |
+ #ifdef TARGET_SDL |
410 |
+ SDLNextEvent(event); |
411 |
+@@ -679,7 +679,7 @@ |
412 |
+ #endif |
413 |
+ } |
414 |
+ |
415 |
+-inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) |
416 |
++Key GetEventKey(KeyEvent *event, boolean with_modifiers) |
417 |
+ { |
418 |
+ #ifdef TARGET_SDL |
419 |
+ #if 0 |
420 |
+@@ -707,7 +707,7 @@ |
421 |
+ #endif |
422 |
+ } |
423 |
+ |
424 |
+-inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) |
425 |
++boolean CheckCloseWindowEvent(ClientMessageEvent *event) |
426 |
+ { |
427 |
+ if (event->type != EVENT_CLIENTMESSAGE) |
428 |
+ return FALSE; |
429 |
+@@ -724,7 +724,7 @@ |
430 |
+ } |
431 |
+ |
432 |
+ |
433 |
+-inline void dummy(void) |
434 |
++void dummy(void) |
435 |
+ { |
436 |
+ #ifdef TARGET_SDL |
437 |
+ #else |
438 |
+--- mirrormagic-2.0.2.orig/src/libgame/system.h |
439 |
++++ mirrormagic-2.0.2/src/libgame/system.h |
440 |
+@@ -278,41 +278,41 @@ |
441 |
+ void InitGfxDoor2Info(int, int, int, int); |
442 |
+ void InitGfxScrollbufferInfo(int, int); |
443 |
+ |
444 |
+-inline void InitVideoDisplay(void); |
445 |
+-inline void CloseVideoDisplay(void); |
446 |
+-inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean); |
447 |
+-inline Bitmap *CreateBitmapStruct(void); |
448 |
+-inline Bitmap *CreateBitmap(int, int, int); |
449 |
+-inline void FreeBitmap(Bitmap *); |
450 |
+-inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int); |
451 |
+-inline void ClearRectangle(Bitmap *, int, int, int, int); |
452 |
+-inline void SetClipMask(Bitmap *, GC, Pixmap); |
453 |
+-inline void SetClipOrigin(Bitmap *, GC, int, int); |
454 |
+-inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int); |
455 |
+-inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int); |
456 |
+-inline void DrawLines(Bitmap *, struct XY *, int, Pixel); |
457 |
+-inline Pixel GetPixel(Bitmap *, int, int); |
458 |
+-inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int); |
459 |
+-inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int); |
460 |
+- |
461 |
+-inline void FlushDisplay(void); |
462 |
+-inline void SyncDisplay(void); |
463 |
+-inline void KeyboardAutoRepeatOn(void); |
464 |
+-inline void KeyboardAutoRepeatOff(void); |
465 |
+-inline boolean PointerInWindow(DrawWindow *); |
466 |
+-inline boolean SetVideoMode(boolean); |
467 |
+-inline boolean ChangeVideoModeIfNeeded(boolean); |
468 |
++extern inline void InitVideoDisplay(void); |
469 |
++extern inline void CloseVideoDisplay(void); |
470 |
++extern inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean); |
471 |
++extern inline Bitmap *CreateBitmapStruct(void); |
472 |
++extern inline Bitmap *CreateBitmap(int, int, int); |
473 |
++extern inline void FreeBitmap(Bitmap *); |
474 |
++extern inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int); |
475 |
++extern inline void ClearRectangle(Bitmap *, int, int, int, int); |
476 |
++extern inline void SetClipMask(Bitmap *, GC, Pixmap); |
477 |
++extern inline void SetClipOrigin(Bitmap *, GC, int, int); |
478 |
++extern inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int); |
479 |
++extern inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int); |
480 |
++extern inline void DrawLines(Bitmap *, struct XY *, int, Pixel); |
481 |
++extern inline Pixel GetPixel(Bitmap *, int, int); |
482 |
++extern inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int); |
483 |
++extern inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int); |
484 |
++ |
485 |
++extern inline void FlushDisplay(void); |
486 |
++extern inline void SyncDisplay(void); |
487 |
++extern inline void KeyboardAutoRepeatOn(void); |
488 |
++extern inline void KeyboardAutoRepeatOff(void); |
489 |
++extern inline boolean PointerInWindow(DrawWindow *); |
490 |
++extern inline boolean SetVideoMode(boolean); |
491 |
++extern inline boolean ChangeVideoModeIfNeeded(boolean); |
492 |
+ |
493 |
+ Bitmap *LoadImage(char *); |
494 |
+ |
495 |
+-inline void OpenAudio(void); |
496 |
+-inline void CloseAudio(void); |
497 |
+-inline void SetAudioMode(boolean); |
498 |
+- |
499 |
+-inline void InitEventFilter(EventFilter); |
500 |
+-inline boolean PendingEvent(void); |
501 |
+-inline void NextEvent(Event *event); |
502 |
+-inline Key GetEventKey(KeyEvent *, boolean); |
503 |
+-inline boolean CheckCloseWindowEvent(ClientMessageEvent *); |
504 |
++extern inline void OpenAudio(void); |
505 |
++extern inline void CloseAudio(void); |
506 |
++extern inline void SetAudioMode(boolean); |
507 |
++ |
508 |
++extern inline void InitEventFilter(EventFilter); |
509 |
++extern inline boolean PendingEvent(void); |
510 |
++extern inline void NextEvent(Event *event); |
511 |
++extern inline Key GetEventKey(KeyEvent *, boolean); |
512 |
++extern inline boolean CheckCloseWindowEvent(ClientMessageEvent *); |
513 |
+ |
514 |
+ #endif /* SYSTEM_H */ |
515 |
+--- mirrormagic-2.0.2.orig/src/libgame/x11.c |
516 |
++++ mirrormagic-2.0.2/src/libgame/x11.c |
517 |
+@@ -21,7 +21,7 @@ |
518 |
+ static void X11InitDisplay(); |
519 |
+ static DrawWindow *X11InitWindow(); |
520 |
+ |
521 |
+-inline void X11InitVideoDisplay(void) |
522 |
++void X11InitVideoDisplay(void) |
523 |
+ { |
524 |
+ /* initialize X11 video */ |
525 |
+ X11InitDisplay(); |
526 |
+@@ -30,7 +30,7 @@ |
527 |
+ video.default_depth = XDefaultDepth(display, screen); |
528 |
+ } |
529 |
+ |
530 |
+-inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window) |
531 |
++void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window) |
532 |
+ { |
533 |
+ *window = X11InitWindow(); |
534 |
+ |
535 |
+--- mirrormagic-2.0.2.orig/src/libgame/x11.h |
536 |
++++ mirrormagic-2.0.2/src/libgame/x11.h |
537 |
+@@ -286,8 +286,8 @@ |
538 |
+ |
539 |
+ /* X11 function definitions */ |
540 |
+ |
541 |
+-inline void X11InitVideoDisplay(void); |
542 |
+-inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **); |
543 |
++extern inline void X11InitVideoDisplay(void); |
544 |
++extern inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **); |
545 |
+ Bitmap *X11LoadImage(char *); |
546 |
+ |
547 |
+ #endif /* X11_H */ |
548 |
|
549 |
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch |
550 |
index 5d5297f..9b538a6 100644 |
551 |
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch |
552 |
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch |
553 |
@@ -1,5 +1,5 @@ |
554 |
---- src/Makefile.old 2010-06-03 09:43:15.000000000 +0200 |
555 |
-+++ src/Makefile 2010-06-03 09:43:42.000000000 +0200 |
556 |
+--- src/Makefile.old |
557 |
++++ src/Makefile |
558 |
@@ -146,7 +146,7 @@ |
559 |
endif |
560 |
|
561 |
|
562 |
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild |
563 |
index 919e55b..ac9c25b 100644 |
564 |
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild |
565 |
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild |
566 |
@@ -27,8 +27,10 @@ src_prepare() { |
567 |
epatch \ |
568 |
"${FILESDIR}"/${P}-gcc41.patch \ |
569 |
"${FILESDIR}"/${P}-parallel.patch \ |
570 |
- "${FILESDIR}"/${P}-64bit.patch |
571 |
- rm -f ${PN} |
572 |
+ "${FILESDIR}"/${P}-64bit.patch \ |
573 |
+ "${FILESDIR}"/${P}-gcc5.patch \ |
574 |
+ "${FILESDIR}"/${P}-editor.patch |
575 |
+ rm -f ${PN} || die |
576 |
} |
577 |
|
578 |
src_compile() { |
579 |
@@ -41,7 +43,7 @@ src_compile() { |
580 |
EXTRA_LDFLAGS="${LDFLAGS}" \ |
581 |
RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \ |
582 |
RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \ |
583 |
- TARGET=$(use sdl && echo sdl || echo x11) |
584 |
+ TARGET=$(usex sdl sdl x11) |
585 |
} |
586 |
|
587 |
src_install() { |