wok rev 8513

Add patches from archlinux to fix problems in libsdl.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Feb 12 04:48:06 2011 +0000 (2011-02-12)
parents 1f20fe47a72b
children c276774df941
files libsdl/receipt libsdl/stuff/sdl-1.2.14-fix-disappearing-cursor.patch libsdl/stuff/sdl-1.2.14-fix-mouse-clicking.patch libsdl/stuff/sdl-1.2.14-joystick-crash.diff
line diff
     1.1 --- a/libsdl/receipt	Sat Feb 12 02:36:49 2011 +0000
     1.2 +++ b/libsdl/receipt	Sat Feb 12 04:48:06 2011 +0000
     1.3 @@ -16,6 +16,9 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 +	patch -Np1 -i ../stuff/$PACKAGE-$VERSION-joystick-crash.diff
     1.8 +	patch -Np1 -i ../stuff/$PACKAGE-$VERSION-fix-mouse-clicking.patch
     1.9 +	patch -Np1 -i ../stuff/$PACKAGE-$VERSION-fix-disappearing-cursor.patch
    1.10  	./configure \
    1.11  		--prefix=/usr \
    1.12  		--infodir=/usr/share/info \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/libsdl/stuff/sdl-1.2.14-fix-disappearing-cursor.patch	Sat Feb 12 04:48:06 2011 +0000
     2.3 @@ -0,0 +1,17 @@
     2.4 +Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
     2.5 +===================================================================
     2.6 +--- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
     2.7 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
     2.8 +@@ -444,8 +444,10 @@
     2.9 + if ( xevent.xcrossing.mode == NotifyUngrab )
    2.10 + printf("Mode: NotifyUngrab\n");
    2.11 + #endif
    2.12 +-		if ( xevent.xcrossing.detail != NotifyInferior ) {
    2.13 +-			if ( this->input_grab == SDL_GRAB_OFF ) {
    2.14 ++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
    2.15 ++		     (xevent.xcrossing.mode != NotifyUngrab) &&
    2.16 ++		     (xevent.xcrossing.detail != NotifyInferior) ) {
    2.17 ++               		if ( this->input_grab == SDL_GRAB_OFF ) {
    2.18 + 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
    2.19 + 			} else {
    2.20 + 				posted = SDL_PrivateMouseMotion(0, 0,
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/libsdl/stuff/sdl-1.2.14-fix-mouse-clicking.patch	Sat Feb 12 04:48:06 2011 +0000
     3.3 @@ -0,0 +1,23 @@
     3.4 +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
     3.5 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
     3.6 +@@ -423,12 +423,15 @@
     3.7 + if ( xevent.xcrossing.mode == NotifyUngrab )
     3.8 + printf("Mode: NotifyUngrab\n");
     3.9 + #endif
    3.10 +-		if ( this->input_grab == SDL_GRAB_OFF ) {
    3.11 +-			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
    3.12 ++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
    3.13 ++		     (xevent.xcrossing.mode != NotifyUngrab) ) {
    3.14 ++			if ( this->input_grab == SDL_GRAB_OFF ) {
    3.15 ++				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
    3.16 ++			}
    3.17 ++			posted = SDL_PrivateMouseMotion(0, 0,
    3.18 ++					xevent.xcrossing.x,
    3.19 ++					xevent.xcrossing.y);
    3.20 + 		}
    3.21 +-		posted = SDL_PrivateMouseMotion(0, 0,
    3.22 +-				xevent.xcrossing.x,
    3.23 +-				xevent.xcrossing.y);
    3.24 + 	    }
    3.25 + 	    break;
    3.26 + 
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/libsdl/stuff/sdl-1.2.14-joystick-crash.diff	Sat Feb 12 04:48:06 2011 +0000
     4.3 @@ -0,0 +1,14 @@
     4.4 +Description: Fix crash with joystick detection.
     4.5 +Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c
     4.6 +===================================================================
     4.7 +--- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:37:36.000000000 -0500
     4.8 ++++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:38:27.000000000 -0500
     4.9 +@@ -700,7 +700,7 @@
    4.10 + 				continue;
    4.11 + 			}
    4.12 + 			if ( test_bit(i, absbit) ) {
    4.13 +-				int values[5];
    4.14 ++				int values[6];
    4.15 + 
    4.16 + 				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
    4.17 + 					continue;