[arch-commits] Commit in sdl/trunk (PKGBUILD fix_joystick_misc_axes.diff)

[Jan Steffens]

    Date: Saturday, September 1, 2012 @ 08:22:15
  Author: heftig
Revision: 165847

Add patch to fix FS#31331

Added:
  sdl/trunk/fix_joystick_misc_axes.diff
Modified:
  sdl/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   19 +++++++++++--------
 fix_joystick_misc_axes.diff |   13 +++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-01 09:41:45 UTC (rev 165846)
+++ PKGBUILD	2012-09-01 12:22:15 UTC (rev 165847)
@@ -5,7 +5,7 @@
 
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=1
+pkgrel=2
 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"
@@ -15,21 +15,24 @@
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-disable-mmx.patch)
+        sdl-1.2.14-disable-mmx.patch
+        fix_joystick_misc_axes.diff)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852')
+         'e5c16b7611f62c7cb25f0534eff68852'
+         '687586a108b597a2a6b73070c1d37e51')
 
 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-disable-mmx.patch
+  cd SDL-$pkgver
+  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+  patch -Np1 -i ../fix_joystick_misc_axes.diff
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
               --with-x --disable-rpath --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd SDL-$pkgver
+  make DESTDIR="$pkgdir" install
 }

Added: fix_joystick_misc_axes.diff
===================================================================
--- fix_joystick_misc_axes.diff	                        (rev 0)
+++ fix_joystick_misc_axes.diff	2012-09-01 12:22:15 UTC (rev 165847)
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ 				++joystick->nbuttons;
+ 			}
+ 		}
+-		for ( i=0; i<ABS_MISC; ++i ) {
++		for ( i=0; i<ABS_MAX; ++i ) {
+ 			/* Skip hats */
+ 			if ( i == ABS_HAT0X ) {
+ 				i = ABS_HAT3Y;