pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL Include limits.h for UINT_MAX (build fix on ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9e59be486ffb
branches: trunk
changeset: 645569:9e59be486ffb
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Jan 30 12:02:49 2015 +0000
description:
Include limits.h for UINT_MAX (build fix on NetBSD).
diffstat:
devel/SDL/distinfo | 4 +-
devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c | 26 +++++++----
2 files changed, 19 insertions(+), 11 deletions(-)
diffs (103 lines):
diff -r bec9ca92fa81 -r 9e59be486ffb devel/SDL/distinfo
--- a/devel/SDL/distinfo Fri Jan 30 11:12:09 2015 +0000
+++ b/devel/SDL/distinfo Fri Jan 30 12:02:49 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2015/01/29 12:31:07 jmcneill Exp $
+$NetBSD: distinfo,v 1.72 2015/01/30 12:02:49 wiz Exp $
SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
@@ -8,7 +8,7 @@
SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 4ea0136f231729129b82e5f7ee4b9eaf68a13876
SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8
-SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 216a07cbfb99e1f3d6fe2da191922be76cb09759
+SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21
SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92
SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 17e048ccb201ae961e820ab880d5a588b2db2639
SHA1 (patch-src_video_wscons_SDL__wsconsvideo.h) = efc75da910cfe370b7361a0b9d2b90837c6b9aa9
diff -r bec9ca92fa81 -r 9e59be486ffb devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
--- a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c Fri Jan 30 11:12:09 2015 +0000
+++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c Fri Jan 30 12:02:49 2015 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.9 2015/01/29 12:31:08 jmcneill Exp $
+$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.10 2015/01/30 12:02:49 wiz Exp $
--- src/video/wscons/SDL_wsconsevents.c.orig 2012-01-19 06:30:06.000000000 +0000
+++ src/video/wscons/SDL_wsconsevents.c
-@@ -47,14 +47,31 @@ int WSCONS_InitKeyboard(_THIS)
+@@ -25,6 +25,7 @@
+ #include <dev/wscons/wsdisplay_usl_io.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <termios.h>
+ #include <errno.h>
+@@ -47,14 +48,31 @@ int WSCONS_InitKeyboard(_THIS)
return -1;
}
@@ -35,7 +43,7 @@
tty.c_cflag = CREAD | CS8;
tty.c_lflag = 0;
tty.c_cc[VTIME] = 0;
-@@ -65,8 +82,12 @@ int WSCONS_InitKeyboard(_THIS)
+@@ -65,8 +83,12 @@ int WSCONS_InitKeyboard(_THIS)
WSCONS_ReportError("cannot set terminal attributes: %s", strerror(errno));
return -1;
}
@@ -50,7 +58,7 @@
return -1;
}
-@@ -81,6 +102,10 @@ void WSCONS_ReleaseKeyboard(_THIS)
+@@ -81,6 +103,10 @@ void WSCONS_ReleaseKeyboard(_THIS)
strerror(errno));
}
if (private->did_save_tty) {
@@ -61,7 +69,7 @@
if (tcsetattr(private->fd, TCSANOW, &private->saved_tty) < 0) {
WSCONS_ReportError("cannot restore keynoard attributes: %s",
strerror(errno));
-@@ -89,8 +114,65 @@ void WSCONS_ReleaseKeyboard(_THIS)
+@@ -89,8 +115,65 @@ void WSCONS_ReleaseKeyboard(_THIS)
}
}
@@ -128,7 +136,7 @@
}
static SDLKey keymap[128];
-@@ -107,6 +189,11 @@ static SDL_keysym *TranslateKey(int scan
+@@ -107,6 +190,11 @@ static SDL_keysym *TranslateKey(int scan
if (keysym->sym == SDLK_UNKNOWN)
printf("Unknown mapping for scancode %d\n", scancode);
@@ -140,7 +148,7 @@
return keysym;
}
-@@ -120,19 +207,42 @@ static void updateKeyboard(_THIS)
+@@ -120,19 +208,42 @@ static void updateKeyboard(_THIS)
for (i = 0; i < n; i++) {
unsigned char c = buf[i] & 0x7f;
if (c == 224) // special key prefix -- what should we do with it?
@@ -187,7 +195,7 @@
} while (posted);
}
-@@ -146,8 +256,10 @@ void WSCONS_InitOSKeymap(_THIS)
+@@ -146,8 +257,10 @@ void WSCONS_InitOSKeymap(_THIS)
}
switch (private->kbdType) {
@@ -199,7 +207,7 @@
/* top row */
keymap[2] = SDLK_1;
keymap[3] = SDLK_2;
-@@ -220,7 +332,6 @@ void WSCONS_InitOSKeymap(_THIS)
+@@ -220,7 +333,6 @@ void WSCONS_InitOSKeymap(_THIS)
keymap[77] = SDLK_RIGHT;
keymap[80] = SDLK_DOWN;
break;
Home |
Main Index |
Thread Index |
Old Index