diff options
Diffstat (limited to 'devel/SDL/patches/patch-aa')
| -rw-r--r-- | devel/SDL/patches/patch-aa | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/devel/SDL/patches/patch-aa b/devel/SDL/patches/patch-aa index 3a0e2b34bb1..52b2987dbb1 100644 --- a/devel/SDL/patches/patch-aa +++ b/devel/SDL/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ +$NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $ ---- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-02-18 18:22:01.000000000 +0100 -+++ src/joystick/bsd/SDL_sysjoystick.c 2004-07-13 22:43:44.000000000 +0200 -@@ -60,7 +60,7 @@ +--- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-12-13 07:54:32.000000000 +0000 ++++ src/joystick/bsd/SDL_sysjoystick.c +@@ -60,7 +60,7 @@ static char rcsid = #include <sys/joystick.h> #endif @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ #include <machine/joystick.h> #endif -@@ -238,6 +238,7 @@ +@@ -239,6 +239,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) struct hid_data *hdata; struct report *rep; int fd; @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ fd = open(path, O_RDONLY); if (fd == -1) { -@@ -302,6 +303,8 @@ +@@ -303,6 +304,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) joy->nbuttons = 0; joy->nhats = 0; joy->nballs = 0; @@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ while (hid_get_item(hdata, &hitem) > 0) { char *sp; -@@ -328,8 +331,7 @@ +@@ -329,8 +332,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) unsigned usage = HID_USAGE(hitem.usage); int joyaxe = usage_to_joyaxe(usage); if (joyaxe >= 0) { @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ } else if (usage == HUG_HAT_SWITCH) { joy->nhats++; } -@@ -347,6 +349,9 @@ +@@ -348,6 +350,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) } } hid_end_parse(hdata); @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ usbend: /* The poll blocks the event thread. */ -@@ -369,7 +374,7 @@ +@@ -370,7 +375,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy int nbutton, naxe = -1; Sint32 v; @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ struct joystick gameport; static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0; -@@ -456,7 +461,8 @@ +@@ -457,7 +462,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy } else if (usage == HUG_HAT_SWITCH) { v = (Sint32)hid_get_data(REP_BUF_DATA(rep), &hitem); @@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $ } break; } -@@ -529,9 +535,9 @@ +@@ -530,9 +536,9 @@ report_alloc(struct report *r, struct re #endif #else # ifdef USBHID_NEW |