r15773 - in packages/trunk: ! dirs' list truncated !
Peter De Wachter
pdewacht-guest at moszumanska.debian.org
Thu May 5 15:18:19 UTC 2016
Author: pdewacht-guest
Date: 2016-05-05 15:18:19 +0000 (Thu, 05 May 2016)
New Revision: 15773
Modified:
packages/trunk/mu-cade/debian/changelog
packages/trunk/mu-cade/debian/patches/dlang_v2.patch
packages/trunk/mu-cade/debian/patches/ode.patch
packages/trunk/parsec47/debian/changelog
packages/trunk/parsec47/debian/patches/dlang_v2.patch
packages/trunk/tatan/debian/changelog
packages/trunk/tatan/debian/patches/dlang_v2.patch
packages/trunk/tumiki-fighters/debian/changelog
packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch
Log:
mu-cade parsec47 tatan tumiki-fighters: Fix gdc-6 FTBFSen
Modified: packages/trunk/mu-cade/debian/changelog
===================================================================
--- packages/trunk/mu-cade/debian/changelog 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/mu-cade/debian/changelog 2016-05-05 15:18:19 UTC (rev 15773)
@@ -1,3 +1,9 @@
+mu-cade (0.11.dfsg1-11) UNRELEASED; urgency=medium
+
+ * Fix build failure with gdc-6.
+
+ -- Peter De Wachter <pdewacht at gmail.com> Thu, 05 May 2016 16:24:47 +0200
+
mu-cade (0.11.dfsg1-10) unstable; urgency=medium
* Fix the ode imports to be compatible with libode4. (Closes: #809369)
Modified: packages/trunk/mu-cade/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/mu-cade/debian/patches/dlang_v2.patch 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/mu-cade/debian/patches/dlang_v2.patch 2016-05-05 15:18:19 UTC (rev 15773)
@@ -75,14 +75,18 @@
}
--- a/src/abagames/mcd/boot.d
+++ b/src/abagames/mcd/boot.d
-@@ -6,6 +6,7 @@
+@@ -6,9 +6,10 @@
module abagames.mcd.boot;
private import std.string;
+private import std.conv;
private import std.stream;
private import std.math;
- private import std.c.stdlib;
+-private import std.c.stdlib;
++private import core.stdc.stdlib;
+ private import abagames.util.logger;
+ private import abagames.util.tokenizer;
+ private import abagames.util.sdl.mainloop;
@@ -52,10 +53,10 @@
_moduleCtor();
char exe[4096];
@@ -475,14 +479,17 @@
assert(pos.y <>= 0);
--- a/src/abagames/mcd/prefmanager.d
+++ b/src/abagames/mcd/prefmanager.d
-@@ -7,6 +7,7 @@
+@@ -7,8 +7,9 @@
private import std.stream;
private import std.string;
+private import std.conv;
private import std.file;
- private import std.c.stdlib;
+-private import std.c.stdlib;
++private import core.stdc.stdlib;
private import abagames.util.prefmanager;
+
+ /**
@@ -17,18 +18,18 @@
public class PrefManager: abagames.util.prefmanager.PrefManager {
private:
@@ -999,29 +1006,44 @@
case BasicBarrageType.AIM:
case BasicBarrageType.AIM_IN_ORDER:
break;
-@@ -289,7 +289,7 @@
+@@ -287,9 +287,9 @@
+ }
+
public template CentHeadInitImpl() {
- protected void initLengthAndSize(int size) {
+- protected void initLengthAndSize(int size) {
++ package void initLengthAndSize(int size) {
float ss;
- switch (size) {
+ switch (size) { default: break;
case 0:
bodyLength = 4 + rand.nextInt(4);
ss = 0.9f + rand.nextFloat(0.3f);
-@@ -316,7 +316,7 @@
+@@ -308,15 +308,15 @@
+ massScale = ss * ss;
}
- protected void calcBarrageSpeedAndInterval(
+- protected float calcBarrageRank(float br) {
++ package float calcBarrageRank(float br) {
+ if (br < 0.01f)
+ return 0;
+ else
+ return 1 - 1 / sqrt(br);
+ }
+
+- protected void calcBarrageSpeedAndInterval(
- inout float rank, float br, out float speed, out int interval,
++ package void calcBarrageSpeedAndInterval(
+ ref float rank, float br, out float speed, out int interval,
float minInterval = 20, float maxInterval = 120) {
float sr = br * (0.5f + rand.nextSignedFloat(0.2f));
float ir = br - sr;
-@@ -335,7 +335,7 @@
+@@ -334,8 +334,8 @@
+ interval = cast(int) (minInterval + (maxInterval - minInterval) / ir);
}
- protected void calcForwardForceAndSlowVelocity(
+- protected void calcForwardForceAndSlowVelocity(
- inout float rank, int size,
++ package void calcForwardForceAndSlowVelocity(
+ ref float rank, int size,
out float forwardForceScale, out float slowVelocityRatio) {
forwardForceScale = 1;
@@ -1864,6 +1886,15 @@
} else {
--- a/src/abagames/util/ode/world.d
+++ b/src/abagames/util/ode/world.d
+@@ -19,7 +19,7 @@
+ static dJointFeedback[] jointFeedback;
+ static int jointFeedbackIdx;
+ private:
+- const int MAX_CONTACTS = 4;
++ static const int MAX_CONTACTS = 4;
+ static const int CONTACT_JOINT_GROUP_NUM = 1000;
+ static const int CONTACT_JOINT_FEEDBACK_NUM = 100;
+ static const dReal CONTACT_MAX_CORRECTING_VEL = 2.5;
@@ -27,6 +27,8 @@
dSpaceID _space;
bool initialized = false;
Modified: packages/trunk/mu-cade/debian/patches/ode.patch
===================================================================
--- packages/trunk/mu-cade/debian/patches/ode.patch 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/mu-cade/debian/patches/ode.patch 2016-05-05 15:18:19 UTC (rev 15773)
@@ -13,3 +13,81 @@
world = dWorldCreate();
dWorldSetContactMaxCorrectingVel(world, CONTACT_MAX_CORRECTING_VEL);
dWorldSetContactSurfaceLayer (world, CONTACT_SURFACE_LAYER);
+--- a/import/ode/common.d
++++ b/import/ode/common.d
+@@ -21,8 +21,8 @@
+ *************************************************************************/
+ module ode.common;
+
+-private import std.c.math;
+-private import std.c.stdlib;
++private import core.stdc.math;
++private import core.stdc.stdlib;
+ import ode.config;
+ import ode.error;
+
+--- a/import/ode/config.d
++++ b/import/ode/config.d
+@@ -2,12 +2,12 @@
+ module ode.config;
+
+ /* standard system headers */
+-private import std.c.stdio;
+-private import std.c.stdlib;
+-private import std.c.math;
+-private import std.c.stdarg;
+-//import std.c.malloc;
+-//import std.c.float;
++private import core.stdc.stdio;
++private import core.stdc.stdlib;
++private import core.stdc.math;
++private import core.stdc.stdarg;
++//import core.stdc.malloc;
++//import core.stdc.float;
+
+ extern(C):
+
+--- a/import/ode/error.d
++++ b/import/ode/error.d
+@@ -23,7 +23,7 @@
+
+ /* this comes from the `reuse' library. copy any changes back to the source */
+
+-import std.c.stdarg;
++import core.stdc.stdarg;
+ import ode.config;
+
+ extern(C):
+--- a/import/ode/export_dif.d
++++ b/import/ode/export_dif.d
+@@ -21,7 +21,7 @@
+ *************************************************************************/
+ module ode.export_dif;
+
+-import std.c.stdio;
++import core.stdc.stdio;
+ import ode.common;
+
+ extern(C):
+--- a/import/ode/misc.d
++++ b/import/ode/misc.d
+@@ -24,7 +24,7 @@
+ /* miscellaneous math functions. these are mostly useful for testing */
+
+ import core.stdc.config;
+-import std.c.stdio;
++import core.stdc.stdio;
+ import ode.common;
+
+ extern(C):
+--- a/import/ode/timer.d
++++ b/import/ode/timer.d
+@@ -22,7 +22,7 @@
+ module ode.timer;
+
+ import core.stdc.config;
+-import std.c.stdio;
++import core.stdc.stdio;
+ import ode.config;
+
+ extern(C):
Modified: packages/trunk/parsec47/debian/changelog
===================================================================
--- packages/trunk/parsec47/debian/changelog 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/parsec47/debian/changelog 2016-05-05 15:18:19 UTC (rev 15773)
@@ -1,3 +1,9 @@
+parsec47 (0.2.dfsg1-8) UNRELEASED; urgency=medium
+
+ * Fix build failure with gdc-6.
+
+ -- Peter De Wachter <pdewacht at gmail.com> Thu, 05 May 2016 16:33:59 +0200
+
parsec47 (0.2.dfsg1-7) unstable; urgency=medium
* Team upload.
Modified: packages/trunk/parsec47/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/parsec47/debian/patches/dlang_v2.patch 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/parsec47/debian/patches/dlang_v2.patch 2016-05-05 15:18:19 UTC (rev 15773)
@@ -16,12 +16,19 @@
import bulletml;
import abagames.p47.MorphBullet;
import abagames.util.Logger;
-@@ -29,7 +30,7 @@
+@@ -24,12 +25,12 @@
+ LARGE, LARGEMOVE,
+ MORPH_LOCK, SMALL_LOCK, MIDDLESUB_LOCK,
+ }
+- const int BARRAGE_TYPE = 13;
+- const int BARRAGE_MAX = 64;
++ static const int BARRAGE_TYPE = 13;
++ static const int BARRAGE_MAX = 64;
BulletMLParserTinyXML* parser[BARRAGE_TYPE][BARRAGE_MAX];
int parserNum[BARRAGE_TYPE];
private:
- const char[][BARRAGE_TYPE] dirName =
-+ const string[BARRAGE_TYPE] dirName =
++ static const string[BARRAGE_TYPE] dirName =
["/usr/share/games/parsec47/morph",
"/usr/share/games/parsec47/small",
"/usr/share/games/parsec47/smallmove",
@@ -290,14 +297,16 @@
float d = (LOCK_CNT - cnt) * 0.1;
--- a/src/abagames/p47/P47Boot.d
+++ b/src/abagames/p47/P47Boot.d
-@@ -7,6 +7,7 @@
+@@ -7,7 +7,8 @@
private:
import std.string;
+-import std.c.stdlib;
+private import std.conv;
- import std.c.stdlib;
++import core.stdc.stdlib;
import abagames.util.Logger;
import abagames.util.sdl.Pad;
+ import abagames.util.sdl.MainLoop;
@@ -28,12 +29,12 @@
P47PrefManager prefManager;
MainLoop mainLoop;
@@ -435,14 +444,16 @@
break;
--- a/src/abagames/p47/P47PrefManager.d
+++ b/src/abagames/p47/P47PrefManager.d
-@@ -8,6 +8,7 @@
+@@ -8,7 +8,8 @@
private:
import std.stream;
import std.string;
+-import std.c.stdlib;
+private import std.conv;
- import std.c.stdlib;
++import core.stdc.stdlib;
import abagames.util.PrefManager;
+ /**
@@ -18,7 +19,7 @@
public:
static const int PREV_VERSION_NUM = 10;
@@ -511,6 +522,20 @@
super.resized(width, height);
--- a/src/abagames/p47/Ship.d
+++ b/src/abagames/p47/Ship.d
+@@ -27,10 +27,10 @@
+ static bool isSlow = false;
+ static int displayListIdx;
+ Vector pos;
+- const float SIZE = 0.3;
++ static const float SIZE = 0.3;
+ bool restart;
+- const int RESTART_CNT = 300;
+- const int INVINCIBLE_CNT = 228;
++ static const int RESTART_CNT = 300;
++ static const int INVINCIBLE_CNT = 228;
+ int cnt;
+ private:
+ static Rand rand;
@@ -58,11 +58,8 @@
int rollLockCnt;
bool rollCharged;
@@ -1014,16 +1039,17 @@
or init_by_array(init_key, key_length).
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-@@ -48,7 +48,7 @@
+@@ -48,8 +48,7 @@
Please CC: edwardsac at ieee.org on all correspondence
*/
-module MersenneTwister;
+-import std.stream;
+module mt;
- import std.stream;
/* Period parameters */
-@@ -70,7 +70,7 @@
+ const int N = 624;
+@@ -70,7 +69,7 @@
{
state[0]= s & 0xffffffffUL;
for (int j=1; j<N; j++) {
@@ -1032,7 +1058,7 @@
/* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
/* In the previous versions, MSBs of the seed affect */
/* only MSBs of the array state[]. */
-@@ -88,11 +88,11 @@
+@@ -88,11 +87,11 @@
void init_by_array(uint init_key[], uint key_length)
{
int i, j, k;
@@ -1046,7 +1072,7 @@
+ init_key[j] + j; /* non linear */
state[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
i++; j++;
-@@ -100,7 +100,7 @@
+@@ -100,7 +99,7 @@
if (j>=key_length) j=0;
}
for (k=N-1; k; k--) {
@@ -1055,7 +1081,7 @@
- i; /* non linear */
state[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
i++;
-@@ -113,14 +113,14 @@
+@@ -113,14 +112,14 @@
static void next_state()
{
@@ -1074,7 +1100,7 @@
for (int j=N-M+1; --j; p++)
*p = p[M] ^ TWIST(p[0], p[1]);
-@@ -233,7 +233,7 @@
+@@ -233,7 +232,7 @@
uint length=4;
init_by_array(init, length);
/* This is an example of initializing by an array. */
@@ -1199,3 +1225,14 @@
pos = new Vector;
ppos = new Vector;
vel = new Vector;
+--- a/src/abagames/p47/Shot.d
++++ b/src/abagames/p47/Shot.d
+@@ -20,7 +20,7 @@
+ public class Shot: Actor {
+ public:
+ Vector pos;
+- const float SPEED = 1;
++ static const float SPEED = 1;
+ private:
+ static const float FIELD_SPACE = 1;
+ static int displayListIdx;
Modified: packages/trunk/tatan/debian/changelog
===================================================================
--- packages/trunk/tatan/debian/changelog 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/tatan/debian/changelog 2016-05-05 15:18:19 UTC (rev 15773)
@@ -1,3 +1,9 @@
+tatan (1.0.dfsg1-7) UNRELEASED; urgency=medium
+
+ * Fix build failure with gdc-6.
+
+ -- Peter De Wachter <pdewacht at gmail.com> Thu, 05 May 2016 16:41:24 +0200
+
tatan (1.0.dfsg1-6) unstable; urgency=medium
* Team upload.
Modified: packages/trunk/tatan/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/tatan/debian/patches/dlang_v2.patch 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/tatan/debian/patches/dlang_v2.patch 2016-05-05 15:18:19 UTC (rev 15773)
@@ -8,6 +8,7 @@
@@ -1,15 +1,16 @@
-module util.hell2;
+module hell2;
++private import core.vararg;
private import std.string;
+private import std.conv;
private import std.file;
@@ -17,7 +18,7 @@
+private import std.ascii;
private import std.math;
-private import std.math2;
- private import std.c.stdio;
+-private import std.c.stdio;
private import std.format;
private import std.utf;
private import std.random;
@@ -1345,15 +1346,54 @@
+}
--- a/src/br/screen.d
+++ b/src/br/screen.d
-@@ -4,6 +4,7 @@
+@@ -4,30 +4,30 @@
private import SDL;
private import hell2;
private import std.string;
+-private import std.c.stdlib;
+private import std.conv;
- private import std.c.stdlib;
private import br.mainloop;
-@@ -42,7 +43,7 @@
+
+ public class Screen{
+ public:
+- const int SCREEN_WIDTH = 640;
+- const int SCREEN_HEIGHT = 480;
+- const int SCREEN_BPP = 0;
+-
+- const int GAME_LEFT = -200;
+- const int GAME_RIGHT = 200;
+- const int GAME_UP = 240;
+- const int GAME_DOWN = -240;
+- const int GAME_NEAR = -2;
+- const int GAME_FAR = -1600;
++ static const int SCREEN_WIDTH = 640;
++ static const int SCREEN_HEIGHT = 480;
++ static const int SCREEN_BPP = 0;
++
++ static const int GAME_LEFT = -200;
++ static const int GAME_RIGHT = 200;
++ static const int GAME_UP = 240;
++ static const int GAME_DOWN = -240;
++ static const int GAME_NEAR = -2;
++ static const int GAME_FAR = -1600;
+
+- const GLfloat ambientCol[] = [1, 1, 1, 0.5];
++ static const GLfloat ambientCol[] = [1, 1, 1, 0.5];
+
+- const GLfloat lightPos1[] = [ 0 , 0 , 100 , 0.0 ];
+- const GLfloat lightCol1[] = [ 1 , 1 , 1 , 1 ];
++ static const GLfloat lightPos1[] = [ 0 , 0 , 100 , 0.0 ];
++ static const GLfloat lightCol1[] = [ 1 , 1 , 1 , 1 ];
+
+- const GLfloat lightPos2[] = [ 0 , 0 , 100 , 1.0 ];
+- const GLfloat lightCol2[] = [ 0 , 0 , 1 , 1 ];
++ static const GLfloat lightPos2[] = [ 0 , 0 , 100 , 1.0 ];
++ static const GLfloat lightCol2[] = [ 0 , 0 , 1 , 1 ];
+
+
+ static int g_videoFlags = SDL_SWSURFACE|SDL_OPENGL;
+@@ -42,7 +42,7 @@
if(SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0 ) {
throw new Exception(
@@ -1362,7 +1402,7 @@
}
//info = SDL_GetVideoInfo( );
-@@ -147,7 +148,7 @@
+@@ -147,7 +147,7 @@
if (error == GL_NO_ERROR)
return;
closeSDL();
@@ -1371,7 +1411,7 @@
}
public void closeSDL() {
close();
-@@ -188,7 +189,7 @@
+@@ -188,7 +188,7 @@
Hell_loadTexture("back", "/usr/share/games/tatan/image/back.bmp");
Hell_loadFont();
}
Modified: packages/trunk/tumiki-fighters/debian/changelog
===================================================================
--- packages/trunk/tumiki-fighters/debian/changelog 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/tumiki-fighters/debian/changelog 2016-05-05 15:18:19 UTC (rev 15773)
@@ -1,3 +1,9 @@
+tumiki-fighters (0.2.dfsg1-8) UNRELEASED; urgency=medium
+
+ * Fix build failure with gdc-6.
+
+ -- Peter De Wachter <pdewacht at gmail.com> Thu, 05 May 2016 16:44:14 +0200
+
tumiki-fighters (0.2.dfsg1-7) unstable; urgency=medium
* Team upload.
Modified: packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch 2016-05-01 15:21:03 UTC (rev 15772)
+++ packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch 2016-05-05 15:18:19 UTC (rev 15773)
@@ -80,10 +80,14 @@
}
--- a/src/abagames/tf/boot.d
+++ b/src/abagames/tf/boot.d
-@@ -7,6 +7,7 @@
+@@ -5,8 +5,9 @@
+ */
+ module abagames.tf.boot;
- private import std.c.string;
- private import std.c.stdlib;
+-private import std.c.string;
+-private import std.c.stdlib;
++private import core.stdc.string;
++private import core.stdc.stdlib;
+private import std.conv;
private import abagames.util.logger;
private import abagames.util.sdl.mainloop;
@@ -321,7 +325,7 @@
af.addPeriod(attackPeriod, breakPeriod);
ai++;
}
-@@ -60,13 +61,13 @@
+@@ -60,17 +61,17 @@
for (;;) {
if (!si.hasNext)
break;
@@ -342,6 +346,11 @@
parts ~= tp;
}
sizeXm = sizeYm = float.max;
+- sizeXp = sizeYp = float.min;
++ sizeXp = sizeYp = float.min_normal;
+ foreach (EnemyPartSpec eps; parts) {
+ if (sizeXp < eps.ofs.x + eps.tumikiSet.sizeXp)
+ sizeXp = eps.ofs.x + eps.tumikiSet.sizeXp;
@@ -83,12 +84,12 @@
}
}
@@ -707,6 +716,15 @@
case Direction.TO_RIGHT:
x -= s * LETTER_WIDTH;
break;
+@@ -227,7 +227,7 @@
+ }
+ }
+
+- private const int LETTER_SHADE = 3;
++ private static const int LETTER_SHADE = 3;
+
+ private static void drawBox(float x, float y, float width, float height, float deg, int col) {
+ glPushMatrix();
--- a/src/abagames/tf/mobileletter.d
+++ b/src/abagames/tf/mobileletter.d
@@ -31,8 +31,8 @@
@@ -783,14 +801,16 @@
--- a/src/abagames/tf/prefmanager.d
+++ b/src/abagames/tf/prefmanager.d
-@@ -7,6 +7,7 @@
+@@ -7,7 +7,8 @@
private import std.stream;
private import std.string;
+-private import std.c.stdlib;
+private import std.conv;
- private import std.c.stdlib;
++private import core.stdc.stdlib;
private import abagames.util.prefmanager;
+ /**
@@ -16,21 +17,21 @@
public class PrefManager: abagames.util.prefmanager.PrefManager {
public:
@@ -1227,7 +1247,8 @@
+ private this(string[] data) {
init();
sizeXm = sizeYm = float.max;
- sizeXp = sizeYp = float.min;
+- sizeXp = sizeYp = float.min;
++ sizeXp = sizeYp = float.min_normal;
StringIterator si = new StringIterator(data);
- float sizeRatio = atof(si.next);
- score = atoi(si.next);
More information about the Pkg-games-commits
mailing list