[arch-commits] Commit in sdl/trunk (PKGBUILD sdl-1.2.14-fix-disappearing-cursor.patch)

[Allan McRae]

    Date: Sunday, June 20, 2010 @ 04:19:40
  Author: allan
Revision: 82982

upgpkg: sdl 1.2.14-5
fix disappearing cursor (FS#19720)

Added:
  sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch
Modified:
  sdl/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   13 ++++++++-----
 sdl-1.2.14-fix-disappearing-cursor.patch |   17 +++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-20 06:21:14 UTC (rev 82981)
+++ PKGBUILD	2010-06-20 08:19:40 UTC (rev 82982)
@@ -4,7 +4,7 @@
 
 pkgname=sdl
 pkgver=1.2.14
-pkgrel=4
+pkgrel=5
 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"
@@ -13,19 +13,22 @@
 makedepends=('alsa-lib' 'esound' 'mesa')
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+        sdl-1.2.14-joystick-crash.diff
         sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-joystick-crash.diff)
+        sdl-1.2.14-fix-disappearing-cursor.patch)
 md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+         '9d8890b3817736a5d365f7497f096634'
          '04d8c179f125e04bcd4c9d60e013c2d7'
-         '9d8890b3817736a5d365f7497f096634')
+         'a6cf3e71b653aa97d0d8ae6c0a789807')
 
 build() {
   cd ${srcdir}/SDL-${pkgver}
+  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
+  patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
               --with-x --disable-rpath
-  make || return 1
+  make
 }
 
 package() {

Added: sdl-1.2.14-fix-disappearing-cursor.patch
===================================================================
--- sdl-1.2.14-fix-disappearing-cursor.patch	                        (rev 0)
+++ sdl-1.2.14-fix-disappearing-cursor.patch	2010-06-20 08:19:40 UTC (rev 82982)
@@ -0,0 +1,17 @@
+Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
+===================================================================
+--- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
+@@ -444,8 +444,10 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+-		if ( xevent.xcrossing.detail != NotifyInferior ) {
+-			if ( this->input_grab == SDL_GRAB_OFF ) {
++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
++		     (xevent.xcrossing.mode != NotifyUngrab) &&
++		     (xevent.xcrossing.detail != NotifyInferior) ) {
++               		if ( this->input_grab == SDL_GRAB_OFF ) {
+ 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+ 			} else {
+ 				posted = SDL_PrivateMouseMotion(0, 0,