r14074 - in packages/trunk/a7xpg/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Sun May 19 02:15:22 UTC 2013
Author: bdefreese
Date: 2013-05-19 02:15:22 +0000 (Sun, 19 May 2013)
New Revision: 14074
Modified:
packages/trunk/a7xpg/debian/patches/dlang_v2.patch
packages/trunk/a7xpg/debian/rules
Log:
Remove -d from rules also and update dlang_v2 patch.
Modified: packages/trunk/a7xpg/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/dlang_v2.patch 2013-05-18 23:34:05 UTC (rev 14073)
+++ packages/trunk/a7xpg/debian/patches/dlang_v2.patch 2013-05-19 02:15:22 UTC (rev 14074)
@@ -1,7 +1,7 @@
Index: a7xpg-0.11.dfsg1/import/SDL_types.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/import/SDL_types.d 2013-05-15 11:00:07.000000000 -0400
-+++ a7xpg-0.11.dfsg1/import/SDL_types.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/import/SDL_types.d 2013-05-18 12:38:19.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_types.d 2013-05-18 12:40:07.000000000 -0400
@@ -23,6 +23,7 @@
/* General data types used by the SDL library */
@@ -12,21 +12,48 @@
SDL_FALSE = 0,
Index: a7xpg-0.11.dfsg1/import/SDL_rwops.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/import/SDL_rwops.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/import/SDL_rwops.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/import/SDL_rwops.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_rwops.d 2013-05-18 17:36:11.000000000 -0400
+@@ -35,22 +35,22 @@
+ SEEK_SET, SEEK_CUR, SEEK_END
+ Returns the final offset in the data source.
+ */
+- int (*seek)(SDL_RWops *context, int offset, int whence);
++ int function (SDL_RWops *context, int offset, int whence) seek;
+
+ /* Read up to 'num' objects each of size 'objsize' from the data
+ source to the area pointed at by 'ptr'.
+ Returns the number of objects read, or -1 if the read failed.
+ */
+- int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum);
++ int function (SDL_RWops *context, void *ptr, int size, int maxnum) read;
+
+ /* Write exactly 'num' objects each of size 'objsize' from the area
+ pointed at by 'ptr' to data source.
+ Returns 'num', or -1 if the write failed.
+ */
+- int (*write)(SDL_RWops *context, void *ptr, int size, int num);
++ int function (SDL_RWops *context, void *ptr, int size, int num) write;
+
+ /* Close and free an allocated SDL_FSops structure */
+- int (*close)(SDL_RWops *context);
++ int function (SDL_RWops *context) close;
+
+ Uint32 type;
+ union {
@@ -72,7 +72,7 @@
/* Functions to create SDL_RWops structures from various data sources */
-SDL_RWops * SDL_RWFromFile(char *file, char *mode);
-+SDL_RWops * SDL_RWFromFile(in char *file, in char* mode);
++SDL_RWops * SDL_RWFromFile (in char *file, in char* mode);
SDL_RWops * SDL_RWFromFP(void *fp, int autoclose);
Index: a7xpg-0.11.dfsg1/import/SDL_endian.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/import/SDL_endian.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/import/SDL_endian.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/import/SDL_endian.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_endian.d 2013-05-18 17:36:42.000000000 -0400
@@ -47,11 +47,11 @@
*/
@@ -52,8 +79,8 @@
/* Byteswap item from the specified endianness to the native endianness */
Index: a7xpg-0.11.dfsg1/src/abagames/util/Rand.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/Rand.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/Rand.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/Rand.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/Rand.d 2013-05-18 12:40:07.000000000 -0400
@@ -6,27 +6,30 @@
module abagames.util.Rand;
@@ -93,8 +120,8 @@
}
Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Sound.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Sound.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d 2013-05-18 12:40:07.000000000 -0400
@@ -5,7 +5,8 @@
*/
module abagames.util.sdl.Sound;
@@ -170,8 +197,8 @@
}
Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/SDLInitFailedException.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/SDLInitFailedException.d 2013-05-15 11:00:07.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/SDLInitFailedException.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/SDLInitFailedException.d 2013-05-18 12:38:19.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/SDLInitFailedException.d 2013-05-18 12:40:07.000000000 -0400
@@ -9,7 +9,7 @@
* SDL initialize failed.
*/
@@ -183,47 +210,178 @@
}
Index: a7xpg-0.11.dfsg1/import/SDL_mixer.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/import/SDL_mixer.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/import/SDL_mixer.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/import/SDL_mixer.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_mixer.d 2013-05-18 17:37:20.000000000 -0400
@@ -104,10 +104,10 @@
/* Load a wave file or a music (.mod .s3m .it .xm) file */
Mix_Chunk * Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
- Mix_Chunk * Mix_LoadWAV(char *file) {
-+ Mix_Chunk * Mix_LoadWAV(in char *file) {
++ Mix_Chunk * Mix_LoadWAV(const(char)* file) {
return Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1);
}
- Mix_Music * Mix_LoadMUS(char *file);
-+ Mix_Music * Mix_LoadMUS(in char *file);
++ Mix_Music * Mix_LoadMUS(const(char)* file);
/* Load a wave file of the mixer format from a memory buffer */
Mix_Chunk * Mix_QuickLoad_WAV(Uint8 *mem);
+@@ -128,19 +128,17 @@
+ This can be used to provide real-time visual display of the audio stream
+ or add a custom mixer filter for the stream data.
+ */
+- void Mix_SetPostMix(void (*mix_func)
+- (void *udata, Uint8 *stream, int len), void *arg);
++ void Mix_SetPostMix(void function(void *udata, Uint8 *stream, int len) mix_func, void *arg);
+
+ /* Add your own music player or additional mixer function.
+ If 'mix_func' is NULL, the default music player is re-enabled.
+ */
+- void Mix_HookMusic(void (*mix_func)
+- (void *udata, Uint8 *stream, int len), void *arg);
++ void Mix_HookMusic(void function(void *udata, Uint8 *stream, int len) mix_func, void *arg);
+
+ /* Add your own callback when the music has finished playing.
+ This callback is only called if the music finishes naturally.
+ */
+- void Mix_HookMusicFinished(void (*music_finished)());
++ void Mix_HookMusicFinished(void function() music_finished);
+
+ /* Get a pointer to the user data for the current music hook */
+ void * Mix_GetMusicHookData();
+@@ -153,7 +151,7 @@
+ * inside the audio callback, or SDL_mixer will explicitly lock the audio
+ * before calling your callback.
+ */
+- void Mix_ChannelFinished(void (*channel_finished)(int channel));
++ void Mix_ChannelFinished(void function(int channel) channel_finished);
+
+
+ /* Special Effects API by ryan c. gordon. (icculus at linuxgames.com) */
+@@ -177,7 +175,7 @@
+ *
+ * DO NOT EVER call SDL_LockAudio() from your callback function!
+ */
+- typedef void (*Mix_EffectFunc_t)(int chan, void *stream, int len, void *udata);
++ typedef void function(int chan, void *stream, int len, void *udata) Mix_EffectFunc_t;
+
+ /*
+ * This is a callback that signifies that a channel has finished all its
+@@ -188,7 +186,7 @@
+ *
+ * DO NOT EVER call SDL_LockAudio() from your callback function!
+ */
+- typedef void (*Mix_EffectDone_t)(int chan, void *udata);
++ typedef void function(int chan, void *udata) Mix_EffectDone_t;
+
+
+ /* Register a special effect function. At mixing time, the channel data is
+@@ -266,7 +264,7 @@
+ int Mix_UnregisterAllEffects(int channel);
+
+
+- const char[] MIX_EFFECTSMAXSPEED = "MIX_EFFECTSMAXSPEED";
++ const string MIX_EFFECTSMAXSPEED = "MIX_EFFECTSMAXSPEED";
+
+ /*
+ * These are the internally-defined mixing effects. They use the same API that
+@@ -510,7 +508,7 @@
+ int Mix_PlayingMusic();
+
+ /* Stop music and set external music playback command */
+- int Mix_SetMusicCMD(char *command);
++ int Mix_SetMusicCMD(const(char)* command);
+
+ /* Synchro value is set by MikMod from modules while playing */
+ int Mix_SetSynchroValue(int value);
+@@ -526,7 +524,7 @@
+
+ /* We'll use SDL for reporting errors */
+ // void Mix_SetError SDL_SetError
+- char * Mix_GetError() {
++ const(char)* Mix_GetError() {
+ return SDL_GetError();
+ }
+
Index: a7xpg-0.11.dfsg1/import/SDL_video.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/import/SDL_video.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/import/SDL_video.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/import/SDL_video.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_video.d 2013-05-18 17:39:00.000000000 -0400
+@@ -75,8 +75,8 @@
+ }
+
+ /* typedef for private surface blitting functions */
+-typedef int (*SDL_blit)(SDL_Surface *src, SDL_Rect *srcrect,
+- SDL_Surface *dst, SDL_Rect *dstrect);
++typedef int function (SDL_Surface *src, SDL_Rect *srcrect,
++ SDL_Surface *dst, SDL_Rect *dstrect) SDL_blit;
+
+ /* This structure should be treated as read-only, except for 'pixels',
+ which, if not NULL, contains the raw pixel data for the surface.
+@@ -230,14 +230,14 @@
+ * SDL_Init() before opening the sound device, otherwise under Win32 DirectX,
+ * you won't be able to set full-screen display modes.
+ */
+-int SDL_VideoInit(char *driver_name, Uint32 flags);
++int SDL_VideoInit(const(char)* driver_name, Uint32 flags);
+ void SDL_VideoQuit();
+
+ /* This function fills the given character buffer with the name of the
+ * video driver, and returns a pointer to it if the video driver has
+ * been initialized. It returns NULL if no driver has been initialized.
+ */
+-char *SDL_VideoDriverName(char *namebuf, int maxlen);
++const(char)* SDL_VideoDriverName(char *namebuf, int maxlen);
+
+ /*
+ * This function returns a pointer to the current display surface.
@@ -540,7 +540,7 @@
SDL_Surface * SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);
/* Convenience macro -- load a surface from a file */
-SDL_Surface * SDL_LoadBMP(char* file)
-+SDL_Surface * SDL_LoadBMP(in char* file)
++SDL_Surface * SDL_LoadBMP(const(char)* file)
{
return SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1);
}
-@@ -837,7 +837,7 @@
+@@ -554,7 +554,7 @@
+ (SDL_Surface *surface, SDL_RWops *dst, int freedst);
+
+ /* Convenience macro -- save a surface to a file */
+-int SDL_SaveBMP(SDL_Surface *surface, char* file)
++int SDL_SaveBMP(SDL_Surface *surface, const(char)* file)
+ {
+ return SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1);
+ }
+@@ -794,12 +794,12 @@
+ *
+ * This is disabled in default builds of SDL.
+ */
+-int SDL_GL_LoadLibrary(char *path);
++int SDL_GL_LoadLibrary(const(char)* path);
+
/*
+ * Get the address of a GL function (for extension functions)
+ */
+-void *SDL_GL_GetProcAddress(char* proc);
++void *SDL_GL_GetProcAddress(const(char)* proc);
+
+ /*
+ * Set an attribute of the OpenGL subsystem before intialization.
+@@ -837,8 +837,8 @@
+ /*
* Sets/Gets the title and icon text of the display window
*/
-void SDL_WM_SetCaption(char *title, char *icon);
-+void SDL_WM_SetCaption(in char *title, in char *icon);
- void SDL_WM_GetCaption(char **title, char **icon);
+-void SDL_WM_GetCaption(char **title, char **icon);
++void SDL_WM_SetCaption(const(char)* title, const(char)* icon);
++void SDL_WM_GetCaption(const(char)* *title, const(char)* *icon);
/*
+ * Sets the icon for the display window.
Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xBoot.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xBoot.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d 2013-05-18 12:40:07.000000000 -0400
@@ -5,6 +5,7 @@
*/
module abagames.a7xpg.A7xBoot;
@@ -270,8 +428,8 @@
try {
Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xGameManager.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xGameManager.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d 2013-05-18 12:40:07.000000000 -0400
@@ -126,18 +126,18 @@
ship = new Ship;
ship.init(input, field, this);
@@ -301,8 +459,8 @@
for (int i = 0; i < bgm.length; i++)
Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xPrefManager.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xPrefManager.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d 2013-05-18 12:40:07.000000000 -0400
@@ -8,6 +8,7 @@
import std.stream;
import std.c.stdlib;
@@ -349,8 +507,8 @@
fd.write(hiScore);
Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xScreen.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xScreen.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d 2013-05-18 12:40:07.000000000 -0400
@@ -14,7 +14,7 @@
*/
public class A7xScreen: Screen3D {
@@ -362,8 +520,8 @@
Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LetterRender.d 2013-05-17 09:39:31.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LetterRender.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d 2013-05-18 12:40:07.000000000 -0400
@@ -31,7 +31,7 @@
glPopMatrix();
}
@@ -375,8 +533,8 @@
int idx;
Index: a7xpg-0.11.dfsg1/src/abagames/util/ActorPool.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/ActorPool.d 2013-05-15 11:00:07.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/ActorPool.d 2013-05-17 09:39:48.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/ActorPool.d 2013-05-18 12:38:19.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/ActorPool.d 2013-05-18 12:40:07.000000000 -0400
@@ -14,7 +14,7 @@
public:
Actor[] actor;
@@ -388,8 +546,8 @@
actor = new Actor[n];
Index: a7xpg-0.11.dfsg1/src/abagames/util/Logger.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/Logger.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/Logger.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/Logger.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/Logger.d 2013-05-18 12:40:07.000000000 -0400
@@ -11,11 +11,11 @@
* Logger(error/info).
*/
@@ -406,8 +564,8 @@
}
Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Input.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Input.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d 2013-05-18 12:40:07.000000000 -0400
@@ -5,7 +5,8 @@
*/
module abagames.util.sdl.Input;
@@ -429,8 +587,8 @@
}
Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/MainLoop.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/MainLoop.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d 2013-05-18 12:40:07.000000000 -0400
@@ -90,7 +90,7 @@
frame = cast(int) (nowTick-prvTickCount) / interval;
if (frame <= 0) {
@@ -442,8 +600,8 @@
} else {
Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Screen3D.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Screen3D.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d 2013-05-18 12:40:07.000000000 -0400
@@ -5,7 +5,8 @@
*/
module abagames.util.sdl.Screen3D;
@@ -493,8 +651,8 @@
}
Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d
===================================================================
---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Texture.d 2013-05-17 09:39:30.000000000 -0400
-+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d 2013-05-17 09:39:31.000000000 -0400
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Texture.d 2013-05-18 12:40:07.000000000 -0400
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d 2013-05-18 12:40:07.000000000 -0400
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Texture;
@@ -524,3 +682,329 @@
if (!surface) {
throw new SDLInitFailedException("Unable to load: " ~ fileName);
}
+Index: a7xpg-0.11.dfsg1/import/openglu.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/openglu.d 2003-09-19 19:55:50.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/openglu.d 2013-05-18 15:35:43.000000000 -0400
+@@ -1,6 +1,6 @@
+ import opengl;
+
+-extern(Windows):
++extern(C):
+
+ GLubyte* gluErrorString (
+ GLenum errCode);
+@@ -157,7 +157,7 @@
+ void gluQuadricCallback (
+ GLUquadric *qobj,
+ GLenum which,
+- void (* fn)());
++ void function() fn);
+
+ GLUtesselator* gluNewTess(
+ );
+@@ -197,7 +197,7 @@
+ void gluTessCallback(
+ GLUtesselator *tess,
+ GLenum which,
+- void ( *fn)());
++ void function () fn);
+
+ void gluGetTessProperty(
+ GLUtesselator *tess,
+@@ -280,37 +280,37 @@
+ gluNurbsCallback (
+ GLUnurbs *nobj,
+ GLenum which,
+- void (* fn)() );
++ void function() fn);
+
+
+ /**** function prototypes ****/
+
+ /* gluQuadricCallback */
+-typedef void (* GLUquadricErrorProc) (GLenum);
++typedef void function (GLenum) GLUquadricErrorProc;
+
+ /* gluTessCallback */
+-typedef void (* GLUtessBeginProc) (GLenum);
+-typedef void (* GLUtessEdgeFlagProc) (GLboolean);
+-typedef void (* GLUtessVertexProc) (void *);
+-typedef void (* GLUtessEndProc) ();
+-typedef void (* GLUtessErrorProc) (GLenum);
+-typedef void (* GLUtessCombineProc) (GLdouble[3],
+- void*[4],
+- GLfloat[4],
+- void** );
+-typedef void (* GLUtessBeginDataProc) (GLenum, void *);
+-typedef void (* GLUtessEdgeFlagDataProc) (GLboolean, void *);
+-typedef void (* GLUtessVertexDataProc) (void *, void *);
+-typedef void (* GLUtessEndDataProc) (void *);
+-typedef void (* GLUtessErrorDataProc) (GLenum, void *);
+-typedef void (* GLUtessCombineDataProc) (GLdouble[3],
+- void*[4],
+- GLfloat[4],
+- void**,
+- void* );
++typedef void function(GLenum) GLUtessBeginProc;
++typedef void function(GLboolean) GLUtessEdgeFlagProc;
++typedef void function(void *) GLUtessVertexProc;
++typedef void function() GLUtessEndProc;
++typedef void function(GLenum) GLUtessErrorProc;
++typedef void function(GLdouble[3],
++ void*[4],
++ GLfloat[4],
++ void** ) GLUtessCombineProc;
++typedef void function(GLenum, void *) GLUtessBeginDataProc;
++typedef void function(GLboolean, void *) GLUtessEdgeFlagDataProc;
++typedef void function(void *, void *) GLUtessVertexDataProc;
++typedef void function(void *) GLUtessEndDataProc;
++typedef void function(GLenum, void *) GLUtessErrorDataProc;
++typedef void function(GLdouble[3],
++ void*[4],
++ GLfloat[4],
++ void**,
++ void* ) GLUtessCombineDataProc;
+
+ /* gluNurbsCallback */
+-typedef void (* GLUnurbsErrorProc) (GLenum);
++typedef void function(GLenum) GLUnurbsErrorProc;
+
+
+ /**** Generic constants ****/
+Index: a7xpg-0.11.dfsg1/import/opengl.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/opengl.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/opengl.d 2013-05-18 15:29:59.000000000 -0400
+@@ -1448,35 +1448,30 @@
+
+
+ /* EXT_vertex_array */
+-typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i);
+-typedef void (* PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+-typedef void (* PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, GLboolean *pointer);
+-typedef void (* PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+-typedef void (* PFNGLARRAYELEMENTARRAYEXTPROC)(GLenum mode, GLsizei count, GLvoid* pi);
++typedef void function(GLint i) PFNGLARRAYELEMENTEXTPROC;
++typedef void function(GLenum mode, GLint first, GLsizei count) PFNGLDRAWARRAYSEXTPROC;
++typedef void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLVERTEXPOINTEREXTPROC;
++typedef void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLNORMALPOINTEREXTPROC;
++typedef void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLCOLORPOINTEREXTPROC;
++typedef void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLINDEXPOINTEREXTPROC;
++typedef void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLTEXCOORDPOINTEREXTPROC;
++typedef void function(GLsizei stride, GLsizei count, GLboolean *pointer) PFNGLEDGEFLAGPOINTEREXTPROC;
++typedef void function(GLenum pname, GLvoid* *params) PFNGLGETPOINTERVEXTPROC;
++typedef void function(GLenum mode, GLsizei count, GLvoid* pi) PFNGLARRAYELEMENTARRAYEXTPROC;
+
+ /* WIN_draw_range_elements */
+-typedef void (* PFNGLDRAWRANGEELEMENTSWINPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices);
++typedef void function(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices) PFNGLDRAWRANGEELEMENTSWINPROC;
+
+ /* WIN_swap_hint */
+-typedef void (* PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
++typedef void function(GLint x, GLint y, GLsizei width, GLsizei height) PFNGLADDSWAPHINTRECTWINPROC;
+
+ /* EXT_paletted_texture */
+-typedef void (* PFNGLCOLORTABLEEXTPROC)
+- (GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
+- GLenum type, GLvoid *data);
+-typedef void (* PFNGLCOLORSUBTABLEEXTPROC)
+- (GLenum target, GLsizei start, GLsizei count, GLenum format,
+- GLenum type, GLvoid *data);
+-typedef void (* PFNGLGETCOLORTABLEEXTPROC)
+- (GLenum target, GLenum format, GLenum type, GLvoid *data);
+-typedef void (* PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)
+- (GLenum target, GLenum pname, GLint *params);
+-typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)
+- (GLenum target, GLenum pname, GLfloat *params);
++typedef void function(GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
++ GLenum type, GLvoid *data) PFNGLCOLORTABLEEXTPROC;
++typedef void function(GLenum target, GLsizei start, GLsizei count, GLenum format,
++ GLenum type, GLvoid *data) PFNGLCOLORSUBTABLEEXTPROC;
++typedef void function(GLenum target, GLenum format, GLenum type, GLvoid *data) PFNGLGETCOLORTABLEEXTPROC;
++typedef void function(GLenum target, GLenum pname, GLint *params) PFNGLGETCOLORTABLEPARAMETERIVEXTPROC;
++typedef void function(GLenum target, GLenum pname, GLfloat *params) PFNGLGETCOLORTABLEPARAMETERFVEXTPROC;
+
+ import openglu;
+Index: a7xpg-0.11.dfsg1/import/SDL_timer.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_timer.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_timer.d 2013-05-18 17:39:20.000000000 -0400
+@@ -39,7 +39,7 @@
+ void SDL_Delay(Uint32 ms);
+
+ /* Function prototype for the timer callback function */
+-alias Uint32 (*SDL_TimerCallback)(Uint32 interval);
++alias Uint32 function(Uint32 interval) SDL_TimerCallback;
+
+ /* Set a callback to run after the specified number of milliseconds has
+ * elapsed. The callback function is passed the current timer interval
+@@ -79,7 +79,7 @@
+ * passed in, the periodic alarm continues, otherwise a new alarm is
+ * scheduled. If the callback returns 0, the periodic alarm is cancelled.
+ */
+-alias Uint32 (*SDL_NewTimerCallback)(Uint32 interval, void *param);
++alias Uint32 function(Uint32 interval, void *param) SDL_NewTimerCallback;
+
+ /* Definition of the timer ID type */
+ alias void *SDL_TimerID;
+Index: a7xpg-0.11.dfsg1/import/SDL_audio.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_audio.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_audio.d 2013-05-18 17:39:54.000000000 -0400
+@@ -42,7 +42,7 @@
+ Once the callback returns, the buffer will no longer be valid.
+ Stereo samples are stored in a LRLRLR ordering.
+ */
+- void (*callback)(void *userdata, Uint8 *stream, int len);
++ void function(void *userdata, Uint8 *stream, int len) callback;
+ void *userdata;
+ }
+
+@@ -74,7 +74,7 @@
+ int len_cvt; /* Length of converted audio buffer */
+ int len_mult; /* buffer must be len*len_mult big */
+ double len_ratio; /* Given len, final size is len*len_ratio */
+- void (*filters[10])(SDL_AudioCVT *cvt, Uint16 format);
++ void function (SDL_AudioCVT *cvt, Uint16 format) filters[10];
+ int filter_index; /* Current audio conversion function */
+ }
+
+@@ -85,14 +85,14 @@
+ * have a specific need to specify the audio driver you want to use.
+ * You should normally use SDL_Init() or SDL_InitSubSystem().
+ */
+-int SDL_AudioInit(char *driver_name);
++int SDL_AudioInit(const(char)* driver_name);
+ void SDL_AudioQuit();
+
+ /* This function fills the given character buffer with the name of the
+ * current audio driver, and returns a pointer to it if the audio driver has
+ * been initialized. It returns NULL if no driver has been initialized.
+ */
+-char *SDL_AudioDriverName(char *namebuf, int maxlen);
++const(char)* SDL_AudioDriverName(char *namebuf, int maxlen);
+
+ /*
+ * This function opens the audio device with the desired parameters, and
+@@ -178,7 +178,7 @@
+ SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
+
+ /* Compatibility convenience function -- loads a WAV from a file */
+-SDL_AudioSpec *SDL_LoadWAV(char* file, SDL_AudioSpec* spec,
++SDL_AudioSpec *SDL_LoadWAV(const(char)* file, SDL_AudioSpec* spec,
+ Uint8 **audio_buf, Uint32 *audio_len)
+ {
+ return SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1, spec,
+Index: a7xpg-0.11.dfsg1/import/SDL_events.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_events.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_events.d 2013-05-18 17:40:37.000000000 -0400
+@@ -271,7 +271,7 @@
+
+ The filter is protypted as:
+ */
+-alias int (*SDL_EventFilter)(SDL_Event *event);
++alias int function(SDL_Event *event) SDL_EventFilter;
+ /*
+ If the filter returns 1, then the event will be added to the internal queue.
+ If it returns 0, then the event will be dropped from the queue, but the
+@@ -304,8 +304,8 @@
+ If 'state' is set to SDL_QUERY, SDL_EventState() will return the
+ current processing state of the specified event.
+ */
+-const uint SDL_QUERY = -1;
+-const uint SDL_IGNORE = 0;
+-const uint SDL_DISABLE = 0;
+-const uint SDL_ENABLE = 1;
++const int SDL_QUERY = -1;
++const int SDL_IGNORE = 0;
++const int SDL_DISABLE = 0;
++const int SDL_ENABLE = 1;
+ Uint8 SDL_EventState(Uint8 type, int state);
+Index: a7xpg-0.11.dfsg1/import/SDL_cdrom.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_cdrom.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_cdrom.d 2013-05-18 17:41:41.000000000 -0400
+@@ -101,7 +101,7 @@
+ "E:"
+ "/dev/disk/ide/1/master"
+ */
+-char * SDL_CDName(int drive);
++const(char)* SDL_CDName(int drive);
+
+ /* Opens a CD-ROM drive for access. It returns a drive handle on success,
+ or NULL if the drive was invalid or busy. This newly opened CD-ROM
+Index: a7xpg-0.11.dfsg1/import/SDL_error.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_error.d 2003-09-19 19:55:50.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_error.d 2013-05-18 16:18:38.000000000 -0400
+@@ -25,8 +25,8 @@
+ extern(C):
+
+ /* Public functions */
+-void SDL_SetError(char *fmt, ...);
+-char * SDL_GetError();
++void SDL_SetError(const(char)* fmt, ...);
++const(char)* SDL_GetError();
+ void SDL_ClearError();
+
+ /* Private error message function - used internally */
+Index: a7xpg-0.11.dfsg1/import/SDL_joystick.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_joystick.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_joystick.d 2013-05-18 17:42:03.000000000 -0400
+@@ -45,7 +45,7 @@
+ * This can be called before any joysticks are opened.
+ * If no name can be found, this function returns NULL.
+ */
+-char *SDL_JoystickName(int device_index);
++const(char)* SDL_JoystickName(int device_index);
+
+ /*
+ * Open a joystick for use - the index passed as an argument refers to
+Index: a7xpg-0.11.dfsg1/import/SDL_mouse.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_mouse.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_mouse.d 2013-05-18 17:43:07.000000000 -0400
+@@ -109,6 +109,8 @@
+ const uint SDL_BUTTON_LEFT = 1;
+ const uint SDL_BUTTON_MIDDLE = 2;
+ const uint SDL_BUTTON_RIGHT = 3;
++const uint SDL_BUTTON_WHEELUP = 4;
++const uint SDL_BUTTON_WHEELDOWN = 5;
+ const uint SDL_BUTTON_LMASK = SDL_PRESSED << (SDL_BUTTON_LEFT - 1);
+ const uint SDL_BUTTON_MMASK = SDL_PRESSED << (SDL_BUTTON_MIDDLE - 1);
+ const uint SDL_BUTTON_RMASK = SDL_PRESSED << (SDL_BUTTON_RIGHT - 1);
+Index: a7xpg-0.11.dfsg1/import/SDL_quit.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_quit.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_quit.d 2013-05-18 17:28:33.000000000 -0400
+@@ -22,7 +22,8 @@
+
+ /* Include file for SDL quit event handling */
+
+-public import SDL_events;
++import SDL_events;
++import SDL_types;
+
+ /*
+ An SDL_QUITEVENT is generated when the user tries to close the application
+Index: a7xpg-0.11.dfsg1/import/SDL_thread.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_thread.d 2013-05-18 12:40:06.000000000 -0400
++++ a7xpg-0.11.dfsg1/import/SDL_thread.d 2013-05-18 17:44:52.000000000 -0400
+@@ -34,7 +34,7 @@
+ struct SDL_Thread { }
+
+ /* Create a thread */
+-SDL_Thread * SDL_CreateThread(int (*fn)(void *), void *data);
++SDL_Thread * SDL_CreateThread(int function(void *) fn, void *data);
+
+ /* Get the 32-bit thread identifier for the current thread */
+ Uint32 SDL_ThreadID();
Modified: packages/trunk/a7xpg/debian/rules
===================================================================
--- packages/trunk/a7xpg/debian/rules 2013-05-18 23:34:05 UTC (rev 14073)
+++ packages/trunk/a7xpg/debian/rules 2013-05-19 02:15:22 UTC (rev 14074)
@@ -7,10 +7,10 @@
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
- DFLAGS = -g -debug -d
+ DFLAGS = -g -debug
else
CFLAGS += -O2
- DFLAGS = -O -release -d
+ DFLAGS = -O -release
endif
configure: configure-stamp
More information about the Pkg-games-commits
mailing list