diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2012-02-18 10:18:33 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2012-02-18 10:18:33 +0000 |
| commit | fbd01976390528d38e2ffbe3df8037a79e26e972 (patch) | |
| tree | 8144098cc3ca2dd1b78e333ab572429bc0046430 /devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c | |
| parent | After just 7 short years, a new release of WindowMaker, 0.95.2 (diff) | |
- Update devel/sdl12 to 1.2.15
- Update audio/sdl_mixer to 1.2.15
- Update graphics/sdl_image to 1.2.12
- Update graphics/sdl_ttf to 2.0.11
- Update graphics/sdl_gfx to 2.0.23
- Update net/sdl_net to 1.2.8
- Bump PORTREVISIONs on ports that depend on one or more packages due to
ABI and shared library version changes
- Update Mk/bsd.sdl.mk accordingly for the new shared library versions
Tested by: exp-run by pav
Diffstat (limited to 'devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c')
| -rw-r--r-- | devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c index 3c5d8b921d21..a8a8a9a7f41c 100644 --- a/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c +++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c @@ -1,16 +1,11 @@ ---- 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 */ +--- src/joystick/bsd/SDL_sysjoystick.c.orig 2012-01-28 12:07:18.000000000 +0100 ++++ src/joystick/bsd/SDL_sysjoystick.c 2012-01-28 12:08:44.000000000 +0100 +@@ -148,7 +148,7 @@ + static int report_alloc(struct report *, struct report_desc *, int); + static void report_free(struct report *); + +-#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__) ++#if defined(USBHID_UCR_DATA) || (defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version <= 800063) + #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data) + #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) + #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data) |