mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
games-puzzle/mirrormagic: drop 2.0.2-r2
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/41134 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
5a2f14d171
commit
2b646b37db
@@ -1,2 +1 @@
|
||||
DIST mirrormagic-2.0.2.tar.gz 1168098 BLAKE2B 0feefa2e7af82b212c3c08a347154d701a8492c2fef35cf625f4176e4893888904d88a2ee6d36c4e239fbf2cb6f1f77aa8e273023a86dce04dce8f5b77b62946 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03
|
||||
DIST mirrormagic-3.3.1-linux.tar.gz 5691433 BLAKE2B 54925115d8e65a4a011debc083f4a9564648ce6dc771a1784a8c49b34ef1557e1d3cb5c0cf1c36ac1c34308b4881ad137b6c9424595807315535ae93a9def681 SHA512 04f82a4f6616b9676cb493f7796e1ec43d71874d5f55286b3ae55539f1d5fb422cac35dc7d248b59af3142cf598e0c4212f9401654d7bf91e28c69c0839665a7
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From Debian:
|
||||
|
||||
In src/libgame/gadgets.c, check for 64bit when handling
|
||||
GDI_TYPE,GDI_STATE in HandleGadgetTags() and use int instead of
|
||||
unsigned long. Should probably really be uint32_t but I'll leave
|
||||
that decision to upstream. Thanks Pelle Nilsson (and son).
|
||||
64bit check borrowed from bug #496863. Closes: #498912.
|
||||
|
||||
--- a/src/libgame/gadgets.c
|
||||
+++ b/src/libgame/gadgets.c
|
||||
@@ -18,6 +18,12 @@
|
||||
#include "text.h"
|
||||
#include "misc.h"
|
||||
|
||||
+/* check for 64bit */
|
||||
+#ifdef _LP64
|
||||
+#ifndef L64
|
||||
+#define L64 1
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
/* values for DrawGadget() */
|
||||
#define DG_UNPRESSED 0
|
||||
@@ -301,11 +307,19 @@
|
||||
break;
|
||||
|
||||
case GDI_TYPE:
|
||||
+#ifdef L64
|
||||
+ gi->type = va_arg(ap, int);
|
||||
+#else
|
||||
gi->type = va_arg(ap, unsigned long);
|
||||
+#endif
|
||||
break;
|
||||
|
||||
case GDI_STATE:
|
||||
+#ifdef L64
|
||||
+ gi->state = va_arg(ap, int);
|
||||
+#else
|
||||
gi->state = va_arg(ap, unsigned long);
|
||||
+#endif
|
||||
break;
|
||||
|
||||
case GDI_CHECKED:
|
||||
@@ -1,20 +0,0 @@
|
||||
--- mirrormagic-2.0.2/src/editor.c.orig
|
||||
+++ mirrormagic-2.0.2/src/editor.c
|
||||
@@ -2751,7 +2751,7 @@
|
||||
break;
|
||||
}
|
||||
|
||||
- if (!LevelContainsPlayer)
|
||||
+ if (!LevelContainsPlayer())
|
||||
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
|
||||
else
|
||||
{
|
||||
@@ -2766,7 +2766,7 @@
|
||||
break;
|
||||
|
||||
case GADGET_ID_TEST:
|
||||
- if (!LevelContainsPlayer)
|
||||
+ if (!LevelContainsPlayer())
|
||||
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
|
||||
else
|
||||
{
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/src/main.h.old
|
||||
+++ b/src/main.h
|
||||
@@ -459,7 +459,6 @@
|
||||
#endif
|
||||
extern struct HiScore highscore[];
|
||||
extern struct TapeInfo tape;
|
||||
-extern struct JoystickInfo joystick[];
|
||||
extern struct SetupInfo setup;
|
||||
extern struct GameInfo game;
|
||||
extern struct LaserInfo laser;
|
||||
@@ -1,483 +0,0 @@
|
||||
gcc5 inline semantics changed and caused a build fauilure (bug #568618).
|
||||
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/misc.h
|
||||
+++ mirrormagic-2.0.2/src/libgame/misc.h
|
||||
@@ -137,8 +137,8 @@
|
||||
void sortLevelDirInfo(struct LevelDirInfo **,
|
||||
int (*compare_function)(const void *, const void *));
|
||||
|
||||
-inline void swap_numbers(int *, int *);
|
||||
-inline void swap_number_pairs(int *, int *, int *, int *);
|
||||
+extern inline void swap_numbers(int *, int *);
|
||||
+extern inline void swap_number_pairs(int *, int *, int *, int *);
|
||||
|
||||
char *getUserDataDir(void);
|
||||
char *getSetupDir(void);
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/msdos.h
|
||||
+++ mirrormagic-2.0.2/src/libgame/msdos.h
|
||||
@@ -711,7 +711,7 @@
|
||||
Pixmap XCreatePixmap(Display *, Drawable, unsigned int, unsigned int,
|
||||
unsigned int);
|
||||
void XSync(Display *, Bool);
|
||||
-inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int,
|
||||
+extern inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int,
|
||||
unsigned int, unsigned int, int, int);
|
||||
int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *);
|
||||
int XReadBitmapFile(Display *, Drawable, char *,
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/sdl.h
|
||||
+++ mirrormagic-2.0.2/src/libgame/sdl.h
|
||||
@@ -314,20 +314,20 @@
|
||||
|
||||
/* SDL function definitions */
|
||||
|
||||
-inline void SDLInitVideoDisplay(void);
|
||||
-inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
|
||||
-inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
|
||||
-inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
|
||||
-inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
|
||||
-inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
|
||||
-inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
|
||||
-inline Pixel SDLGetPixel(Bitmap *, int, int);
|
||||
+extern inline void SDLInitVideoDisplay(void);
|
||||
+extern inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
|
||||
+extern inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
|
||||
+extern inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
|
||||
+extern inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
|
||||
+extern inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
|
||||
+extern inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
|
||||
+extern inline Pixel SDLGetPixel(Bitmap *, int, int);
|
||||
|
||||
Bitmap *SDLLoadImage(char *);
|
||||
|
||||
-inline void SDLOpenAudio(void);
|
||||
-inline void SDLCloseAudio(void);
|
||||
+extern inline void SDLOpenAudio(void);
|
||||
+extern inline void SDLCloseAudio(void);
|
||||
|
||||
-inline void SDLNextEvent(Event *);
|
||||
+extern inline void SDLNextEvent(Event *);
|
||||
|
||||
#endif /* SDL_H */
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/system.c
|
||||
+++ mirrormagic-2.0.2/src/libgame/system.c
|
||||
@@ -172,12 +172,12 @@
|
||||
/* video functions */
|
||||
/* ========================================================================= */
|
||||
|
||||
-inline static int GetRealDepth(int depth)
|
||||
+static int GetRealDepth(int depth)
|
||||
{
|
||||
return (depth == DEFAULT_DEPTH ? video.default_depth : depth);
|
||||
}
|
||||
|
||||
-inline void InitVideoDisplay(void)
|
||||
+void InitVideoDisplay(void)
|
||||
{
|
||||
#if defined(TARGET_SDL)
|
||||
SDLInitVideoDisplay();
|
||||
@@ -186,7 +186,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void CloseVideoDisplay(void)
|
||||
+void CloseVideoDisplay(void)
|
||||
{
|
||||
KeyboardAutoRepeatOn();
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
|
||||
+void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
|
||||
int width, int height, int depth,
|
||||
boolean fullscreen)
|
||||
{
|
||||
@@ -215,7 +215,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline Bitmap *CreateBitmapStruct(void)
|
||||
+Bitmap *CreateBitmapStruct(void)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
return checked_calloc(sizeof(struct SDLSurfaceInfo));
|
||||
@@ -224,7 +224,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline Bitmap *CreateBitmap(int width, int height, int depth)
|
||||
+Bitmap *CreateBitmap(int width, int height, int depth)
|
||||
{
|
||||
Bitmap *new_bitmap = CreateBitmapStruct();
|
||||
int real_depth = GetRealDepth(depth);
|
||||
@@ -265,7 +265,7 @@
|
||||
return new_bitmap;
|
||||
}
|
||||
|
||||
-inline void FreeBitmap(Bitmap *bitmap)
|
||||
+void FreeBitmap(Bitmap *bitmap)
|
||||
{
|
||||
if (bitmap == NULL)
|
||||
return;
|
||||
@@ -287,7 +287,7 @@
|
||||
free(bitmap);
|
||||
}
|
||||
|
||||
-inline void CloseWindow(DrawWindow *window)
|
||||
+void CloseWindow(DrawWindow *window)
|
||||
{
|
||||
#ifdef TARGET_X11
|
||||
if (window->drawable)
|
||||
@@ -300,7 +300,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
|
||||
+void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
|
||||
int src_x, int src_y,
|
||||
int width, int height,
|
||||
int dst_x, int dst_y)
|
||||
@@ -314,7 +314,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
|
||||
+void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
SDLFillRectangle(bitmap, x, y, width, height, 0x000000);
|
||||
@@ -329,7 +329,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
|
||||
+void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
|
||||
{
|
||||
#ifdef TARGET_X11
|
||||
if (clip_gc)
|
||||
@@ -343,7 +343,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
|
||||
+void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
|
||||
{
|
||||
#ifdef TARGET_X11
|
||||
if (clip_gc)
|
||||
@@ -357,7 +357,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
|
||||
+void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
|
||||
int src_x, int src_y,
|
||||
int width, int height,
|
||||
int dst_x, int dst_y)
|
||||
@@ -371,7 +371,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
|
||||
+void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
|
||||
int to_x, int to_y)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
@@ -384,7 +384,7 @@
|
||||
}
|
||||
|
||||
#if !defined(TARGET_X11_NATIVE)
|
||||
-inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
|
||||
+void DrawLine(Bitmap *bitmap, int from_x, int from_y,
|
||||
int to_x, int to_y, Pixel pixel, int line_width)
|
||||
{
|
||||
int x, y;
|
||||
@@ -414,7 +414,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
-inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
|
||||
+void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
|
||||
Pixel pixel)
|
||||
{
|
||||
#if !defined(TARGET_X11_NATIVE)
|
||||
@@ -438,7 +438,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline Pixel GetPixel(Bitmap *bitmap, int x, int y)
|
||||
+Pixel GetPixel(Bitmap *bitmap, int x, int y)
|
||||
{
|
||||
#if defined(TARGET_SDL)
|
||||
return SDLGetPixel(bitmap, x, y);
|
||||
@@ -458,7 +458,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
|
||||
+Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
|
||||
unsigned int color_g, unsigned int color_b)
|
||||
{
|
||||
Pixel pixel;
|
||||
@@ -481,7 +481,7 @@
|
||||
return pixel;
|
||||
}
|
||||
|
||||
-inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
|
||||
+Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
|
||||
{
|
||||
unsigned int color_r = (color >> 16) & 0xff;
|
||||
unsigned int color_g = (color >> 8) & 0xff;
|
||||
@@ -491,7 +491,7 @@
|
||||
}
|
||||
|
||||
/* execute all pending screen drawing operations */
|
||||
-inline void FlushDisplay(void)
|
||||
+void FlushDisplay(void)
|
||||
{
|
||||
#ifndef TARGET_SDL
|
||||
XFlush(display);
|
||||
@@ -499,14 +499,14 @@
|
||||
}
|
||||
|
||||
/* execute and wait for all pending screen drawing operations */
|
||||
-inline void SyncDisplay(void)
|
||||
+void SyncDisplay(void)
|
||||
{
|
||||
#ifndef TARGET_SDL
|
||||
XSync(display, FALSE);
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void KeyboardAutoRepeatOn(void)
|
||||
+void KeyboardAutoRepeatOn(void)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2,
|
||||
@@ -518,7 +518,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void KeyboardAutoRepeatOff(void)
|
||||
+void KeyboardAutoRepeatOff(void)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
|
||||
@@ -529,7 +529,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline boolean PointerInWindow(DrawWindow *window)
|
||||
+boolean PointerInWindow(DrawWindow *window)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
return TRUE;
|
||||
@@ -546,7 +546,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline boolean SetVideoMode(boolean fullscreen)
|
||||
+boolean SetVideoMode(boolean fullscreen)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
return SDLSetVideoMode(&backbuffer, fullscreen);
|
||||
@@ -567,7 +567,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline boolean ChangeVideoModeIfNeeded(boolean fullscreen)
|
||||
+boolean ChangeVideoModeIfNeeded(boolean fullscreen)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)||
|
||||
@@ -600,7 +600,7 @@
|
||||
/* audio functions */
|
||||
/* ========================================================================= */
|
||||
|
||||
-inline void OpenAudio(void)
|
||||
+void OpenAudio(void)
|
||||
{
|
||||
/* always start with reliable default values */
|
||||
audio.sound_available = FALSE;
|
||||
@@ -627,7 +627,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void CloseAudio(void)
|
||||
+void CloseAudio(void)
|
||||
{
|
||||
#if defined(TARGET_SDL)
|
||||
SDLCloseAudio();
|
||||
@@ -640,7 +640,7 @@
|
||||
audio.sound_enabled = FALSE;
|
||||
}
|
||||
|
||||
-inline void SetAudioMode(boolean enabled)
|
||||
+void SetAudioMode(boolean enabled)
|
||||
{
|
||||
if (!audio.sound_available)
|
||||
return;
|
||||
@@ -653,7 +653,7 @@
|
||||
/* event functions */
|
||||
/* ========================================================================= */
|
||||
|
||||
-inline void InitEventFilter(EventFilter filter_function)
|
||||
+void InitEventFilter(EventFilter filter_function)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
/* set event filter to filter out certain events */
|
||||
@@ -661,7 +661,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline boolean PendingEvent(void)
|
||||
+boolean PendingEvent(void)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
return (SDL_PollEvent(NULL) ? TRUE : FALSE);
|
||||
@@ -670,7 +670,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline void NextEvent(Event *event)
|
||||
+void NextEvent(Event *event)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
SDLNextEvent(event);
|
||||
@@ -679,7 +679,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
|
||||
+Key GetEventKey(KeyEvent *event, boolean with_modifiers)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
#if 0
|
||||
@@ -707,7 +707,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline boolean CheckCloseWindowEvent(ClientMessageEvent *event)
|
||||
+boolean CheckCloseWindowEvent(ClientMessageEvent *event)
|
||||
{
|
||||
if (event->type != EVENT_CLIENTMESSAGE)
|
||||
return FALSE;
|
||||
@@ -724,7 +724,7 @@
|
||||
}
|
||||
|
||||
|
||||
-inline void dummy(void)
|
||||
+void dummy(void)
|
||||
{
|
||||
#ifdef TARGET_SDL
|
||||
#else
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/system.h
|
||||
+++ mirrormagic-2.0.2/src/libgame/system.h
|
||||
@@ -278,41 +278,41 @@
|
||||
void InitGfxDoor2Info(int, int, int, int);
|
||||
void InitGfxScrollbufferInfo(int, int);
|
||||
|
||||
-inline void InitVideoDisplay(void);
|
||||
-inline void CloseVideoDisplay(void);
|
||||
-inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
|
||||
-inline Bitmap *CreateBitmapStruct(void);
|
||||
-inline Bitmap *CreateBitmap(int, int, int);
|
||||
-inline void FreeBitmap(Bitmap *);
|
||||
-inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
|
||||
-inline void ClearRectangle(Bitmap *, int, int, int, int);
|
||||
-inline void SetClipMask(Bitmap *, GC, Pixmap);
|
||||
-inline void SetClipOrigin(Bitmap *, GC, int, int);
|
||||
-inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
|
||||
-inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
|
||||
-inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
|
||||
-inline Pixel GetPixel(Bitmap *, int, int);
|
||||
-inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
|
||||
-inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
|
||||
-
|
||||
-inline void FlushDisplay(void);
|
||||
-inline void SyncDisplay(void);
|
||||
-inline void KeyboardAutoRepeatOn(void);
|
||||
-inline void KeyboardAutoRepeatOff(void);
|
||||
-inline boolean PointerInWindow(DrawWindow *);
|
||||
-inline boolean SetVideoMode(boolean);
|
||||
-inline boolean ChangeVideoModeIfNeeded(boolean);
|
||||
+extern inline void InitVideoDisplay(void);
|
||||
+extern inline void CloseVideoDisplay(void);
|
||||
+extern inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
|
||||
+extern inline Bitmap *CreateBitmapStruct(void);
|
||||
+extern inline Bitmap *CreateBitmap(int, int, int);
|
||||
+extern inline void FreeBitmap(Bitmap *);
|
||||
+extern inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
|
||||
+extern inline void ClearRectangle(Bitmap *, int, int, int, int);
|
||||
+extern inline void SetClipMask(Bitmap *, GC, Pixmap);
|
||||
+extern inline void SetClipOrigin(Bitmap *, GC, int, int);
|
||||
+extern inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
|
||||
+extern inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
|
||||
+extern inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
|
||||
+extern inline Pixel GetPixel(Bitmap *, int, int);
|
||||
+extern inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
|
||||
+extern inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
|
||||
+
|
||||
+extern inline void FlushDisplay(void);
|
||||
+extern inline void SyncDisplay(void);
|
||||
+extern inline void KeyboardAutoRepeatOn(void);
|
||||
+extern inline void KeyboardAutoRepeatOff(void);
|
||||
+extern inline boolean PointerInWindow(DrawWindow *);
|
||||
+extern inline boolean SetVideoMode(boolean);
|
||||
+extern inline boolean ChangeVideoModeIfNeeded(boolean);
|
||||
|
||||
Bitmap *LoadImage(char *);
|
||||
|
||||
-inline void OpenAudio(void);
|
||||
-inline void CloseAudio(void);
|
||||
-inline void SetAudioMode(boolean);
|
||||
-
|
||||
-inline void InitEventFilter(EventFilter);
|
||||
-inline boolean PendingEvent(void);
|
||||
-inline void NextEvent(Event *event);
|
||||
-inline Key GetEventKey(KeyEvent *, boolean);
|
||||
-inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
|
||||
+extern inline void OpenAudio(void);
|
||||
+extern inline void CloseAudio(void);
|
||||
+extern inline void SetAudioMode(boolean);
|
||||
+
|
||||
+extern inline void InitEventFilter(EventFilter);
|
||||
+extern inline boolean PendingEvent(void);
|
||||
+extern inline void NextEvent(Event *event);
|
||||
+extern inline Key GetEventKey(KeyEvent *, boolean);
|
||||
+extern inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
|
||||
|
||||
#endif /* SYSTEM_H */
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/x11.c
|
||||
+++ mirrormagic-2.0.2/src/libgame/x11.c
|
||||
@@ -21,7 +21,7 @@
|
||||
static void X11InitDisplay();
|
||||
static DrawWindow *X11InitWindow();
|
||||
|
||||
-inline void X11InitVideoDisplay(void)
|
||||
+void X11InitVideoDisplay(void)
|
||||
{
|
||||
/* initialize X11 video */
|
||||
X11InitDisplay();
|
||||
@@ -30,7 +30,7 @@
|
||||
video.default_depth = XDefaultDepth(display, screen);
|
||||
}
|
||||
|
||||
-inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
|
||||
+void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
|
||||
{
|
||||
*window = X11InitWindow();
|
||||
|
||||
--- mirrormagic-2.0.2.orig/src/libgame/x11.h
|
||||
+++ mirrormagic-2.0.2/src/libgame/x11.h
|
||||
@@ -286,8 +286,8 @@
|
||||
|
||||
/* X11 function definitions */
|
||||
|
||||
-inline void X11InitVideoDisplay(void);
|
||||
-inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
|
||||
+extern inline void X11InitVideoDisplay(void);
|
||||
+extern inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
|
||||
Bitmap *X11LoadImage(char *);
|
||||
|
||||
#endif /* X11_H */
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/Makefile.old
|
||||
+++ b/src/Makefile
|
||||
@@ -146,7 +146,7 @@
|
||||
endif
|
||||
|
||||
|
||||
-all: libgame_dir $(PROGNAME)
|
||||
+all: $(PROGNAME)
|
||||
|
||||
$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
|
||||
$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
|
||||
@@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit desktop toolchain-funcs
|
||||
|
||||
DESCRIPTION="A game like Deflektor (C 64) or Mindbender (Amiga)"
|
||||
HOMEPAGE="https://www.artsoft.org/mirrormagic/"
|
||||
SRC_URI="https://www.artsoft.org/RELEASES/linux/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="sdl"
|
||||
|
||||
RDEPEND="
|
||||
!sdl? ( x11-libs/libX11 )
|
||||
sdl? (
|
||||
media-libs/libsdl[video]
|
||||
media-libs/sdl-mixer
|
||||
media-libs/sdl-image
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
!sdl? ( x11-libs/libXt )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply \
|
||||
"${FILESDIR}"/${P}-gcc41.patch \
|
||||
"${FILESDIR}"/${P}-parallel.patch \
|
||||
"${FILESDIR}"/${P}-64bit.patch \
|
||||
"${FILESDIR}"/${P}-gcc5.patch \
|
||||
"${FILESDIR}"/${P}-editor.patch
|
||||
rm -f ${PN} || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
-C src \
|
||||
CC="$(tc-getCC)" \
|
||||
AR="$(tc-getAR)" \
|
||||
RANLIB="$(tc-getRANLIB)" \
|
||||
OPTIONS="${CFLAGS}" \
|
||||
EXTRA_LDFLAGS="${LDFLAGS}" \
|
||||
RO_GAME_DIR=/usr/share/${PN} \
|
||||
RW_GAME_DIR=/var/${PN} \
|
||||
TARGET=$(usex sdl sdl x11)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
insinto /usr/share/${PN}
|
||||
doins -r graphics levels music sounds
|
||||
doicon "${FILESDIR}"/${PN}.xpm
|
||||
make_desktop_entry ${PN} "Mirror Magic II"
|
||||
einstalldocs
|
||||
}
|
||||
Reference in New Issue
Block a user