From b6bf6d76becda60a9062ddd2d2b253d08047e573 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 1 Sep 2012 10:28:28 -0300
Subject: sdl-libre-1.2.15-2: updating revision due report on
 https://bugs.archlinux.org/task/31331

---
 libre/sdl-libre/PKGBUILD                    | 26 +++++++++++++++-----------
 libre/sdl-libre/fix_joystick_misc_axes.diff | 13 +++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 libre/sdl-libre/fix_joystick_misc_axes.diff

diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index de989b882..c4eabb9db 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,43 +1,47 @@
-# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
-#mips64el Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 
 pkgname=sdl-libre
 pkgver=1.2.15
-pkgrel=1.2
+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"
 license=('LGPL')
 provides=("sdl=${pkgver}")
 conflicts=('sdl')
+replaces=('sdl')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse')
-replaces=('sdl')
 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
+        fix_joystick_misc_axes.diff
         libre.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
+         '687586a108b597a2a6b73070c1d37e51'
          '5c665f72b8a2adc97a91f6db6f2da79a')
 
 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
-  patch -Np0 -i $srcdir/libre.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
+  patch -Np0 -i ../libre.patch
   ./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
 }
diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl-libre/fix_joystick_misc_axes.diff
new file mode 100644
index 000000000..75e3755c9
--- /dev/null
+++ b/libre/sdl-libre/fix_joystick_misc_axes.diff
@@ -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;
-- 
cgit v1.2.3-54-g00ecf