[pkgsrc/trunk]: pkgsrc/devel/SDL fix HATs on USB joysticks that don't report ...

[dillo <dillo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd71ebd2042e
branches:  trunk
changeset: 476891:dd71ebd2042e
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Tue Jun 22 09:10:12 2004 +0000

description:
fix HATs on USB joysticks that don't report up as 0.
bump PKGREVISION

diffstat:

 devel/SDL/Makefile         |   4 ++--
 devel/SDL/distinfo         |   4 ++--
 devel/SDL/patches/patch-aa |  14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 39802ea8752f -r dd71ebd2042e devel/SDL/Makefile
--- a/devel/SDL/Makefile        Tue Jun 22 08:52:53 2004 +0000
+++ b/devel/SDL/Makefile        Tue Jun 22 09:10:12 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2004/06/05 14:04:21 dillo Exp $
+# $NetBSD: Makefile,v 1.56 2004/06/22 09:10:12 dillo Exp $
 #
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
-PKGREVISION=1
+PKGREVISION=2
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 39802ea8752f -r dd71ebd2042e devel/SDL/distinfo
--- a/devel/SDL/distinfo        Tue Jun 22 08:52:53 2004 +0000
+++ b/devel/SDL/distinfo        Tue Jun 22 09:10:12 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2004/06/05 14:04:21 dillo Exp $
+$NetBSD: distinfo,v 1.29 2004/06/22 09:10:12 dillo Exp $
 
 SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
 Size (SDL-1.2.7.tar.gz) = 2470936 bytes
-SHA1 (patch-aa) = cf5b703aa2ea4c047cfd5ea93b4687382e667b27
+SHA1 (patch-aa) = 37c1dbf04636a74b69f07c9f00bffeb0e3dcbe65
 SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-aj) = 02705ec01b70cbfef6520586d799dccd835352dc
diff -r 39802ea8752f -r dd71ebd2042e devel/SDL/patches/patch-aa
--- a/devel/SDL/patches/patch-aa        Tue Jun 22 08:52:53 2004 +0000
+++ b/devel/SDL/patches/patch-aa        Tue Jun 22 09:10:12 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2004/06/05 14:04:21 dillo Exp $
+$NetBSD: patch-aa,v 1.7 2004/06/22 09:10:12 dillo Exp $
 
 --- src/joystick/bsd/SDL_sysjoystick.c.orig    2004-02-18 18:22:01.000000000 +0100
 +++ src/joystick/bsd/SDL_sysjoystick.c
@@ -39,7 +39,17 @@
  
  usbend:
        /* The poll blocks the event thread. */
-@@ -529,9 +534,9 @@ report_alloc(struct report *r, struct re
+@@ -456,7 +461,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+                           } else if (usage == HUG_HAT_SWITCH) {
+                               v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
+                                                        &hitem);
+-                              SDL_PrivateJoystickHat(joy, 0, hatval_to_sdl(v));
++                              SDL_PrivateJoystickHat(joy, 0,
++                                      hatval_to_sdl(v)-hitem.logical_minimum);
+                           }
+                           break;
+                       }
+@@ -529,9 +535,9 @@ report_alloc(struct report *r, struct re
  #endif
  #else
  # ifdef USBHID_NEW