Fix typo in ifdef. Bump PKGREVISION.diff -r1.95 -r1.96 pkgsrc/devel/SDL/Makefile
(wiz)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.95 2011/12/01 10:48:07 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.96 2011/12/26 12:28:46 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= SDL-1.2.14 | 3 | DISTNAME= SDL-1.2.14 | |
4 | PKGREVISION= 4 | 4 | PKGREVISION= 5 | |
5 | CATEGORIES= devel games | 5 | CATEGORIES= devel games | |
6 | MASTER_SITES= http://www.libsdl.org/release/ | 6 | MASTER_SITES= http://www.libsdl.org/release/ | |
7 | 7 | |||
8 | MAINTAINER= wiz@NetBSD.org | 8 | MAINTAINER= wiz@NetBSD.org | |
9 | HOMEPAGE= http://www.libsdl.org/ | 9 | HOMEPAGE= http://www.libsdl.org/ | |
10 | COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library | 10 | COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library | |
11 | LICENSE= gnu-lgpl-v2.1 | 11 | LICENSE= gnu-lgpl-v2.1 | |
12 | 12 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
14 | 14 | |||
15 | USE_LANGUAGES= c c++ | 15 | USE_LANGUAGES= c c++ | |
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | USE_TOOLS+= gmake | 17 | USE_TOOLS+= gmake |
@@ -1,10 +1,10 @@ | @@ -1,10 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.57 2011/12/11 10:48:58 taca Exp $ | 1 | $NetBSD: distinfo,v 1.58 2011/12/26 12:28:46 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd | 3 | SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd | |
4 | RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801 | 4 | RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801 | |
5 | Size (SDL-1.2.14.tar.gz) = 4014154 bytes | 5 | Size (SDL-1.2.14.tar.gz) = 4014154 bytes | |
6 | SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f | 6 | SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f | |
7 | SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580 | 7 | SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580 | |
8 | SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd | 8 | SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd | |
9 | SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44 | 9 | SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44 | |
10 | SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 5b6e7823272ed33db314063450c4bf85ea1a0127 | 10 | SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 6a35135581a29107099eb184765d340d9d202dc2 |
@@ -1,38 +1,38 @@ | @@ -1,38 +1,38 @@ | |||
1 | $NetBSD: patch-src_video_wscons_SDL__wsconsvideo.c,v 1.1 2011/12/01 10:48:08 wiz Exp $ | 1 | $NetBSD: patch-src_video_wscons_SDL__wsconsvideo.c,v 1.2 2011/12/26 12:28:47 wiz Exp $ | |
2 | 2 | |||
3 | Fix tty device and color patterns for wscons driver on NetBSD. | 3 | Fix tty device and color patterns for wscons driver on NetBSD. | |
4 | 4 | |||
5 | --- src/video/wscons/SDL_wsconsvideo.c.orig 2009-10-12 23:07:14.000000000 +0000 | 5 | --- src/video/wscons/SDL_wsconsvideo.c.orig 2009-10-12 23:07:14.000000000 +0000 | |
6 | +++ src/video/wscons/SDL_wsconsvideo.c | 6 | +++ src/video/wscons/SDL_wsconsvideo.c | |
7 | @@ -141,7 +141,13 @@ VideoBootStrap WSCONS_bootstrap = { | 7 | @@ -141,7 +141,13 @@ VideoBootStrap WSCONS_bootstrap = { | |
8 | WSCONS_CreateDevice | 8 | WSCONS_CreateDevice | |
9 | }; | 9 | }; | |
10 | 10 | |||
11 | +#ifdef __NetBSD__ | 11 | +#ifdef __NetBSD__ | |
12 | +#define WSCONSDEV_FORMAT "/dev/ttyE%01x" | 12 | +#define WSCONSDEV_FORMAT "/dev/ttyE%01x" | |
13 | +#endif | 13 | +#endif | |
14 | + | 14 | + | |
15 | +#ifdef __OpenBSD__ | 15 | +#ifdef __OpenBSD__ | |
16 | #define WSCONSDEV_FORMAT "/dev/ttyC%01x" | 16 | #define WSCONSDEV_FORMAT "/dev/ttyC%01x" | |
17 | +#endif | 17 | +#endif | |
18 | 18 | |||
19 | int WSCONS_VideoInit(_THIS, SDL_PixelFormat *vformat) | 19 | int WSCONS_VideoInit(_THIS, SDL_PixelFormat *vformat) | |
20 | { | 20 | { | |
21 | @@ -184,6 +190,11 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFor | 21 | @@ -184,6 +190,11 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFor | |
22 | return -1; | 22 | return -1; | |
23 | } | 23 | } | |
24 | if (private->info.depth > 8) { | 24 | if (private->info.depth > 8) { | |
25 | +#ifdef _NetBSD__ | 25 | +#ifdef __NetBSD__ | |
26 | + private->redMask = 0x0000ff; | 26 | + private->redMask = 0x0000ff; | |
27 | + private->greenMask = 0x00ff00; | 27 | + private->greenMask = 0x00ff00; | |
28 | + private->blueMask = 0xff0000; | 28 | + private->blueMask = 0xff0000; | |
29 | +#else | 29 | +#else | |
30 | if (wstype == WSDISPLAY_TYPE_SUN24 || | 30 | if (wstype == WSDISPLAY_TYPE_SUN24 || | |
31 | wstype == WSDISPLAY_TYPE_SUNCG12 || | 31 | wstype == WSDISPLAY_TYPE_SUNCG12 || | |
32 | wstype == WSDISPLAY_TYPE_SUNCG14 || | 32 | wstype == WSDISPLAY_TYPE_SUNCG14 || | |
33 | @@ -202,6 +213,7 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFor | 33 | @@ -202,6 +213,7 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFor | |
34 | WSCONS_ReportError("Unknown video hardware"); | 34 | WSCONS_ReportError("Unknown video hardware"); | |
35 | return -1; | 35 | return -1; | |
36 | } | 36 | } | |
37 | +#endif | 37 | +#endif | |
38 | } else { | 38 | } else { |