Mon Dec 26 12:28:47 2011 UTC ()
Fix typo in ifdef.
Bump PKGREVISION.


(wiz)
diff -r1.95 -r1.96 pkgsrc/devel/SDL/Makefile
diff -r1.57 -r1.58 pkgsrc/devel/SDL/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c
cvs diff -r1.95 -r1.96 pkgsrc/devel/SDL/Makefile (switch to unified diff)

--- pkgsrc/devel/SDL/Makefile 2011/12/01 10:48:07 1.95
+++ pkgsrc/devel/SDL/Makefile 2011/12/26 12:28:46 1.96
@@ -1,72 +1,72 @@ @@ -1,72 +1,72 @@
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
3DISTNAME= SDL-1.2.14 3DISTNAME= SDL-1.2.14
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= devel games 5CATEGORIES= devel games
6MASTER_SITES= http://www.libsdl.org/release/ 6MASTER_SITES= http://www.libsdl.org/release/
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://www.libsdl.org/ 9HOMEPAGE= http://www.libsdl.org/
10COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library 10COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19PTHREAD_OPTS+= require 19PTHREAD_OPTS+= require
20PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
21 21
22CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 22CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
23CPPFLAGS+= -DX11BASE="\"${X11BASE}\"" 23CPPFLAGS+= -DX11BASE="\"${X11BASE}\""
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "SunOS" 29.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "SunOS"
30BUILD_DEPENDS+= yasm>=0.6.0:../../devel/yasm 30BUILD_DEPENDS+= yasm>=0.6.0:../../devel/yasm
31NASMFLAGS_ELF= -f elf 31NASMFLAGS_ELF= -f elf
32NASMFLAGS_a.out= -f aoutb 32NASMFLAGS_a.out= -f aoutb
33.else 33.else
34CONFIGURE_ARGS+= --disable-nasm 34CONFIGURE_ARGS+= --disable-nasm
35.endif 35.endif
36 36
37CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" 37CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
38MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" 38MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
39 39
40# See <http://developer.apple.com/qa/qa2007/qa1567.html>. 40# See <http://developer.apple.com/qa/qa2007/qa1567.html>.
41.if ${OPSYS} == "Darwin" 41.if ${OPSYS} == "Darwin"
42. if !empty(OS_VERSION:M9.*) 42. if !empty(OS_VERSION:M9.*)
43LDFLAGS+= -Wl,-dylib_file -Wl,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib 43LDFLAGS+= -Wl,-dylib_file -Wl,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
44. endif 44. endif
45.endif 45.endif
46 46
47.include "../../mk/oss.buildlink3.mk" 47.include "../../mk/oss.buildlink3.mk"
48 48
49AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\"" 49AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
50MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:M*:Q} 50MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:M*:Q}
51 51
52# Irix comes with GL, which works fine for SDL 52# Irix comes with GL, which works fine for SDL
53.if ${OPSYS} != "IRIX" && ${OPSYS} != "Darwin" 53.if ${OPSYS} != "IRIX" && ${OPSYS} != "Darwin"
54CONFIGURE_ARGS+= --disable-x11-shared 54CONFIGURE_ARGS+= --disable-x11-shared
55.include "../../graphics/MesaLib/buildlink3.mk" 55.include "../../graphics/MesaLib/buildlink3.mk"
56.include "../../graphics/glu/buildlink3.mk" 56.include "../../graphics/glu/buildlink3.mk"
57.include "../../x11/libXext/buildlink3.mk" 57.include "../../x11/libXext/buildlink3.mk"
58.include "../../x11/libXrandr/buildlink3.mk" 58.include "../../x11/libXrandr/buildlink3.mk"
59.include "../../x11/libXt/buildlink3.mk" 59.include "../../x11/libXt/buildlink3.mk"
60.include "../../x11/xextproto/buildlink3.mk" 60.include "../../x11/xextproto/buildlink3.mk"
61.include "../../x11/xproto/buildlink3.mk" 61.include "../../x11/xproto/buildlink3.mk"
62.endif 62.endif
63.include "../../mk/pthread.buildlink3.mk" 63.include "../../mk/pthread.buildlink3.mk"
64 64
65.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth" 65.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
66# Let SDL know that we do not have native pthreads and are using GNU pth. 66# Let SDL know that we do not have native pthreads and are using GNU pth.
67CONFIGURE_ARGS+= --disable-pthreads 67CONFIGURE_ARGS+= --disable-pthreads
68CONFIGURE_ARGS+= --enable-pth 68CONFIGURE_ARGS+= --enable-pth
69.endif 69.endif
70 70
71.include "../../converters/libiconv/buildlink3.mk" 71.include "../../converters/libiconv/buildlink3.mk"
72.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.57 -r1.58 pkgsrc/devel/SDL/distinfo (switch to unified diff)

--- pkgsrc/devel/SDL/distinfo 2011/12/11 10:48:58 1.57
+++ pkgsrc/devel/SDL/distinfo 2011/12/26 12:28:46 1.58
@@ -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
3SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd 3SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd
4RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801 4RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801
5Size (SDL-1.2.14.tar.gz) = 4014154 bytes 5Size (SDL-1.2.14.tar.gz) = 4014154 bytes
6SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f 6SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
7SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580 7SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580
8SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd 8SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
9SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44 9SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44
10SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 5b6e7823272ed33db314063450c4bf85ea1a0127 10SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 6a35135581a29107099eb184765d340d9d202dc2
cvs diff -r1.1 -r1.2 pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c (switch to unified diff)

--- pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c 2011/12/01 10:48:08 1.1
+++ pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c 2011/12/26 12:28:47 1.2
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
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
3Fix tty device and color patterns for wscons driver on NetBSD. 3Fix 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 {
39 WSCONS_ReportError("Displays with 8 bpp or less are not supported"); 39 WSCONS_ReportError("Displays with 8 bpp or less are not supported");
40 return -1; 40 return -1;