Update to 1.2.3; based on pkg/15580 by Ben Wong.

Relevant changes for NetBSD:
* 1.2.3: Added X11 Xinerama support - fullscreen starts on screen 0
* 1.2.3: Added platform independent OpenGL Header - SDL_opengl.h
* 1.2.3: Fixed crash when using double-buffering with DGA
* 1.2.3: Fixed XVideo on GeForce by using last available adaptor
* 1.2.3: Added 640x480 as a scaled resolution for NTSC/PAL output

5 files changed, 22 insertions, 28 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 30e8398db3c..55a4992091a 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2002/01/31 13:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.31 2002/02/14 00:39:45 wiz Exp $
 #
 
-DISTNAME=	SDL-1.2.2
-PKGREVISION=	3
+DISTNAME=	SDL-1.2.3
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/PLIST b/devel/SDL/PLIST
index 62cbdc2d7a4..811bf15d0a5 100644
--- a/devel/SDL/PLIST
+++ b/devel/SDL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/14 00:39:45 wiz Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -16,6 +16,7 @@ include/SDL/SDL_keysym.h
 include/SDL/SDL_main.h
 include/SDL/SDL_mouse.h
 include/SDL/SDL_mutex.h
+include/SDL/SDL_opengl.h
 include/SDL/SDL_quit.h
 include/SDL/SDL_rwops.h
 include/SDL/SDL_syswm.h
@@ -30,7 +31,7 @@ lib/libSDL.a
 lib/libSDL.la
 lib/libSDL.so
 lib/libSDL.so.0
-lib/libSDL.so.0.2
+lib/libSDL.so.0.3
 lib/libSDLmain.a
 man/man3/SDLKey.3
 man/man3/SDL_ActiveEvent.3
@@ -79,6 +80,7 @@ man/man3/SDL_EnableKeyRepeat.3
 man/man3/SDL_EnableUNICODE.3
 man/man3/SDL_Event.3
 man/man3/SDL_EventState.3
+man/man3/SDL_ExposeEvent.3
 man/man3/SDL_FillRect.3
 man/man3/SDL_Flip.3
 man/man3/SDL_FreeCursor.3
@@ -95,6 +97,7 @@ man/man3/SDL_GetAppState.3
 man/man3/SDL_GetAudioStatus.3
 man/man3/SDL_GetClipRect.3
 man/man3/SDL_GetCursor.3
+man/man3/SDL_GetError.3
 man/man3/SDL_GetEventFilter.3
 man/man3/SDL_GetGamma.3
 man/man3/SDL_GetGammaRamp.3
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 97487688fe1..7173979fd9e 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.9 2001/09/24 14:28:55 rh Exp $
+$NetBSD: distinfo,v 1.10 2002/02/14 00:39:45 wiz Exp $
 
-SHA1 (SDL-1.2.2.tar.gz) = 1699bd6094847d5465035ac5c4211e182a4a9dd9
-Size (SDL-1.2.2.tar.gz) = 1491276 bytes
+SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845
+Size (SDL-1.2.3.tar.gz) = 1568671 bytes
 SHA1 (patch-aa) = 43b3532f1939fb6d1ead45297aa34dd5b1f2383d
 SHA1 (patch-ab) = f04507e6faaa43ff7ae276bd1f6dc10bf42539d9
 SHA1 (patch-ac) = 86c50bbf2672440b4fcb88c241bf3d11ec237d70
 SHA1 (patch-ad) = bff300dd22af3cbfa59f760858a3b25ab97e685a
-SHA1 (patch-ae) = 74c49d74f8af71394cd66d987f21ae9e05f3b19f
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6
 SHA1 (patch-ai) = 0edabed555e3fc4b0a92aff9240359fc6637f022
-SHA1 (patch-aj) = aa451a536fa21bb11cfd40380ff27a9715be0650
+SHA1 (patch-aj) = 193253f2d1e10efda167ef90fdc8fc6c426b3c42
 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29
 SHA1 (patch-al) = 0fe579ae0358d59f87a78fe4b5b006ef991d44f0
 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187
diff --git a/devel/SDL/patches/patch-ae b/devel/SDL/patches/patch-ae
deleted file mode 100644
index 420e6f88cad..00000000000
--- a/devel/SDL/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2001/09/24 14:28:55 rh Exp $
-
---- src/audio/SDL_sysaudio.h.orig	Mon Jul 23 04:58:42 2001
-+++ src/audio/SDL_sysaudio.h
-@@ -109,7 +109,7 @@
- #ifdef ALSA_SUPPORT
- extern AudioBootStrap ALSA_bootstrap;
- #endif
--#if (defined(unix) && !defined(__CYGWIN32__)) && \
-+#if (defined(__NetBSD__) || defined(unix) && !defined(__CYGWIN32__)) && \
-     !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
- extern AudioBootStrap AUDIO_bootstrap;
- #endif
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 858152726a8..4f6413014dd 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.8 2001/09/24 14:28:56 rh Exp $
+$NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
 
---- configure.in.orig	Mon Jul 23 21:54:03 2001
+--- configure.in.orig	Mon Jul 23 15:54:03 2001
 +++ configure.in
 @@ -366,10 +366,7 @@
                    , enable_nas=yes)
@@ -34,7 +34,7 @@ $NetBSD: patch-aj,v 1.8 2001/09/24 14:28:56 rh Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1348,6 +1345,7 @@
+@@ -1348,11 +1345,13 @@
          CheckDummyVideo
          CheckDiskAudio
          CheckNASM
@@ -42,7 +42,13 @@ $NetBSD: patch-aj,v 1.8 2001/09/24 14:28:56 rh Exp $
          CheckOSS
          CheckARTSC
          CheckESD
-@@ -1642,7 +1640,11 @@
+         CheckNAS
+         CheckX11
++        CheckDGA
+         CheckAAlib
+         CheckOpenGL
+         CheckPTHREAD
+@@ -1642,7 +1641,11 @@
              COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
              COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c)
              COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h)
@@ -55,7 +61,7 @@ $NetBSD: patch-aj,v 1.8 2001/09/24 14:28:56 rh Exp $
              COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h)
              COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c)
              COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h)
-@@ -2021,6 +2023,10 @@
+@@ -2021,6 +2024,10 @@
  
  if test $ARCH = solaris; then
    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"