r14131 - packages/trunk/ii-esu/debian/patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Thu May 23 18:29:58 UTC 2013
Author: pdewacht-guest
Date: 2013-05-23 18:29:58 +0000 (Thu, 23 May 2013)
New Revision: 14131
Modified:
packages/trunk/ii-esu/debian/patches/dlang_v2.patch
Log:
ii-esu: fixes for gdc 4.8
Modified: packages/trunk/ii-esu/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/dlang_v2.patch 2013-05-23 18:21:13 UTC (rev 14130)
+++ packages/trunk/ii-esu/debian/patches/dlang_v2.patch 2013-05-23 18:29:58 UTC (rev 14131)
@@ -1,10 +1,8 @@
# Copyright (C) 2013 Barry deFreese <bdefreese at debian.org>
# Distributed under the same license as the game. See debian/copyright.
-Index: ii-esu-1.0a.dfsg1/import/SDL_types.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_types.d 2013-05-19 15:49:21.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_types.d 2013-05-19 15:49:53.000000000 -0400
+--- a/import/SDL_types.d
++++ b/import/SDL_types.d
@@ -38,6 +38,8 @@
alias ulong Uint64;
alias long Sint64;
@@ -14,10 +12,8 @@
/* General keyboard/mouse state definitions */
enum { SDL_PRESSED = 0x01, SDL_RELEASED = 0x00 };
-Index: ii-esu-1.0a.dfsg1/import/opengl.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/opengl.d 2013-05-19 15:49:53.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/opengl.d 2013-05-19 16:03:31.000000000 -0400
+--- a/import/opengl.d
++++ b/import/opengl.d
@@ -1448,35 +1448,35 @@
@@ -76,10 +72,8 @@
+ (GLenum target, GLenum pname, GLfloat *params) PFNGLGETCOLORTABLEPARAMETERFVEXTPROC;
//import openglu;
-Index: ii-esu-1.0a.dfsg1/import/openglu.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/openglu.d 2013-05-19 15:49:53.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/openglu.d 2013-05-19 16:46:59.000000000 -0400
+--- a/import/openglu.d
++++ b/import/openglu.d
@@ -157,7 +157,7 @@
void gluQuadricCallback (
GLUquadric *qobj,
@@ -153,10 +147,8 @@
/**** Generic constants ****/
-Index: ii-esu-1.0a.dfsg1/import/SDL_audio.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_audio.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_audio.d 2013-05-19 16:49:42.000000000 -0400
+--- a/import/SDL_audio.d
++++ b/import/SDL_audio.d
@@ -42,7 +42,7 @@
Once the callback returns, the buffer will no longer be valid.
Stereo samples are stored in a LRLRLR ordering.
@@ -175,10 +167,8 @@
int filter_index; /* Current audio conversion function */
}
-Index: ii-esu-1.0a.dfsg1/import/SDL_rwops.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_rwops.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_rwops.d 2013-05-20 07:06:12.000000000 -0400
+--- a/import/SDL_rwops.d
++++ b/import/SDL_rwops.d
@@ -28,10 +28,10 @@
extern(C):
@@ -203,10 +193,8 @@
SDL_RWops * SDL_RWFromFP(void *fp, int autoclose);
-Index: ii-esu-1.0a.dfsg1/import/SDL_events.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_events.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_events.d 2013-05-19 16:55:30.000000000 -0400
+--- a/import/SDL_events.d
++++ b/import/SDL_events.d
@@ -271,7 +271,7 @@
The filter is protypted as:
@@ -216,10 +204,8 @@
/*
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
-Index: ii-esu-1.0a.dfsg1/import/SDL_video.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_video.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_video.d 2013-05-20 07:04:21.000000000 -0400
+--- a/import/SDL_video.d
++++ b/import/SDL_video.d
@@ -75,8 +75,8 @@
}
@@ -269,10 +255,8 @@
/*
* Sets the icon for the display window.
-Index: ii-esu-1.0a.dfsg1/import/SDL_thread.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_thread.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_thread.d 2013-05-19 16:58:53.000000000 -0400
+--- a/import/SDL_thread.d
++++ b/import/SDL_thread.d
@@ -34,7 +34,7 @@
struct SDL_Thread { }
@@ -282,10 +266,8 @@
/* Get the 32-bit thread identifier for the current thread */
Uint32 SDL_ThreadID();
-Index: ii-esu-1.0a.dfsg1/import/SDL_timer.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_timer.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_timer.d 2013-05-19 17:00:31.000000000 -0400
+--- a/import/SDL_timer.d
++++ b/import/SDL_timer.d
@@ -39,7 +39,7 @@
void SDL_Delay(Uint32 ms);
@@ -304,10 +286,8 @@
/* Definition of the timer ID type */
alias void *SDL_TimerID;
-Index: ii-esu-1.0a.dfsg1/import/SDL_mixer.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_mixer.d 2003-12-20 20:32:52.000000000 -0500
-+++ ii-esu-1.0a.dfsg1/import/SDL_mixer.d 2013-05-19 17:50:47.000000000 -0400
+--- a/import/SDL_mixer.d
++++ b/import/SDL_mixer.d
@@ -107,7 +107,7 @@
Mix_Chunk * Mix_LoadWAV(char *file) {
return Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1);
@@ -369,10 +349,8 @@
/* Register a special effect function. At mixing time, the channel data is
-Index: ii-esu-1.0a.dfsg1/import/SDL_quit.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/import/SDL_quit.d 2006-07-25 14:40:28.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/import/SDL_quit.d 2013-05-19 17:09:49.000000000 -0400
+--- a/import/SDL_quit.d
++++ b/import/SDL_quit.d
@@ -22,6 +22,7 @@
/* Include file for SDL quit event handling */
@@ -381,10 +359,8 @@
import SDL_events;
/*
-Index: ii-esu-1.0a.dfsg1/src/es/enemy.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/src/es/enemy.d 2013-05-19 15:49:53.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/src/es/enemy.d 2013-05-19 17:40:13.000000000 -0400
+--- a/src/es/enemy.d
++++ b/src/es/enemy.d
@@ -585,7 +585,7 @@
enemyIdx = 0;
}
@@ -410,10 +386,8 @@
-*/
\ No newline at end of file
+*/
-Index: ii-esu-1.0a.dfsg1/src/es/rand.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/src/es/rand.d 2007-06-22 07:12:00.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/src/es/rand.d 2013-05-20 07:03:25.000000000 -0400
+--- a/src/es/rand.d
++++ b/src/es/rand.d
@@ -6,7 +6,7 @@
module es.rand;
@@ -432,10 +406,8 @@
init_genrand(cast(uint)timer);
}
-Index: ii-esu-1.0a.dfsg1/src/es/gamemanager.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/src/es/gamemanager.d 2007-07-14 09:21:46.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/src/es/gamemanager.d 2013-05-19 17:48:30.000000000 -0400
+--- a/src/es/gamemanager.d
++++ b/src/es/gamemanager.d
@@ -145,7 +145,7 @@
setNextState("titleState");
@@ -497,10 +469,8 @@
-
\ No newline at end of file
+
-Index: ii-esu-1.0a.dfsg1/src/es/screen.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/src/es/screen.d 2007-07-14 09:24:46.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/src/es/screen.d 2013-05-19 18:54:48.000000000 -0400
+--- a/src/es/screen.d
++++ b/src/es/screen.d
@@ -1,6 +1,7 @@
module es.screen;
private import opengl;
@@ -534,10 +504,17 @@
-}
\ No newline at end of file
+}
-Index: ii-esu-1.0a.dfsg1/src/es/shot.d
-===================================================================
---- ii-esu-1.0a.dfsg1.orig/src/es/shot.d 2007-07-06 22:36:46.000000000 -0400
-+++ ii-esu-1.0a.dfsg1/src/es/shot.d 2013-05-19 18:55:50.000000000 -0400
+--- a/src/es/shot.d
++++ b/src/es/shot.d
+@@ -60,7 +60,7 @@
+ this.z = field.transZ(fx ,fy ,fz);
+
+ Enemy lock = null;
+- for(int i = ep.enemy.length - 1;0 <= i;i --){
++ for(long i = ep.enemy.length - 1;0 <= i;i --){
+ Enemy e = cast(Enemy)ep.enemy[i];
+ if(e !is null){
+ if(dist(e.x ,e.y ,e.z ,x ,y ,z) < (SHOT_SIZE + e.largeness)){
@@ -146,7 +146,7 @@
}
@@ -547,6 +524,15 @@
if(s !is null){
s.vanish();
}
+@@ -199,7 +199,7 @@
+ }
+ public void release(){
+
+- int i = shots.length - 1;
++ long i = shots.length - 1;
+ while(0 <=i){
+ Shot s = shots[i];
+ if(s !is null){
@@ -255,4 +255,4 @@
}
}
@@ -554,3 +540,98 @@
-*/
\ No newline at end of file
+*/
+--- a/src/es/shape.d
++++ b/src/es/shape.d
+@@ -7,7 +7,7 @@
+ real[] multiple(real[] a,real mul){
+ real[] b;
+ b.length = a.length;
+- for(int i = a.length - 1;0 <= i;i --){
++ for(long i = a.length - 1;0 <= i;i --){
+ b[i] = a[i] * mul;
+ }
+ return b;
+@@ -15,9 +15,9 @@
+ real[][] multiple(real[][] a,real mul){
+ real[][] b;
+ b.length = a.length;
+- for(int i = a.length - 1;0 <= i;i --){
++ for(long i = a.length - 1;0 <= i;i --){
+ b[i].length = a[i].length;
+- for(int j = a[i].length - 1;0 <= j;j --){
++ for(long j = a[i].length - 1;0 <= j;j --){
+ b[i][j] = a[i][j] * mul;
+ }
+ }
+@@ -52,14 +52,14 @@
+ if(a.length != b.length || a.length < 1){
+ assert(1);
+ }
+- int maxNum = 0;
+- for(int i = a.length -1;0 <= i;i --){
++ long maxNum = 0;
++ for(long i = a.length -1;0 <= i;i --){
+ if(a[i].length != b[i].length || a[i].length < 1){
+ assert(1);
+ }
+ if(maxNum < a[i].length)maxNum = a[i].length;
+ }
+- int k,l;
++ long k,l;
+ k = 0;
+
+ real[][] x0;
+@@ -82,7 +82,7 @@
+ k ++;
+ if(a.length <= k)k = 0;
+ }
+- int number = (2 * segment + 1) * maxNum;
++ long number = (2 * segment + 1) * maxNum;
+ x = new real[number];
+ y = new real[number];
+ z = new real[number];
+@@ -110,7 +110,7 @@
+ while(true){
+ seg ++;
+ if(segment <= seg)break;
+- for(int j = maxNum - 1;0 <= j ;j --){
++ for(long j = maxNum - 1;0 <= j ;j --){
+ x[num] = x0[seg][j];
+ y[num] = y0[seg][j];
+ z[num] = z0[seg][j];
+@@ -147,7 +147,7 @@
+ z0[i][j] = b[j] * sin(cast(real)i / cast(real)segment * PI * 2.0);
+ }
+ }
+- int number = (2 * segment + 1) * a.length;
++ long number = (2 * segment + 1) * a.length;
+ x.length = number;
+ y.length = number;
+ z.length = number;
+@@ -175,7 +175,7 @@
+ while(true){
+ seg ++;
+ if(segment <= seg)break;
+- for(int j = a.length - 1;0 <= j ;j --){
++ for(long j = a.length - 1;0 <= j ;j --){
+ x[num] = x0[seg][j];
+ y[num] = y0[seg][j];
+ z[num] = z0[seg][j];
+@@ -214,7 +214,7 @@
+ z0[i][j] = b[j] * sin(cast(real)i / cast(real)segment * PI * 2.0);
+ }
+ }
+- int number = segment * a.length;
++ long number = segment * a.length;
+ x = new real[number];
+ y = new real[number];
+ z = new real[number];
+@@ -224,7 +224,7 @@
+ while(true){
+
+ if(segment <= seg)break;
+- for(int j = a.length - 1;0 <= j ;j --){
++ for(long j = a.length - 1;0 <= j ;j --){
+ x[num] = x0[seg][j];
+ y[num] = y0[seg][j];
+ z[num] = z0[seg][j];
More information about the Pkg-games-commits
mailing list