r8227 - in packages/trunk/supertuxkart/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2008-10-04 22:06:14 +0000 (Sat, 04 Oct 2008)
New Revision: 8227

Added:
   packages/trunk/supertuxkart/debian/patches/modesetting.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/series
Log:
patch for #501116


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2008-10-03 18:20:52 UTC (rev 8226)
+++ packages/trunk/supertuxkart/debian/changelog	2008-10-04 22:06:14 UTC (rev 8227)
@@ -1,7 +1,12 @@
 supertuxkart (0.5-1.2) UNRELEASED; urgency=low
 
+  [ Vincent Fourmond ]
   * NOT RELEASED YET
 
+  [ Peter De Wachter ]
+  * Added patch to check for SDL errors and to allow the game to run on
+    low-end hardware (closes: #501116).
+
  -- Vincent Fourmond <fourmond at debian.org>  Mon, 21 Jul 2008 01:09:06 +0200
 
 supertuxkart (0.5-1.1) unstable; urgency=high

Added: packages/trunk/supertuxkart/debian/patches/modesetting.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/modesetting.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/modesetting.patch	2008-10-04 22:06:14 UTC (rev 8227)
@@ -0,0 +1,36 @@
+--- a/src/sdldrv.cpp
++++ b/src/sdldrv.cpp
+@@ -58,14 +58,13 @@
+ 	: sensedInput(0), actionMap(0), mainSurface(0), flags(0), stickInfos(0),
+ 	mode(BOOTSTRAP), mouseValX(0), mouseValY(0)
+ {
+-    SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER);
++    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER) < 0)
++    {
++        fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
++        exit(1);
++    }
+ 
+-    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+-    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+-    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+-    SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+-    SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+     SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
+ 
+     flags = SDL_OPENGL | SDL_HWSURFACE;
+@@ -249,6 +248,13 @@
+     SDL_FreeSurface(mainSurface);
+     mainSurface = SDL_SetVideoMode(user_config->m_width, user_config->m_height, 0, flags);
+ 
++    if (!mainSurface)
++    {
++        fprintf(stderr, "SDL_SetVideoMode (%dx%d) failed: %s\n",
++                user_config->m_width, user_config->m_height, SDL_GetError());
++        exit(1);
++    }
++
+ #if defined(WIN32) || defined(__APPLE__)
+     if(resetTextures)
+     {

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2008-10-03 18:20:52 UTC (rev 8226)
+++ packages/trunk/supertuxkart/debian/patches/series	2008-10-04 22:06:14 UTC (rev 8227)
@@ -1 +1,2 @@
 bug1996464.patch
+modesetting.patch