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

[Bradley Smith]

Author: brad-guest
Date: 2008-03-29 19:46:43 +0000 (Sat, 29 Mar 2008)
New Revision: 6374

Modified:
   packages/trunk/briquolo/debian/changelog
   packages/trunk/briquolo/debian/patches/10_fix_ati_crash
   packages/trunk/briquolo/debian/patches/series
Log:
Re-add 10_fix_ati_crash, as it seems it /is/ needed

Modified: packages/trunk/briquolo/debian/changelog
===================================================================
--- packages/trunk/briquolo/debian/changelog	2008-03-29 18:59:45 UTC (rev 6373)
+++ packages/trunk/briquolo/debian/changelog	2008-03-29 19:46:43 UTC (rev 6374)
@@ -2,9 +2,9 @@
 
   * New Upstream Release.
   * 10_gcc-4.3-fixes: Refreshed.
-  * 10_fix_ati_crash: No longer needed.
+  * 10_fix_ati_crash: Refreshed.
 
- -- Bradley Smith <brad at brad-smith.co.uk>  Sat, 29 Mar 2008 18:52:57 +0000
+ -- Bradley Smith <brad at brad-smith.co.uk>  Sat, 29 Mar 2008 19:43:04 +0000
 
 briquolo (0.5.6-3) unstable; urgency=low
 

Modified: packages/trunk/briquolo/debian/patches/10_fix_ati_crash
===================================================================
--- packages/trunk/briquolo/debian/patches/10_fix_ati_crash	2008-03-29 18:59:45 UTC (rev 6373)
+++ packages/trunk/briquolo/debian/patches/10_fix_ati_crash	2008-03-29 19:46:43 UTC (rev 6374)
@@ -1,36 +1,22 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_ati_crash.dpatch by  <Bradley Smith <brad at brad-smith.co.uk>>
+## 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
 
 @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)
+diff -Naur briquolo-0.5.7.orig/src/MOGL/MOGL_Fenetre.cpp briquolo-0.5.7/src/MOGL/MOGL_Fenetre.cpp
+--- briquolo-0.5.7.orig/src/MOGL/MOGL_Fenetre.cpp	2008-03-24 13:23:07.000000000 +0000
++++ briquolo-0.5.7/src/MOGL/MOGL_Fenetre.cpp	2008-03-29 19:41:40.000000000 +0000
+@@ -168,6 +168,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-29 18:59:45 UTC (rev 6373)
+++ packages/trunk/briquolo/debian/patches/series	2008-03-29 19:46:43 UTC (rev 6374)
@@ -1,2 +1,3 @@
 01_desktop_entry
 10_gcc-4.3-fixes
+10_fix_ati_crash