r13781 - in packages/trunk/neverball/debian: . patches

[Juhani Numminen]

Author: jsonic-guest
Date: 2012-09-15 13:52:02 +0000 (Sat, 15 Sep 2012)
New Revision: 13781

Added:
   packages/trunk/neverball/debian/patches/reset-video-mode
Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/patches/series
Log:
Fix neverball not launching if previously used video mode is
not available (Closes: #677409)
Thanks to Fabian Greffrath for patch.



Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog	2012-09-15 10:31:55 UTC (rev 13780)
+++ packages/trunk/neverball/debian/changelog	2012-09-15 13:52:02 UTC (rev 13781)
@@ -4,6 +4,9 @@
   * NOT RELEASED YET
   * libpng15 transition: Build-depend on libpng-dev instead of
     libpng12-dev (Closes: #662445)
+  * Fix neverball not launching if previously used video mode is
+    not available (Closes: #677409)
+    Thanks to Fabian Greffrath for patch.
 
  -- Juhani Numminen <juhaninumminen0 at gmail.com>  Sat, 15 Sep 2012 12:19:46 +0300
 

Added: packages/trunk/neverball/debian/patches/reset-video-mode
===================================================================
--- packages/trunk/neverball/debian/patches/reset-video-mode	                        (rev 0)
+++ packages/trunk/neverball/debian/patches/reset-video-mode	2012-09-15 13:52:02 UTC (rev 13781)
@@ -0,0 +1,22 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Subject: Reset video mode if the one remembered in the
+ configuration file no longer works.
+Bug-Debian: bugs.debian.org/cgi-bin/bugreport.cgi?bug=677409
+
+--- a/share/video.c
++++ b/share/video.c
+@@ -40,8 +40,12 @@
+                     config_get_d(CONFIG_WIDTH),
+                     config_get_d(CONFIG_HEIGHT)))
+     {
+-        fprintf(stderr, "%s\n", SDL_GetError());
+-        return 0;
++        fprintf(stderr, "%s\nReset video mode to default\n", SDL_GetError());
++        if (!video_mode(0, 800, 600))
++        {
++            fprintf(stderr, "%s\n", SDL_GetError());
++            return 0;
++        }
+     }
+ 
+     /* ...and this has to happen after it. */

Modified: packages/trunk/neverball/debian/patches/series
===================================================================
--- packages/trunk/neverball/debian/patches/series	2012-09-15 10:31:55 UTC (rev 13780)
+++ packages/trunk/neverball/debian/patches/series	2012-09-15 13:52:02 UTC (rev 13781)
@@ -1,2 +1,3 @@
+reset-video-mode
 sepperate-data-and-bin
 fix-build-gold-linker