Author: goneri-guest
Date: 2007-07-03 20:18:46 +0000 (Tue, 03 Jul 2007)
New Revision: 3217
Added:
packages/trunk/starfighter/debian/patches/gcc-4.2.diff
Modified:
packages/trunk/starfighter/debian/changelog
packages/trunk/starfighter/debian/patches/series
Log:
+ * Add patch by Brian m. Carlson to fix the build wiith gcc 4.2
+ (Closes: #385714)
Modified: packages/trunk/starfighter/debian/changelog
===================================================================
--- packages/trunk/starfighter/debian/changelog 2007-07-03 20:14:32 UTC (rev
3216)
+++ packages/trunk/starfighter/debian/changelog 2007-07-03 20:18:46 UTC (rev
3217)
@@ -3,6 +3,10 @@
[ Eddy Petrișor ]
* fix Homepage semifield
+ [ Gonéri Le Bouder ]
+ * Add patch by Brian m. Carlson to fix the build wiith gcc 4.2
+ (Closes: #385714)
+
-- Eddy Petrișor <[EMAIL PROTECTED]> Wed, 26 Jul 2006 03:42:25 +0300
starfighter (1.1-6) unstable; urgency=low
Added: packages/trunk/starfighter/debian/patches/gcc-4.2.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/gcc-4.2.diff
(rev 0)
+++ packages/trunk/starfighter/debian/patches/gcc-4.2.diff 2007-07-03
20:18:46 UTC (rev 3217)
@@ -0,0 +1,113 @@
+--- starfighter-1.1.orig/code/classes.h
++++ starfighter-1.1/code/classes.h
+@@ -427,7 +427,7 @@
+ {
+ SDL_Flip(screen);
+ // Give the audio (and possibly the X server) time to work...
+- SDL_Delay(1);
++ // SDL_Delay(1);
+ }
+
+ /*
+--- starfighter-1.1.orig/code/game.cpp
++++ starfighter-1.1/code/game.cpp
+@@ -240,6 +240,7 @@
+ then = SDL_GetTicks();
+ frames = 0;
+ graphics.updateScreen();
++ SDL_Delay(16);
+ }
+
+ if ((currentGame.area == 24) && (engine.addAliens > -1))
+@@ -277,11 +278,7 @@
+ }
+
+ // (Attempt to) Limit us to 60 frame a second
+- while (SDL_GetTicks() < (frameLimit + 16))
+- {
+- // Do nothing. If we were to insert an SDL_Delay(1) in
here
+- // then we would actually lose around 10 frames per
second!!
+- }
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+ }
+
+--- starfighter-1.1.orig/code/intermission.cpp
++++ starfighter-1.1/code/intermission.cpp
+@@ -848,7 +848,7 @@
+ doCursor();
+
+ // Limit us to 60 frame a second
+- while (SDL_GetTicks() < (frameLimit + 16)){}
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+ }
+
+--- starfighter-1.1.orig/code/missions.cpp
++++ starfighter-1.1/code/missions.cpp
+@@ -795,6 +795,7 @@
+ getPlayerInput();
+ if ((engine.keyState[SDLK_LCTRL]) ||
(engine.keyState[SDLK_RCTRL]))
+ break;
++ SDL_Delay(16);
+ }
+
+ graphics.clearScreen(graphics.black);
+@@ -913,6 +914,7 @@
+ getPlayerInput();
+ if ((engine.keyState[SDLK_LCTRL]) ||
(engine.keyState[SDLK_RCTRL]))
+ break;
++ SDL_Delay(16);
+ }
+ }
+
+--- starfighter-1.1.orig/code/script.cpp
++++ starfighter-1.1/code/script.cpp
+@@ -298,7 +298,7 @@
+ if ((showMessage) && (graphics.messageBox != NULL))
+ graphics.blit(graphics.messageBox, (800 -
graphics.messageBox->w) / 2, 500);
+
+- while (SDL_GetTicks() < (frameLimit + 16)){}
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+
+ if (engine.keyState[SDLK_ESCAPE])
+--- starfighter-1.1.orig/code/title.cpp
++++ starfighter-1.1/code/title.cpp
+@@ -453,7 +453,8 @@
+ engine.keyState[SDLK_LCTRL] =
engine.keyState[SDLK_RCTRL] = engine.keyState[SDLK_SPACE] = 0;
+ }
+
+- while (SDL_GetTicks() < (frameLimit + 16)){}
++ // (Attempt to) Limit us to 60 frame a second
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+ }
+
+@@ -558,7 +559,7 @@
+ break;
+ }
+
+- while (SDL_GetTicks() < (frameLimit + 16)){}
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+ }
+ }
+@@ -614,7 +615,7 @@
+ graphics.blit(gameover, x, y);
+
+ // Limit us to 60 frame a second
+- while (SDL_GetTicks() < (frameLimit + 16)){}
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+ }
+
+@@ -724,7 +725,7 @@
+ SDL_FillRect(graphics.screen, &r1, graphics.black);
+ SDL_FillRect(graphics.screen, &r2, graphics.black);
+
+- while (SDL_GetTicks() < (frameLimit + 16)){}
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
+ frameLimit = SDL_GetTicks();
+ }
+
Modified: packages/trunk/starfighter/debian/patches/series
===================================================================
--- packages/trunk/starfighter/debian/patches/series 2007-07-03 20:14:32 UTC
(rev 3216)
+++ packages/trunk/starfighter/debian/patches/series 2007-07-03 20:18:46 UTC
(rev 3217)
@@ -3,3 +3,4 @@
10_sigfpe.diff
10_overflows.diff
30_typos.diff
+gcc-4.2.diff
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
