[arch-commits] Commit in sdl/repos (16 files)

Jan Steffens heftig at archlinux.org
Wed Sep 21 12:32:30 UTC 2011


    Date: Wednesday, September 21, 2011 @ 08:32:30
  Author: heftig
Revision: 138378

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  sdl/repos/extra-i686/PKGBUILD
    (from rev 138376, sdl/trunk/PKGBUILD)
  sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
    (from rev 138377, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
  sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
    (from rev 138377, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
  sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff
    (from rev 138377, sdl/trunk/sdl-1.2.14-joystick-crash.diff)
  sdl/repos/extra-x86_64/PKGBUILD
    (from rev 138377, sdl/trunk/PKGBUILD)
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
    (from rev 138377, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
    (from rev 138377, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
  sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff
    (from rev 138377, sdl/trunk/sdl-1.2.14-joystick-crash.diff)
Deleted:
  sdl/repos/extra-i686/PKGBUILD
  sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
  sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
  sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff
  sdl/repos/extra-x86_64/PKGBUILD
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
  sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff

-------------------------------------------------------+
 extra-i686/PKGBUILD                                   |   82 ++++++++--------
 extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch   |   34 +++---
 extra-i686/sdl-1.2.14-fix-mouse-clicking.patch        |   46 ++++----
 extra-i686/sdl-1.2.14-joystick-crash.diff             |   28 ++---
 extra-x86_64/PKGBUILD                                 |   82 ++++++++--------
 extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch |   34 +++---
 extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch      |   46 ++++----
 extra-x86_64/sdl-1.2.14-joystick-crash.diff           |   28 ++---
 8 files changed, 190 insertions(+), 190 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-i686/PKGBUILD	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=8
-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"
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
-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-fix-disappearing-cursor.patch
-        sdl-1.2.14-disable-mmx.patch)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
-         '9d8890b3817736a5d365f7497f096634'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'a6cf3e71b653aa97d0d8ae6c0a789807'
-         'e5e89389a55cd7a2fee44cb53af8dd6e')
-
-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-fix-disappearing-cursor.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
-              --with-x --disable-rpath
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: sdl/repos/extra-i686/PKGBUILD (from rev 138376, sdl/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-09-21 12:32:30 UTC (rev 138378)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.14
+pkgrel=9
+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"
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
+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-fix-disappearing-cursor.patch
+        sdl-1.2.14-disable-mmx.patch)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+         '9d8890b3817736a5d365f7497f096634'
+         '04d8c179f125e04bcd4c9d60e013c2d7'
+         'a6cf3e71b653aa97d0d8ae6c0a789807'
+         '9ffecb9932a132ee5cefb4112e950761')
+
+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-fix-disappearing-cursor.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
+  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+              --with-x --disable-rpath
+  make
+}
+
+package() {
+  cd ${srcdir}/SDL-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
===================================================================
--- extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,17 +0,0 @@
-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,

Copied: sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch (from rev 138377, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
===================================================================
--- extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch	                        (rev 0)
+++ extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -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,

Deleted: extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,23 +0,0 @@
---- 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;
- 

Copied: sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch (from rev 138377, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch	                        (rev 0)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -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;
+ 

Deleted: extra-i686/sdl-1.2.14-joystick-crash.diff
===================================================================
--- extra-i686/sdl-1.2.14-joystick-crash.diff	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-i686/sdl-1.2.14-joystick-crash.diff	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,14 +0,0 @@
-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;

Copied: sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff (from rev 138377, sdl/trunk/sdl-1.2.14-joystick-crash.diff)
===================================================================
--- extra-i686/sdl-1.2.14-joystick-crash.diff	                        (rev 0)
+++ extra-i686/sdl-1.2.14-joystick-crash.diff	2011-09-21 12:32:30 UTC (rev 138378)
@@ -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;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-x86_64/PKGBUILD	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=8
-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"
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
-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-fix-disappearing-cursor.patch
-        sdl-1.2.14-disable-mmx.patch)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
-         '9d8890b3817736a5d365f7497f096634'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'a6cf3e71b653aa97d0d8ae6c0a789807'
-         'e5e89389a55cd7a2fee44cb53af8dd6e')
-
-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-fix-disappearing-cursor.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
-              --with-x --disable-rpath
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: sdl/repos/extra-x86_64/PKGBUILD (from rev 138377, sdl/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-09-21 12:32:30 UTC (rev 138378)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.14
+pkgrel=9
+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"
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
+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-fix-disappearing-cursor.patch
+        sdl-1.2.14-disable-mmx.patch)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+         '9d8890b3817736a5d365f7497f096634'
+         '04d8c179f125e04bcd4c9d60e013c2d7'
+         'a6cf3e71b653aa97d0d8ae6c0a789807'
+         '9ffecb9932a132ee5cefb4112e950761')
+
+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-fix-disappearing-cursor.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
+  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+              --with-x --disable-rpath
+  make
+}
+
+package() {
+  cd ${srcdir}/SDL-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,17 +0,0 @@
-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,

Copied: sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch (from rev 138377, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch	                        (rev 0)
+++ extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -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,

Deleted: extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,23 +0,0 @@
---- 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;
- 

Copied: sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch (from rev 138377, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch	                        (rev 0)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch	2011-09-21 12:32:30 UTC (rev 138378)
@@ -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;
+ 

Deleted: extra-x86_64/sdl-1.2.14-joystick-crash.diff
===================================================================
--- extra-x86_64/sdl-1.2.14-joystick-crash.diff	2011-09-21 12:31:00 UTC (rev 138377)
+++ extra-x86_64/sdl-1.2.14-joystick-crash.diff	2011-09-21 12:32:30 UTC (rev 138378)
@@ -1,14 +0,0 @@
-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;

Copied: sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff (from rev 138377, sdl/trunk/sdl-1.2.14-joystick-crash.diff)
===================================================================
--- extra-x86_64/sdl-1.2.14-joystick-crash.diff	                        (rev 0)
+++ extra-x86_64/sdl-1.2.14-joystick-crash.diff	2011-09-21 12:32:30 UTC (rev 138378)
@@ -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;




More information about the arch-commits mailing list