Changes 1.2.14:

* Added cast macros for correct usage with C++:
	SDL_reinterpret_cast(type, expression)
	SDL_static_cast(type, expression)
* Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for
  SDL_VIDEO_FULLSCREEN_HEAD on X11.
* Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal
  up/down events for Caps-Lock and Num-Lock keys.

5 files changed, 15 insertions, 114 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index d3e931077ce..6b469b759dc 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2009/09/02 21:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2009/10/23 06:05:07 adam Exp $
 
-DISTNAME=	SDL-1.2.13
-PKGREVISION=	5
+DISTNAME=	SDL-1.2.14
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
@@ -37,7 +36,6 @@ CONFIGURE_ARGS+=	--disable-nasm
 CONFIGURE_ARGS+=	--disable-video-wscons
 .endif
 
-CONFIGURE_ARGS+=	--enable-dlopen
 CONFIGURE_ENV+=		NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 MAKE_ENV+=		NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 
@@ -68,6 +66,11 @@ MAKE_ENV+=		AM_CFLAGS=${AM_CFLAGS:M*:Q}
 .if ${OPSYS} != "IRIX" && ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
 .endif
 .include "../../mk/pthread.buildlink3.mk"
 
@@ -78,9 +81,4 @@ CONFIGURE_ARGS+=	--enable-pth
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 508335a6099..e8262dd8711 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:24:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2009/10/23 06:05:07 adam Exp $
 
 BUILDLINK_TREE+=	SDL
 
@@ -16,6 +16,9 @@ PTHREAD_OPTS+=	require
 .if ${OPSYS} != "IRIX" && ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
@@ -32,9 +35,6 @@ pkgbase := SDL
 .include "../../audio/nas/buildlink3.mk"
 .endif
 
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
 .endif # SDL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-SDL
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 47cfc67c55f..81b45b5d69f 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.53 2009/09/02 21:19:53 wiz Exp $
+$NetBSD: distinfo,v 1.54 2009/10/23 06:05:07 adam Exp $
 
-SHA1 (SDL-1.2.13.tar.gz) = 51fcaa3e1d5c01fd813ea08688780f86b19cf539
-RMD160 (SDL-1.2.13.tar.gz) = ed8825fc98f4b3759cf9e5cf8357d71c50df9925
-Size (SDL-1.2.13.tar.gz) = 3373673 bytes
+SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd
+RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801
+Size (SDL-1.2.14.tar.gz) = 4014154 bytes
 SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
-SHA1 (patch-ab) = 344c6b70ee062c576e20d7ff222a6283ba3cb4cb
 SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
-SHA1 (patch-pulse) = 418f6a324405a9873c6c3c608df2be940e87101c
diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab
deleted file mode 100644
index d680da5288a..00000000000
--- a/devel/SDL/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2008/10/13 17:15:44 reinoud Exp $
-
---- src/cdrom/openbsd/SDL_syscdrom.c.orig	2007-12-31 05:47:59.000000000 +0100
-+++ src/cdrom/openbsd/SDL_syscdrom.c
-@@ -391,6 +391,7 @@ static int SDL_SYS_CDStop(SDL_CD *cdrom)
- /* Eject the CD-ROM */
- static int SDL_SYS_CDEject(SDL_CD *cdrom)
- {
-+	SDL_SYS_CDioctl(cdrom->id, CDIOCALLOW, 0);
- 	return(SDL_SYS_CDioctl(cdrom->id, CDIOCEJECT, 0));
- }
- 
diff --git a/devel/SDL/patches/patch-pulse b/devel/SDL/patches/patch-pulse
deleted file mode 100644
index f59ded39e4f..00000000000
--- a/devel/SDL/patches/patch-pulse
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-pulse,v 1.1 2008/12/26 21:53:31 ahoka Exp $
-
---- src/audio/pulse/SDL_pulseaudio.c.orig	2007-12-31 05:47:58.000000000 +0100
-+++ src/audio/pulse/SDL_pulseaudio.c
-@@ -26,6 +26,7 @@
- /* Allow access to an PulseAudio network stream mixing buffer */
- 
- #include <sys/types.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <signal.h>
- #include <errno.h>
-@@ -164,10 +165,10 @@ static int Audio_Available(void)
- 	paspec.rate = 11025;
- 	paspec.channels = 1;
- 	connection = SDL_NAME(pa_simple_new)(
--		SDL_getenv("PASERVER"),      /* server */
-+		NULL,                        /* server */
- 		"Test stream",               /* application name */
- 		PA_STREAM_PLAYBACK,          /* playback mode */
--		SDL_getenv("PADEVICE"),      /* device on the server */
-+		NULL,                        /* device on the server */
- 		"Simple DirectMedia Layer",  /* stream description */
- 		&paspec,                     /* sample format spec */
- 		NULL,                        /* channel map */
-@@ -272,10 +273,10 @@ static void PULSE_CloseAudio(_THIS)
- }
- 
- /* Try to get the name of the program */
--static char *get_progname(void)
-+static char *PULSE_GetProgname(void)
- {
--	char *progname = NULL;
- #ifdef __LINUX__
-+	char *progname = NULL;
- 	FILE *fp;
- 	static char temp[BUFSIZ];
- 
-@@ -292,8 +293,12 @@ static char *get_progname(void)
- 		}
- 		fclose(fp);
- 	}
--#endif
- 	return(progname);
-+#elif defined(__NetBSD__)
-+	return getprogname();
-+#else
-+	return("unknown");
-+#endif
- }
- 
- static int PULSE_OpenAudio(_THIS, SDL_AudioSpec *spec)
-@@ -340,11 +345,10 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
- 	SDL_memset(mixbuf, spec->silence, spec->size);
- 	
- 	/* Reduced prebuffering compared to the defaults. */
--	paattr.tlength = mixlen;
-+	paattr.tlength = mixlen * 2;
- 	paattr.minreq = mixlen;
--	paattr.fragsize = mixlen;
--	paattr.prebuf = mixlen;
--	paattr.maxlength = mixlen * 4;
-+	paattr.prebuf = mixlen * 2;
-+	paattr.maxlength = mixlen * 2;
- 	
- 	/* The SDL ALSA output hints us that we use Windows' channel mapping */
- 	/* http://bugzilla.libsdl.org/show_bug.cgi?id=110 */
-@@ -353,11 +357,11 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
- 	
- 	/* Connect to the PulseAudio server */
- 	stream = SDL_NAME(pa_simple_new)(
--		SDL_getenv("PASERVER"),      /* server */
--		get_progname(),              /* application name */
-+		NULL,                        /* server */
-+		PULSE_GetProgname(),         /* application name */
- 		PA_STREAM_PLAYBACK,          /* playback mode */
--		SDL_getenv("PADEVICE"),      /* device on the server */
--		"Simple DirectMedia Layer",  /* stream description */
-+		NULL,                        /* device on the server */
-+		"SDL Application",           /* stream description */
- 		&paspec,                     /* sample format spec */
- 		&pacmap,                     /* channel map */
- 		&paattr,                     /* buffering attributes */