Update to 1.2.15:

General Notes

   * Fixed assembly register clobbering in CPU info routines
   * Fixed memory stomp when using stretch blit on large images
   * Fixed pixel corruption with overlapping blits
   * SDL_JOYSTICK_DEVICE can be a colon separated list of joystick devices
   * Disabled MMX blitters since they don't compile on modern compilers

Unix Notes

   * Fixed crash in joystick code on newer Linux kernels
   * Fixed channel swizzling for ALSA target with 6-channel output
   * Use the OpenGL GLX_EXT_swap_control extension if available
   * XRandR support is disabled by default because it causes desktop reconfiguring. It can be enabled with the SDL_VIDEO_X11_XRANDR=1
     environment variable, or by applying this patch: http://hg.libsdl.org/SDL/raw-rev/8ec3036098df

Windows Notes

   * Fixed SDL_GL_ACCELERATED_VISUAL handling
   * Fixed application state handling with ALT-Tab
   * Fixed occasional crash handling WM_ACTIVATEAPP in Direct X code
   * Fixed UTF-8 decoding of Russian characters

Mac OS X Notes

   * Fixed building and running on Mac OS X 10.7 (Lion)

5 files changed, 12 insertions, 28 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index ca49a6a9c02..97ed675c05c 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2012/01/24 15:17:05 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2012/01/28 10:33:31 wiz Exp $
 
-DISTNAME=	SDL-1.2.14
-PKGREVISION=	9
+DISTNAME=	SDL-1.2.15
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/PLIST b/devel/SDL/PLIST
index d6f9949dcb9..2ccdb18a98b 100644
--- a/devel/SDL/PLIST
+++ b/devel/SDL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:48:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/01/28 10:33:31 wiz Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -33,7 +33,7 @@ include/SDL/SDL_video.h
 include/SDL/begin_code.h
 include/SDL/close_code.h
 lib/libSDL.la
-lib/libSDLmain.a
+lib/libSDLmain.la
 lib/pkgconfig/sdl.pc
 man/man3/SDLKey.3
 man/man3/SDL_ActiveEvent.3
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 74a04cd0bb5..7b3820afba0 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.60 2012/01/24 15:17:05 wiz Exp $
+$NetBSD: distinfo,v 1.61 2012/01/28 10:33:31 wiz Exp $
 
-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 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
+RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
+Size (SDL-1.2.15.tar.gz) = 3920622 bytes
 SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
-SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580
 SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = e2bbc5577a397e418c3fb565428b8fc558089802
-SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 30d90f7a717661f4c0fd0404c48c1081ee64d6fb
+SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = e1595611542f3ffaebfe32ee611596c18c06be5e
 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 356a8817cc41dde5e24cb23f032215931f85a84b
diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab
deleted file mode 100644
index 582c2b37e52..00000000000
--- a/devel/SDL/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2011/08/02 17:02:38 joerg Exp $
-
---- src/video/mmx.h.orig	2011-08-02 12:38:09.000000000 +0000
-+++ src/video/mmx.h
-@@ -355,7 +355,7 @@ mmx_ok(void)
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
--			      : "=X" (mem) \
-+			      : "=m" (mem) \
- 			      : /* nothing */ )
- 
- #define	mmx_r2r(op, regs, regd) \
diff --git a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
index da79ac3548c..8c493efcbf4 100644
--- a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
+++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
@@ -1,19 +1,18 @@
-$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.3 2012/01/24 15:17:05 wiz Exp $
+$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.4 2012/01/28 10:33:31 wiz Exp $
 
 "Port" to NetBSD.
 
---- src/video/wscons/SDL_wsconsevents.c.orig	2009-10-12 23:07:14.000000000 +0000
+--- src/video/wscons/SDL_wsconsevents.c.orig	2012-01-19 06:30:06.000000000 +0000
 +++ src/video/wscons/SDL_wsconsevents.c
 @@ -146,8 +146,11 @@ void WSCONS_InitOSKeymap(_THIS)
    }
  
    switch (private->kbdType) {
 -#ifdef WSKBD_TYPE_ZAURUS
--  case WSKBD_TYPE_ZAURUS:
 +#if defined(__NetBSD__) || !defined(WSKBD_TYPE_ZAURUS)
 +  default:
 +#else
-+  case WSKBD_TYPE_ZAURUS:
+   case WSKBD_TYPE_ZAURUS:
 +#endif
      /* top row */
      keymap[2] = SDLK_1;