r14067 - in packages/trunk/a7xpg/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Sat May 18 17:51:17 UTC 2013
Author: bdefreese
Date: 2013-05-18 17:51:17 +0000 (Sat, 18 May 2013)
New Revision: 14067
Added:
packages/trunk/a7xpg/debian/patches/dlang_v2.patch
Modified:
packages/trunk/a7xpg/debian/changelog
packages/trunk/a7xpg/debian/control
packages/trunk/a7xpg/debian/patches/makefile.patch
packages/trunk/a7xpg/debian/patches/series
Log:
Add patch to build/run on dlang v2.
Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog 2013-05-16 05:26:55 UTC (rev 14066)
+++ packages/trunk/a7xpg/debian/changelog 2013-05-18 17:51:17 UTC (rev 14067)
@@ -1,5 +1,10 @@
-a7xpg (0.11.dfsg1-8) UNRELEASED; urgency=low
+a7xpg (0.11.dfsg1-8) unstable; urgency=low
+ [ Barry deFreese ]
+ * Patch to build with gdc v2. (Closes: #707263)
+ * Bump Standards Version to 3.7.4.
+
+ [ Ansgar Burchardt ]
* debian/control: Remove DM-Upload-Allowed.
-- Ansgar Burchardt <ansgar at debian.org> Fri, 02 Nov 2012 19:36:46 +0100
Modified: packages/trunk/a7xpg/debian/control
===================================================================
--- packages/trunk/a7xpg/debian/control 2013-05-16 05:26:55 UTC (rev 14066)
+++ packages/trunk/a7xpg/debian/control 2013-05-18 17:51:17 UTC (rev 14067)
@@ -3,10 +3,10 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>, Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 5), gdc-v1 (>= 4.6.2-4~),
+Build-Depends: debhelper (>= 5), gdc (>= 4.6.3),
libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/a7xpg_e.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/a7xpg/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/a7xpg/?op=log
Added: packages/trunk/a7xpg/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/dlang_v2.patch (rev 0)
+++ packages/trunk/a7xpg/debian/patches/dlang_v2.patch 2013-05-18 17:51:17 UTC (rev 14067)
@@ -0,0 +1,526 @@
+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
+@@ -23,6 +23,7 @@
+ /* General data types used by the SDL library */
+
+ /* Basic data types */
++alias bool bit;
+ alias int SDL_bool;
+ enum {
+ 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
+@@ -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_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
+@@ -47,11 +47,11 @@
+ */
+
+ Uint16 SDL_Swap16(Uint16 D) {
+- return((D<<8)|(D>>8));
++ return cast(Uint16) ((D<<8)|(D>>8));
+ }
+
+ Uint32 SDL_Swap32(Uint32 D) {
+- return((D<<24)|((D<<8)&0x00FF0000)|((D>>8)&0x0000FF00)|(D>>24));
++ return cast(Uint32) ((D<<24)|((D<<8)&0x00FF0000)|((D>>8)&0x0000FF00)|(D>>24));
+ }
+
+ Uint64 SDL_Swap64(Uint64 val) {
+@@ -63,7 +63,7 @@
+ val = SDL_Swap32(lo);
+ val <<= 32;
+ val |= SDL_Swap32(hi);
+- return(val);
++ return cast(Uint64) (val);
+ }
+
+ /* 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
+@@ -6,27 +6,30 @@
+ module abagames.util.Rand;
+
+ import std.random;
+-import std.date;
++import std.datetime;
+
+ /**
+ * Random number generator.
+ */
+ public class Rand {
++ private Random rand;
+
+ public this() {
+- d_time timer = getUTCtime();
+- rand_seed(timer, 0);
++ rand.seed(unpredictableSeed);
+ }
+
+ public int nextInt(int n) {
+- return rand() % n;
++ rand.popFront();
++ return rand.front() % n;
+ }
+
+ public int nextSignedInt(int n) {
+- return rand() % (n * 2) - n;
++ rand.popFront();
++ return rand.front() % (n * 2) - n;
+ }
+
+ public float nextFloat(float n) {
+- return (cast(float)(rand() % (n * 10000))) / 10000;
++ rand.popFront();
++ return (cast(float)(rand.front() % (n * 10000))) / 10000;
+ }
+ }
+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
+@@ -5,7 +5,8 @@
+ */
+ module abagames.util.sdl.Sound;
+
+-import string = std.string;
++import std.conv;
++import std.string;
+ import SDL;
+ import SDL_mixer;
+ import abagames.util.sdl.SDLInitFailedException;
+@@ -18,8 +19,8 @@
+ public:
+ static bool noSound = false;
+ static int fadeOutSpeed = 1280;
+- static char[] soundsDir = "/usr/share/games/a7xpg/sounds/";
+- static char[] chunksDir = "/usr/share/games/a7xpg/sounds/";
++ static string soundsDir = "/usr/share/games/a7xpg/sounds/";
++ static string chunksDir = "/usr/share/games/a7xpg/sounds/";
+
+ public static void init() {
+ if (noSound) return;
+@@ -31,7 +32,7 @@
+
+ if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
+ noSound = 1;
+- derr.writeLine("Unable to initialize SDL audio: " ~ string.toString(SDL_GetError()));
++ derr.writeLine("Unable to initialize SDL audio: " ~ to!string(SDL_GetError()));
+ }
+
+ audio_rate = 44100;
+@@ -40,7 +41,7 @@
+ audio_buffers = 4096;
+ if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) < 0) {
+ noSound = 1;
+- derr.writeLine("Couldn't open audio: " ~ string.toString(SDL_GetError()));
++ derr.writeLine("Couldn't open audio: " ~ to!string(SDL_GetError()));
+ }
+ Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
+ }
+@@ -62,25 +63,25 @@
+
+ // Load a sound or a chunk.
+
+- public void loadSound(char[] name) {
++ public void loadSound(string name) {
+ if (noSound) return;
+- char[] fileName = soundsDir ~ name;
+- music = Mix_LoadMUS(string.toStringz(fileName));
++ string fileName = soundsDir ~ name;
++ music = Mix_LoadMUS(toStringz(fileName));
+ if (!music) {
+ noSound = true;
+ throw new SDLInitFailedException("Couldn't load: " ~ fileName ~
+- " (" ~ string.toString(Mix_GetError()) ~ ")");
++ " (" ~ to!string(Mix_GetError()) ~ ")");
+ }
+ }
+
+- public void loadChunk(char[] name, int ch) {
++ public void loadChunk(string name, int ch) {
+ if (noSound) return;
+- char[] fileName = chunksDir ~ name;
+- chunk = Mix_LoadWAV(string.toStringz(fileName));
++ string fileName = chunksDir ~ name;
++ chunk = Mix_LoadWAV(toStringz(fileName));
+ if (!chunk) {
+ noSound = true;
+ throw new SDLInitFailedException("Couldn't load: " ~ fileName ~
+- " (" ~ string.toString(Mix_GetError()) ~ ")");
++ " (" ~ to!string(Mix_GetError()) ~ ")");
+ }
+ chunkChannel = ch;
+ }
+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
+@@ -9,7 +9,7 @@
+ * SDL initialize failed.
+ */
+ public class SDLInitFailedException: Exception {
+- public this(char[] msg) {
++ public this(string msg) {
+ super(msg);
+ }
+ }
+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
+@@ -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) {
+ return Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1);
+ }
+- Mix_Music * Mix_LoadMUS(char *file);
++ Mix_Music * Mix_LoadMUS(in char *file);
+
+ /* Load a wave file of the mixer format from a memory buffer */
+ Mix_Chunk * Mix_QuickLoad_WAV(Uint8 *mem);
+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
+@@ -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)
+ {
+ return SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1);
+ }
+@@ -837,7 +837,7 @@
+ /*
+ * 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);
+
+ /*
+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
+@@ -5,6 +5,7 @@
+ */
+ module abagames.a7xpg.A7xBoot;
+
++import std.conv;
+ import std.string;
+ import std.c.stdlib: exit, EXIT_SUCCESS, EXIT_FAILURE;
+ import abagames.a7xpg.A7xScreen;
+@@ -30,7 +31,7 @@
+ ("Usage: a7xpg [-brightness [0-100]] [-luminous [0-100]] [-nosound] [-window] [-fullscreen] [-lowres]");
+ }
+
+-private void parseArgs(char[][] args) {
++private void parseArgs(string[] args) {
+ for (int i = 1; i < args.length; i++) {
+ switch (args[i]) {
+ case "-brightness":
+@@ -39,7 +40,7 @@
+ exit(EXIT_FAILURE);
+ }
+ i++;
+- float b = cast(float) atoi(args[i]) / 100;
++ float b = to!float(args[i]) / 100;
+ if (b < 0 || b > 1) {
+ usage();
+ exit(EXIT_FAILURE);
+@@ -52,7 +53,7 @@
+ exit(EXIT_FAILURE);
+ }
+ i++;
+- float l = cast(float) atoi(args[i]) / 100;
++ float l = to!float(args[i]) / 100;
+ if (l < 0 || l > 1) {
+ usage();
+ exit(EXIT_FAILURE);
+@@ -81,7 +82,7 @@
+ }
+ }
+
+-public int main(char[][] args) {
++public int main(string[] args) {
+ screen = new A7xScreen;
+ input = new Input;
+ 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
+@@ -126,18 +126,18 @@
+ ship = new Ship;
+ ship.init(input, field, this);
+ Gold.createDisplayLists();
+- auto Gold goldClass = new Gold;
+- auto GoldInitializer gi = new GoldInitializer(ship, field, rand, this);
++ scope Gold goldClass = new Gold;
++ scope GoldInitializer gi = new GoldInitializer(ship, field, rand, this);
+ golds = new LuminousActorPool(16, goldClass, gi);
+ Enemy.createDisplayLists();
+- auto Enemy enemyClass = new Enemy;
+- auto EnemyInitializer ei = new EnemyInitializer(ship, field, rand, this);
++ scope Enemy enemyClass = new Enemy;
++ scope EnemyInitializer ei = new EnemyInitializer(ship, field, rand, this);
+ enemies = new LuminousActorPool(ENEMY_MAX, enemyClass, ei);
+- auto Particle particleClass = new Particle;
+- auto ParticleInitializer pi = new ParticleInitializer(field, rand);
++ scope Particle particleClass = new Particle;
++ scope ParticleInitializer pi = new ParticleInitializer(field, rand);
+ particles = new LuminousActorPool(256, particleClass, pi);
+- auto Bonus bonusClass = new Bonus;
+- auto BonusInitializer bi = new BonusInitializer();
++ scope Bonus bonusClass = new Bonus;
++ scope BonusInitializer bi = new BonusInitializer();
+ bonuses = new ActorPool(8, bonusClass, bi);
+ LetterRender.createDisplayLists();
+ 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
+@@ -8,6 +8,7 @@
+ import std.stream;
+ import std.c.stdlib;
+ import std.string;
++import std.conv;
+ import abagames.util.PrefManager;
+
+ /**
+@@ -16,22 +17,22 @@
+ public class A7xPrefManager: PrefManager {
+ public:
+ static const int VERSION_NUM = 10;
+- static const char[] PREF_FILE = ".a7xpg.prf";
++ static const string PREF_FILE = ".a7xpg.prf";
+ int hiScore;
+
+ private void init() {
+ hiScore = 0;
+ }
+
+- public char[] pref_file() {
++ public string pref_file() {
+ char * home = getenv("HOME");
+ if (home is null)
+ throw new Error("HOME environment variable is not defined");
+- return std.string.toString(home) ~ "/" ~ PREF_FILE;
++ return to!string(home) ~ "/" ~ PREF_FILE;
+ }
+
+ public void load() {
+- auto File fd = new File;
++ scope File fd = new File;
+ try {
+ int ver;
+ fd.open(pref_file());
+@@ -47,7 +48,7 @@
+ }
+
+ public void save() {
+- auto File fd = new File;
++ scope File fd = new File;
+ fd.create(pref_file());
+ fd.write(VERSION_NUM);
+ 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
+@@ -14,7 +14,7 @@
+ */
+ public class A7xScreen: Screen3D {
+ public:
+- static const char[] CAPTION = "A7Xpg";
++ static const string CAPTION = "A7Xpg";
+ static float brightness = 1;
+ static float luminous = 0.5;
+
+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
+@@ -31,7 +31,7 @@
+ glPopMatrix();
+ }
+
+- public static void drawString(char[] str, float lx, float y, float s) {
++ public static void drawString(string str, float lx, float y, float s) {
+ float x = lx;
+ int c;
+ 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
+@@ -14,7 +14,7 @@
+ public:
+ Actor[] actor;
+ protected:
+- int actorIdx;
++ ptrdiff_t actorIdx;
+
+ public this(int n, Actor act, ActorInitializer ini) {
+ 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
+@@ -11,11 +11,11 @@
+ * Logger(error/info).
+ */
+ public class Logger {
+- public static void info(char[] msg) {
++ public static void info(string msg) {
+ derr.writeLine("Info: " ~ msg);
+ }
+
+- public static void error(char[] msg) {
++ public static void error(string msg) {
+ //derr.writeLine("Error: " ~ msg);
+ throw new Exception("Error: " ~ msg ~ "\0");
+ }
+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
+@@ -5,7 +5,8 @@
+ */
+ module abagames.util.sdl.Input;
+
+-import string = std.string;
++import std.conv;
++import std.string;
+ import SDL;
+ import abagames.util.sdl.SDLInitFailedException;
+
+@@ -30,7 +31,7 @@
+ public void openJoystick() {
+ if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) {
+ throw new SDLInitFailedException(
+- "Unable to init SDL joystick: " ~ string.toString(SDL_GetError()));
++ "Unable to init SDL joystick: " ~ to!string(SDL_GetError()));
+ }
+ stick = SDL_JoystickOpen(0);
+ }
+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
+@@ -90,7 +90,7 @@
+ frame = cast(int) (nowTick-prvTickCount) / interval;
+ if (frame <= 0) {
+ frame = 1;
+- SDL_Delay(prvTickCount+interval-nowTick);
++ SDL_Delay(cast(uint) (prvTickCount+interval-nowTick));
+ if (accframe) {
+ prvTickCount = SDL_GetTicks();
+ } 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
+@@ -5,7 +5,8 @@
+ */
+ module abagames.util.sdl.Screen3D;
+
+-import string = std.string;
++import std.conv;
++import std.string;
+ import std.c.stdlib;
+ import SDL;
+ import opengl;
+@@ -39,7 +40,7 @@
+ // Initialize SDL.
+ if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+ throw new SDLInitFailedException(
+- "Unable to initialize SDL: " ~ string.toString(SDL_GetError()));
++ "Unable to initialize SDL: " ~ to!string(SDL_GetError()));
+ }
+ // Create an OpenGL screen.
+ if (windowMode) {
+@@ -49,7 +50,7 @@
+ }
+ if (SDL_SetVideoMode(width, height, 0, videoFlags) == null) {
+ throw new SDLInitFailedException
+- ("Unable to create SDL screen: " ~ string.toString(SDL_GetError()));
++ ("Unable to create SDL screen: " ~ to!string(SDL_GetError()));
+ }
+ glViewport(0, 0, width, height);
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+@@ -63,7 +64,7 @@
+ public void screenResized() {
+ if (SDL_SetVideoMode(width, height, 0, videoFlags) == null) {
+ throw new Exception
+- ("Unable to resize SDL screen: " ~ std.string.toString(SDL_GetError()));
++ ("Unable to resize SDL screen: " ~ to!string(SDL_GetError()));
+ }
+
+ glViewport(0, 0, width, height);
+@@ -105,7 +106,7 @@
+ exit(EXIT_FAILURE);
+ }
+
+- protected void setCaption(char[] name) {
+- SDL_WM_SetCaption(string.toStringz(name), null);
++ protected void setCaption(string name) {
++ SDL_WM_SetCaption(toStringz(name), null);
+ }
+ }
+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
+@@ -5,7 +5,7 @@
+ */
+ module abagames.util.sdl.Texture;
+
+-import string = std.string;
++import std.string;
+ import opengl;
+ import SDL;
+ import abagames.util.sdl.SDLInitFailedException;
+@@ -15,15 +15,15 @@
+ */
+ public class Texture {
+ public:
+- static char[] imagesDir = "/usr/share/games/a7xpg/images/";
++ static string imagesDir = "/usr/share/games/a7xpg/images/";
+
+ private:
+ GLuint num;
+
+- public this(char[] name) {
+- char[] fileName = imagesDir ~ name;
++ public this(string name) {
++ string fileName = imagesDir ~ name;
+ SDL_Surface *surface;
+- surface = SDL_LoadBMP(string.toStringz(fileName));
++ surface = SDL_LoadBMP(toStringz(fileName));
+ if (!surface) {
+ throw new SDLInitFailedException("Unable to load: " ~ fileName);
+ }
Modified: packages/trunk/a7xpg/debian/patches/makefile.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/makefile.patch 2013-05-16 05:26:55 UTC (rev 14066)
+++ packages/trunk/a7xpg/debian/patches/makefile.patch 2013-05-18 17:51:17 UTC (rev 14067)
@@ -4,7 +4,7 @@
Index: a7xpg-0.11.dfsg1/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ a7xpg-0.11.dfsg1/Makefile 2007-08-29 17:32:50.000000000 +0000
++++ a7xpg-0.11.dfsg1/Makefile 2013-05-15 05:22:12.000000000 -0400
@@ -0,0 +1,37 @@
+
+SOURCES=$(shell find src -name "*.d")
@@ -19,14 +19,14 @@
+DFLAGS=-O -release
+#DFLAGS=-g -debug
+CC=gcc
-+DC=gdmd-v1
-+LIBS=-lGL `sdl-config --libs` -lSDL_mixer
++DC=gdmd
++LIBS=-lGL `sdl-config --libs` -lSDL_mixer
+EXE=a7xpg
+
+all: $(EXE)
+
+$(EXE): $(LOBJS) $(OBJS) $(COBJS)
-+ gdc-v1 $(LDFLAGS) -o $@ $+ $(LIBS)
++ gdc $(LDFLAGS) -o $@ $+ $(LIBS)
+
+$(LOBJS): %.o: %.d
+ $(DC) -d -c -of$@ $(DFLAGS) -Iimport $<
Modified: packages/trunk/a7xpg/debian/patches/series
===================================================================
--- packages/trunk/a7xpg/debian/patches/series 2013-05-16 05:26:55 UTC (rev 14066)
+++ packages/trunk/a7xpg/debian/patches/series 2013-05-18 17:51:17 UTC (rev 14067)
@@ -13,3 +13,4 @@
window-resizing.patch
allow-sound-init-to-fail.patch
d1.043.patch
+dlang_v2.patch
More information about the Pkg-games-commits
mailing list