rpms/blobAndConquer/devel blobAndConquer-0.90-exit-crash.patch, 1.2, 1.3 blobAndConquer.spec, 1.7, 1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7534

Modified Files:
	blobAndConquer-0.90-exit-crash.patch blobAndConquer.spec 
Log Message:
* Mon Dec 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-5
- Fix restoring of resolution when exiting a fullscreen game


blobAndConquer-0.90-exit-crash.patch:

Index: blobAndConquer-0.90-exit-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer-0.90-exit-crash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blobAndConquer-0.90-exit-crash.patch	3 Jun 2007 12:36:16 -0000	1.2
+++ blobAndConquer-0.90-exit-crash.patch	31 Dec 2007 14:35:48 -0000	1.3
@@ -1,12 +1,20 @@
---- blobAndConquer-0.90/src/init.cpp~	2007-05-23 22:40:47.000000000 +0200
-+++ blobAndConquer-0.90/src/init.cpp	2007-05-23 22:40:47.000000000 +0200
-@@ -506,8 +506,9 @@
+diff -up blobAndConquer-0.91/src/init.cpp.exit blobAndConquer-0.91/src/init.cpp
+--- blobAndConquer-0.91/src/init.cpp.exit	2007-12-31 15:26:48.000000000 +0100
++++ blobAndConquer-0.91/src/init.cpp	2007-12-31 12:26:48.000000000 +0100
+@@ -496,8 +496,15 @@ void cleanup()
+ 		debug(("Closing Joystick %s...\n", SDL_JoystickName(0)));
  		SDL_JoystickClose(engine->joystick);
  	}
++
++/*	Disable SDL_Quit as it causes us to segfault on exit (at_exit that is)
++	call SDL_WM_ToggleFullScreen() instead to restore desktop resolution
++	if needed, and ungrab the mouse if needed. */
++	/* SDL_Quit(); */
++	if (graphics->fullscreen)
++		SDL_WM_ToggleFullScreen(graphics->screen);
  	
-+/*	Disable this it causes us to segfault on exit (at_exit that is)
 -	SDL_Quit();
-+	SDL_Quit(); */
++	SDL_WM_GrabInput(SDL_GRAB_OFF);
  
  	debug(("All Done.\n"));
  }


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- blobAndConquer.spec	24 Sep 2007 20:38:08 -0000	1.7
+++ blobAndConquer.spec	31 Dec 2007 14:35:48 -0000	1.8
@@ -7,7 +7,7 @@
 
 Name:           blobAndConquer
 Version:        0.91
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPLv2+
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Mon Dec 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-5
+- Fix restoring of resolution when exiting a fullscreen game
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-4
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing