[arch-commits] Commit in sdl/trunk (3 files)

[Allan McRae]

    Date: Monday, May 24, 2010 @ 17:55:25
  Author: allan
Revision: 80998

upgpkg: sdl 1.2.14-4
fix mouse clicking (FS#19331), fix joystick (FS#19569)

Added:
  sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch
  sdl/trunk/sdl-1.2.14-joystick-crash.diff
Modified:
  sdl/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   12 +++++++++---
 sdl-1.2.14-fix-mouse-clicking.patch |   23 +++++++++++++++++++++++
 sdl-1.2.14-joystick-crash.diff      |   14 ++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-24 20:52:39 UTC (rev 80997)
+++ PKGBUILD	2010-05-24 21:55:25 UTC (rev 80998)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=3
+pkgrel=4
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -12,11 +12,17 @@
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'esound' 'mesa')
 options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+        sdl-1.2.14-fix-mouse-clicking.patch
+        sdl-1.2.14-joystick-crash.diff)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+         '04d8c179f125e04bcd4c9d60e013c2d7'
+         '9d8890b3817736a5d365f7497f096634')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
+  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
               --with-x --disable-rpath
   make || return 1

Added: sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- sdl-1.2.14-fix-mouse-clicking.patch	                        (rev 0)
+++ sdl-1.2.14-fix-mouse-clicking.patch	2010-05-24 21:55:25 UTC (rev 80998)
@@ -0,0 +1,23 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
+@@ -423,12 +423,15 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+-		if ( this->input_grab == SDL_GRAB_OFF ) {
+-			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
++		     (xevent.xcrossing.mode != NotifyUngrab) ) {
++			if ( this->input_grab == SDL_GRAB_OFF ) {
++				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++			}
++			posted = SDL_PrivateMouseMotion(0, 0,
++					xevent.xcrossing.x,
++					xevent.xcrossing.y);
+ 		}
+-		posted = SDL_PrivateMouseMotion(0, 0,
+-				xevent.xcrossing.x,
+-				xevent.xcrossing.y);
+ 	    }
+ 	    break;
+ 

Added: sdl-1.2.14-joystick-crash.diff
===================================================================
--- sdl-1.2.14-joystick-crash.diff	                        (rev 0)
+++ sdl-1.2.14-joystick-crash.diff	2010-05-24 21:55:25 UTC (rev 80998)
@@ -0,0 +1,14 @@
+Description: Fix crash with joystick detection.
+Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c
+===================================================================
+--- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:37:36.000000000 -0500
++++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:38:27.000000000 -0500
+@@ -700,7 +700,7 @@
+ 				continue;
+ 			}
+ 			if ( test_bit(i, absbit) ) {
+-				int values[5];
++				int values[6];
+ 
+ 				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
+ 					continue;