r6042 - in packages/trunk/briquolo/debian: . patches

[Bradley Smith]

Author: brad-guest
Date: 2008-03-12 23:07:25 +0000 (Wed, 12 Mar 2008)
New Revision: 6042

Added:
   packages/trunk/briquolo/debian/patches/10_fix_ati_crash
Modified:
   packages/trunk/briquolo/debian/changelog
   packages/trunk/briquolo/debian/patches/series
Log:
* 02_fix_ati_crash. Closes: #440627, #454299
	- Stops seg fault on ati cards.

Modified: packages/trunk/briquolo/debian/changelog
===================================================================
--- packages/trunk/briquolo/debian/changelog	2008-03-12 19:00:06 UTC (rev 6041)
+++ packages/trunk/briquolo/debian/changelog	2008-03-12 23:07:25 UTC (rev 6042)
@@ -7,6 +7,8 @@
     - Remove deprecated field 'FilePattern'.
     - Remove duplicate 'Categories' field.
     - General Tidying up.
+  * 02_fix_ati_crash. Closes: #440627, #454299
+  	- Stops seg fault on ati cards.
   * Bump Standards-Version.
   * Add Homepage field, and remove from description.
   * Whitespace fixes.
@@ -26,7 +28,7 @@
   * debian/copyright: Change file reference to GPL-2
   * Call dh_desktop since we ship a .desktop file
 
- -- Bradley Smith <brad at brad-smith.co.uk>  Wed, 05 Mar 2008 18:14:15 +0000
+ -- Bradley Smith <brad at brad-smith.co.uk>  Wed, 12 Mar 2008 22:52:30 +0000
 
 briquolo (0.5.6-2) unstable; urgency=low
 

Added: packages/trunk/briquolo/debian/patches/10_fix_ati_crash
===================================================================
--- packages/trunk/briquolo/debian/patches/10_fix_ati_crash	                        (rev 0)
+++ packages/trunk/briquolo/debian/patches/10_fix_ati_crash	2008-03-12 23:07:25 UTC (rev 6042)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_ati_crash.dpatch by  <Bradley Smith <brad at brad-smith.co.uk>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes crash on ati cards
+
+ at DPATCH@
+
+diff -Naur briquolo-0.5.6.orig/src/CasseBrique.cpp briquolo-0.5.6/src/CasseBrique.cpp
+--- briquolo-0.5.6.orig/src/CasseBrique.cpp	2007-04-17 21:56:35.000000000 +0100
++++ briquolo-0.5.6/src/CasseBrique.cpp	2008-03-12 22:41:57.000000000 +0000
+@@ -74,7 +74,8 @@
+   Option::Charger();
+   _Fenetre.SetFullscreen(Option::Fullscreen.GetValeur());
+   _Fenetre.SetMode(Option::ResolutionX.GetValeur(), Option::ResolutionY.GetValeur());
+-  _Fenetre.Initialiser();
++  if(!_Fenetre.Initialiser())
++    exit(1);
+   Option::ResolutionX.SetValeur(_Fenetre.GetResolutionX());
+   Option::ResolutionY.SetValeur(_Fenetre.GetResolutionY());
+ 
+diff -Naur briquolo-0.5.6.orig/src/MOGL/MOGL_Fenetre.cpp briquolo-0.5.6/src/MOGL/MOGL_Fenetre.cpp
+--- briquolo-0.5.6.orig/src/MOGL/MOGL_Fenetre.cpp	2007-03-22 11:15:40.000000000 +0000
++++ briquolo-0.5.6/src/MOGL/MOGL_Fenetre.cpp	2008-03-12 22:41:33.000000000 +0000
+@@ -153,6 +153,11 @@
+       // On recommence donc !
+       _NbBitParPixel = 24;
+       _SurfaceSDL = _CreerFenetre(_NbBitParPixel, flags);
++      if (_SurfaceSDL == NULL)
++      {
++        _NbBitParPixel = 16;
++        _SurfaceSDL = _CreerFenetre(_NbBitParPixel, flags);
++      }
+     }
+   }
+   if (_SurfaceSDL == NULL)

Modified: packages/trunk/briquolo/debian/patches/series
===================================================================
--- packages/trunk/briquolo/debian/patches/series	2008-03-12 19:00:06 UTC (rev 6041)
+++ packages/trunk/briquolo/debian/patches/series	2008-03-12 23:07:25 UTC (rev 6042)
@@ -1,2 +1,3 @@
 01_desktop_entry
 10_gcc-4.3-fixes
+10_fix_ati_crash