diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2015-02-25 12:45:59 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2015-02-25 12:45:59 +0000 |
| commit | b0a8c8d80f8f0e9a56af5f38a1036f4669933902 (patch) | |
| tree | 6b51adddd9ebbf30d3253a34e7a80f9d61033f21 /devel/SDL | |
| parent | 95c4c0653e3229893344d47d3292e39ca3e4e594 (diff) | |
| download | pkgsrc-b0a8c8d80f8f0e9a56af5f38a1036f4669933902.tar.gz | |
flush any pending events from the joystick device when opening on netbsd, bump PKGREVISION
Diffstat (limited to 'devel/SDL')
| -rw-r--r-- | devel/SDL/Makefile | 4 | ||||
| -rw-r--r-- | devel/SDL/distinfo | 4 | ||||
| -rw-r--r-- | devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c | 14 |
3 files changed, 16 insertions, 6 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 97bbe37dba2..4e780b2680d 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.120 2015/02/21 23:35:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.121 2015/02/25 12:48:34 jmcneill Exp $ DISTNAME= SDL-1.2.15 -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= devel games MASTER_SITES= http://www.libsdl.org/release/ diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index 95665cf2f7a..52420fc569c 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.74 2015/02/06 01:27:25 jmcneill Exp $ +$NetBSD: distinfo,v 1.75 2015/02/25 12:48:34 jmcneill Exp $ SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3 @@ -6,7 +6,7 @@ Size (SDL-1.2.15.tar.gz) = 3920622 bytes SHA1 (patch-aa) = 00fb7a85caf8fc9f08298d0a07a4587757fdffb0 SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30 -SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 62add37324a9c164dbc9281d59089dc445fde3e9 +SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = ec19279b7b65c2390aa65dd2319df86006e44849 SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8 SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21 SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92 diff --git a/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c b/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c index 66539784295..59c6fa18e09 100644 --- a/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c +++ b/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.3 2015/02/06 01:27:25 jmcneill Exp $ +$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.4 2015/02/25 12:48:34 jmcneill Exp $ --- src/joystick/bsd/SDL_sysjoystick.c.orig 2012-01-19 06:30:06.000000000 +0000 +++ src/joystick/bsd/SDL_sysjoystick.c @@ -64,7 +64,7 @@ $NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.3 2015/02/06 01:27:25 jmc if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) { goto usberr; } -@@ -386,6 +420,11 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) +@@ -386,10 +420,21 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) if (hw->axis_map[i] > 0) hw->axis_map[i] = joy->naxes++; @@ -76,3 +76,13 @@ $NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.3 2015/02/06 01:27:25 jmc usbend: /* The poll blocks the event thread. */ fcntl(fd, F_SETFL, O_NONBLOCK); + ++#ifdef __NetBSD__ ++ /* Flush any pending events */ ++ while (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) == rep->size) ++ ; ++#endif ++ + return (0); + usberr: + close(hw->fd); |