diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2010-02-05 10:30:49 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2010-02-05 10:30:49 +0000 |
| commit | fba82b2a968f007c64e260a48433dc7f9e39a3b8 (patch) | |
| tree | 149ab131ae242f205e0ffe4bc66cc564d443bfc5 | |
| parent | - Update to 2.03 (diff) | |
Restore joystick fix from ports/136973.
Submitted by: Adam K Kirchhoff <adamk@voicenet.com>
Notes
Notes:
svn path=/head/; revision=249284
| -rw-r--r-- | devel/sdl12/Makefile | 1 | ||||
| -rw-r--r-- | devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index eb774c489f06..dd351d8d80da 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl PORTVERSION= 1.2.14 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ diff --git a/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c new file mode 100644 index 000000000000..3c5d8b921d21 --- /dev/null +++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c @@ -0,0 +1,16 @@ +--- src/joystick/bsd/SDL_sysjoystick.c.orig 2010-02-05 11:17:18.000000000 +0100 ++++ src/joystick/bsd/SDL_sysjoystick.c 2010-02-05 11:18:15.000000000 +0100 +@@ -303,11 +303,12 @@ + strerror(errno)); + goto usberr; + } ++ ++ rep = &hw->inreport; + #if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) + rep->rid = hid_get_report_id(fd); + if (rep->rid < 0) { + #else +- rep = &hw->inreport; + if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) { + #endif + rep->rid = -1; /* XXX */ |