Author: goneri-guest
Date: 2007-09-22 09:28:29 +0000 (Sat, 22 Sep 2007)
New Revision: 4260
Modified:
packages/trunk/starfighter/debian/changelog
packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
packages/trunk/starfighter/debian/patches/series
Log:
Add patch by Brian m. Carlson to fix the build wiith gcc 4.2
Modified: packages/trunk/starfighter/debian/changelog
===================================================================
--- packages/trunk/starfighter/debian/changelog 2007-09-22 02:13:14 UTC (rev
4259)
+++ packages/trunk/starfighter/debian/changelog 2007-09-22 09:28:29 UTC (rev
4260)
@@ -4,9 +4,8 @@
* fix Homepage semifield
[ Gonéri Le Bouder ]
- * Add patch by Brian m. Carlson to fix the build wiith gcc 4.2
+ * Add patch by Brian m. Carlson to fix the build with gcc 4.2
(Closes: #385714)
- * ### TODO patch broken
[ Jon Dowland ]
* update menu section to "Games/Action" for menu policy transition.
Modified: packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
2007-09-22 02:13:14 UTC (rev 4259)
+++ packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
2007-09-22 09:28:29 UTC (rev 4260)
@@ -1,16 +1,20 @@
---- starfighter-1.1.orig/code/classes.h
-+++ starfighter-1.1/code/classes.h
-@@ -427,7 +427,7 @@
+Index: starfighter-1.1/code/classes.h
+===================================================================
+--- starfighter-1.1.orig/code/classes.h 2007-09-22 09:51:31.000000000
+0000
++++ starfighter-1.1/code/classes.h 2007-09-22 09:51:44.000000000 +0000
+@@ -447,7 +447,7 @@
{
SDL_Flip(screen);
// Give the audio (and possibly the X server) time to work...
- SDL_Delay(1);
-+ // SDL_Delay(1);
++ //SDL_Delay(1);
}
/*
---- starfighter-1.1.orig/code/game.cpp
-+++ starfighter-1.1/code/game.cpp
+Index: starfighter-1.1/code/game.cpp
+===================================================================
+--- starfighter-1.1.orig/code/game.cpp 2007-09-22 09:51:54.000000000 +0000
++++ starfighter-1.1/code/game.cpp 2007-09-22 09:53:16.000000000 +0000
@@ -240,6 +240,7 @@
then = SDL_GetTicks();
frames = 0;
@@ -28,23 +32,27 @@
- // 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 - SDL_GetTicks() >? 0 <? 16);
++ SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(),
0), 16));
frameLimit = SDL_GetTicks();
}
---- starfighter-1.1.orig/code/intermission.cpp
-+++ starfighter-1.1/code/intermission.cpp
+Index: starfighter-1.1/code/intermission.cpp
+===================================================================
+--- starfighter-1.1.orig/code/intermission.cpp 2007-09-22 09:53:32.000000000
+0000
++++ starfighter-1.1/code/intermission.cpp 2007-09-22 09:53:54.000000000
+0000
@@ -848,7 +848,7 @@
doCursor();
// Limit us to 60 frame a second
- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - SDL_GetTicks() >? 0 <? 16);
++ SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(),
0), 16));
frameLimit = SDL_GetTicks();
}
---- starfighter-1.1.orig/code/missions.cpp
-+++ starfighter-1.1/code/missions.cpp
+Index: starfighter-1.1/code/missions.cpp
+===================================================================
+--- starfighter-1.1.orig/code/missions.cpp 2007-09-22 09:54:05.000000000
+0000
++++ starfighter-1.1/code/missions.cpp 2007-09-22 09:54:43.000000000 +0000
@@ -795,6 +795,7 @@
getPlayerInput();
if ((engine.keyState[SDLK_LCTRL]) ||
(engine.keyState[SDLK_RCTRL]))
@@ -61,53 +69,47 @@
}
}
---- starfighter-1.1.orig/code/script.cpp
-+++ starfighter-1.1/code/script.cpp
+Index: starfighter-1.1/code/script.cpp
+===================================================================
+--- starfighter-1.1.orig/code/script.cpp 2007-09-22 09:54:57.000000000
+0000
++++ starfighter-1.1/code/script.cpp 2007-09-22 09:55:20.000000000 +0000
@@ -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 - SDL_GetTicks() >? 0 <? 16);
++ SDL_Delay(frameLimit + 16 - std::max(std::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 - SDL_GetTicks() >? 0 <? 16);
- frameLimit = SDL_GetTicks();
- }
-
-@@ -558,7 +559,7 @@
+Index: starfighter-1.1/code/title.cpp
+===================================================================
+--- starfighter-1.1.orig/code/title.cpp 2007-09-22 09:55:26.000000000
+0000
++++ starfighter-1.1/code/title.cpp 2007-09-22 09:56:44.000000000 +0000
+@@ -558,7 +558,7 @@
break;
}
- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - SDL_GetTicks() >? 0 <? 16);
++ SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(),
0), 16));
frameLimit = SDL_GetTicks();
}
}
-@@ -614,7 +615,7 @@
+@@ -614,7 +614,7 @@
graphics.blit(gameover, x, y);
// Limit us to 60 frame a second
- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - SDL_GetTicks() >? 0 <? 16);
++ SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(),
0), 16));
frameLimit = SDL_GetTicks();
}
-@@ -724,7 +725,7 @@
+@@ -724,7 +724,7 @@
SDL_FillRect(graphics.screen, &r1, graphics.black);
SDL_FillRect(graphics.screen, &r2, graphics.black);
- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - SDL_GetTicks() >? 0 <? 16);
++ SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(),
0), 16));
frameLimit = SDL_GetTicks();
}
Modified: packages/trunk/starfighter/debian/patches/series
===================================================================
--- packages/trunk/starfighter/debian/patches/series 2007-09-22 02:13:14 UTC
(rev 4259)
+++ packages/trunk/starfighter/debian/patches/series 2007-09-22 09:28:29 UTC
(rev 4260)
@@ -1,6 +1,5 @@
01_makefile.diff
-10_nobusyloop.diff
10_sigfpe.diff
10_overflows.diff
30_typos.diff
-gcc-4.2.diff
+10_nobusyloop.diff
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
