summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/SDL/Makefile4
-rw-r--r--devel/SDL/distinfo4
-rw-r--r--devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c14
-rw-r--r--devel/SDL2/Makefile4
-rw-r--r--devel/SDL2/distinfo4
-rw-r--r--devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c12
6 files changed, 30 insertions, 12 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);
diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile
index 2f7df5e16f9..c4af019953c 100644
--- a/devel/SDL2/Makefile
+++ b/devel/SDL2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2015/02/21 23:35:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2015/02/25 12:45:59 jmcneill Exp $
DISTNAME= SDL2-2.0.3
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
diff --git a/devel/SDL2/distinfo b/devel/SDL2/distinfo
index 42b649c3994..11c322d2adf 100644
--- a/devel/SDL2/distinfo
+++ b/devel/SDL2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2015/02/13 23:31:06 jmcneill Exp $
+$NetBSD: distinfo,v 1.10 2015/02/25 12:45:59 jmcneill Exp $
SHA1 (SDL2-2.0.3.tar.gz) = 21c45586a4e94d7622e371340edec5da40d06ecc
RMD160 (SDL2-2.0.3.tar.gz) = e6f3718c7366c5da793c1454cf0ec0972e8bd347
Size (SDL2-2.0.3.tar.gz) = 3871267 bytes
SHA1 (patch-configure) = 7f0469ef69c2a7fc6a769435f0d29a01148df122
SHA1 (patch-src_cpuinfo_SDL_cpuinfo.c) = 9482910e62023b92e80ce4d3b670a1a1e666789f
-SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 9bfc6667d67bfa7e5d45aa4aaf5a2bbb94d4bdc8
+SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 5d2b4d560196a861d4d3e459478d4528f3b759b7
SHA1 (patch-src_thread_pthread_SDL__systhread.c) = 68f32770d067d2b6dcffe96da2dd4aa6b4c82050
SHA1 (patch-src_video_SDL__egl.c) = 67e9bc3a32616b3c6e86c5bc5ccd475f55fbcfa7
SHA1 (patch-src_video_x11_SDL__x11opengl.c) = a435634da8b8bd5e74a281b9a26e8fb8a294e56b
diff --git a/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c b/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
index a9d9f059ff3..78323d5405d 100644
--- a/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
+++ b/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.1 2015/02/13 23:31:06 jmcneill Exp $
+$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.2 2015/02/25 12:45:59 jmcneill Exp $
Skip non-joystick HID devices, and give joysticks on NetBSD a human readable
name.
@@ -53,7 +53,7 @@ name.
if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
goto usberr;
}
-@@ -414,6 +446,11 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy,
+@@ -414,9 +446,19 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy,
if (hw->axis_map[i] > 0)
hw->axis_map[i] = joy->naxes++;
@@ -65,3 +65,11 @@ name.
usbend:
/* The poll blocks the event thread. */
fcntl(fd, F_SETFL, O_NONBLOCK);
++#ifdef __NetBSD__
++ /* Flush pending events */
++ while (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) == rep->size)
++ ;
++#endif
+
+ return (0);
+ usberr:
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 17:20:31 +0000