[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.3 branch, master, updated. debian/1.3.0_20111204-1-8-g8fe3a1f

[Sam Hocevar]

The following commit has been merged in the master branch:
commit 8fe3a1fda7484dd558b1f710fb917b88e48214a8
Author: Sam Hocevar <sam at hocevar.net>
Date:   Thu May 17 23:36:47 2012 +0200

    debian/patches/fix_joystick_misc_axes.diff: fix a joystick remapping
    bug causing some axes to malfunction.

diff --git a/debian/changelog b/debian/changelog
index 21f0512..bac5008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ libsdl2 (2.0~20120220c-1) UNRELEASED; urgency=low
   * New upstream snapshot (Closes: #671506).
   * This package no longer conflicts with libsdl-1.2.
 
+  * debian/patches/fix_joystick_misc_axes.diff: fix a joystick remapping
+    bug causing some axes to malfunction.
+
  -- Sam Hocevar <sho at debian.org>  Thu, 17 May 2012 19:03:59 +0200
 
 libsdl-1.3 (1.3.0~20111204-1) experimental; urgency=low
diff --git a/debian/patches/fix_joystick_misc_axes.diff b/debian/patches/fix_joystick_misc_axes.diff
new file mode 100644
index 0000000..350fd55
--- /dev/null
+++ b/debian/patches/fix_joystick_misc_axes.diff
@@ -0,0 +1,13 @@
+diff --git a/SDL/src/joystick/linux/SDL_sysjoystick.c b/SDL/src/joystick/linux/SDL_sysjoystick.c
+index 1017f22..47e7987 100755
+--- a/SDL/src/joystick/linux/SDL_sysjoystick.c
++++ b/SDL/src/joystick/linux/SDL_sysjoystick.c
+@@ -703,7 +703,7 @@ 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;
diff --git a/debian/patches/series b/debian/patches/series
index 936d07e..a2ee0d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 300_dont_propagate_lpthread.diff
 ####310_fixmouseclicks
 ####320_disappearingcursor.diff
+fix_joystick_misc_axes.diff

-- 
Debian packaging of SDL 1.3