[maemo-commits] [maemo-commits] r18440 - in projects/haf/trunk/libsdl1.2/debian: . patches

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-05-19 17:31:49 +0300 (Tue, 19 May 2009)
New Revision: 18440

Added:
   projects/haf/trunk/libsdl1.2/debian/patches/310_fix_marbles.diff
Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/debian/patches/series
Log:
libsdl1.2 (1:1.2.13-2maemo3) unstable; urgency=low

  * debian/patches/310_fix_marbles.diff:
    + Added.
    + Fixes: NB#112500 (Marbles hang and henceforth device hangs on
    switch to fullscreen window)

 -- Claudio Saavedra <csaavedra at igalia.com>  Tue, 19 May 2009 17:29:12 +0300



Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2009-05-19 13:51:00 UTC (rev 18439)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2009-05-19 14:31:49 UTC (rev 18440)
@@ -1,3 +1,12 @@
+libsdl1.2 (1:1.2.13-2maemo3) unstable; urgency=low
+
+  * debian/patches/310_fix_marbles.diff:
+    + Added.
+    + Fixes: NB#112500 (Marbles hang and henceforth device hangs on
+    switch to fullscreen window)
+
+ -- Claudio Saavedra <csaavedra at igalia.com>  Tue, 19 May 2009 17:29:12 +0300
+
 libsdl1.2 (1:1.2.13-2maemo2) unstable; urgency=low
 
   * Remove dependency on libglu related packages.

Added: projects/haf/trunk/libsdl1.2/debian/patches/310_fix_marbles.diff
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/patches/310_fix_marbles.diff	2009-05-19 13:51:00 UTC (rev 18439)
+++ projects/haf/trunk/libsdl1.2/debian/patches/310_fix_marbles.diff	2009-05-19 14:31:49 UTC (rev 18440)
@@ -0,0 +1,24 @@
+--- SDL-1.2.13.orig/src/video/x11/SDL_x11events.c	2007-12-31 06:48:13.000000000 +0200
++++ SDL-1.2.13/src/video/x11/SDL_x11events.c	2009-05-11 17:41:28.000000000 +0300
+@@ -490,7 +490,7 @@
+ #endif
+ 		/* Queue leaving fullscreen mode */
+ 		switch_waiting = 0x01;
+-		switch_time = SDL_GetTicks() + 200;
++		switch_time = SDL_GetTicks();
+ 	    }
+ 	    break;
+ 
+@@ -932,11 +930,7 @@
+ 		now  = SDL_GetTicks();
+ 		if ( pending || !SDL_VideoSurface ) {
+ 			/* Try again later... */
+-			if ( switch_waiting & SDL_FULLSCREEN ) {
+-				switch_time = now + 1500;
+-			} else {
+-				switch_time = now + 200;
+-			}
++			/* ...but in this century, if possible. */
+ 		} else if ( (int)(switch_time-now) <= 0 ) {
+ 			Uint32 go_fullscreen;
+ 

Modified: projects/haf/trunk/libsdl1.2/debian/patches/series
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/patches/series	2009-05-19 13:51:00 UTC (rev 18439)
+++ projects/haf/trunk/libsdl1.2/debian/patches/series	2009-05-19 14:31:49 UTC (rev 18440)
@@ -20,3 +20,5 @@
 218_joystick_memmove.diff
 220_std_cld.diff
 300_dont_propagate_lpthread.diff
+310_fix_marbles.diff
+