Update SDL to 1.2.2. Changes include:

    * Native NetBSD audio support
    * Now gets correct keyboard state when starting up on X11
    * Improved the DGA 2.0 and framebuffer console drivers
    * Improved OSS audio driver support, thanks to 4Front Tech.
    * Improved X11 fullscreen support, works better with KDE

8 files changed, 51 insertions, 37 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 70b306a89c1..2aa85c19563 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:08 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/09/24 14:28:55 rh Exp $
 #
 
-DISTNAME=	SDL-1.2.1
+DISTNAME=	SDL-1.2.2
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index a0b215f85cf..97487688fe1 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.8 2001/07/14 15:45:34 jlam Exp $
+$NetBSD: distinfo,v 1.9 2001/09/24 14:28:55 rh Exp $
 
-SHA1 (SDL-1.2.1.tar.gz) = c2968bfd3dc4f5b3c8a2b0f541796390ce90d0a5
-Size (SDL-1.2.1.tar.gz) = 1478755 bytes
+SHA1 (SDL-1.2.2.tar.gz) = 1699bd6094847d5465035ac5c4211e182a4a9dd9
+Size (SDL-1.2.2.tar.gz) = 1491276 bytes
 SHA1 (patch-aa) = 43b3532f1939fb6d1ead45297aa34dd5b1f2383d
 SHA1 (patch-ab) = f04507e6faaa43ff7ae276bd1f6dc10bf42539d9
-SHA1 (patch-ac) = 6806707f5ae3b2c8e128d1c888c5ea6e9e7d6200
+SHA1 (patch-ac) = 86c50bbf2672440b4fcb88c241bf3d11ec237d70
 SHA1 (patch-ad) = bff300dd22af3cbfa59f760858a3b25ab97e685a
-SHA1 (patch-ae) = 48be5569eb631b095c0a8af3b3a295c3f34958a6
+SHA1 (patch-ae) = 74c49d74f8af71394cd66d987f21ae9e05f3b19f
+SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6
-SHA1 (patch-ai) = 9c732852520b86e2ffa4b467d4b5220a53c9ecc6
-SHA1 (patch-aj) = ccb2ec084e5f7d7cfadc0b6ea6739a2f7b60182e
+SHA1 (patch-ai) = 0edabed555e3fc4b0a92aff9240359fc6637f022
+SHA1 (patch-aj) = aa451a536fa21bb11cfd40380ff27a9715be0650
 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29
+SHA1 (patch-al) = 0fe579ae0358d59f87a78fe4b5b006ef991d44f0
 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187
 SHA1 (patch-aq) = 45f63636a9caa338274db68596c8cf8c1d3cd0f0
 SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
index b1debb3e931..c22ef241406 100644
--- a/devel/SDL/patches/patch-ac
+++ b/devel/SDL/patches/patch-ac
@@ -1,16 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2001/07/03 06:17:32 rh Exp $
+$NetBSD: patch-ac,v 1.5 2001/09/24 14:28:55 rh Exp $
 
---- src/audio/SDL_audio.c.orig	Sat Jun 16 03:51:42 2001
+--- src/audio/SDL_audio.c.orig	Mon Jul 23 04:58:42 2001
 +++ src/audio/SDL_audio.c
-@@ -50,7 +50,7 @@
- #ifdef __OpenBSD__
- 	&OBSD_bootstrap,
- #endif
--#if (defined(unix) && !defined(__CYGWIN32__)) && \
-+#if (defined(__NetBSD__) || defined(unix) && !defined(__CYGWIN32__)) && \
-     !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
- 	&AUDIO_bootstrap,
- #endif
 @@ -241,7 +241,7 @@
  	/* Select the proper audio driver */
  	audio = NULL;
diff --git a/devel/SDL/patches/patch-ae b/devel/SDL/patches/patch-ae
index 7af65e4fc63..420e6f88cad 100644
--- a/devel/SDL/patches/patch-ae
+++ b/devel/SDL/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.4 2001/07/03 06:17:33 rh Exp $
+$NetBSD: patch-ae,v 1.5 2001/09/24 14:28:55 rh Exp $
 
---- src/audio/SDL_sysaudio.h.orig	Sat Jun 16 03:51:42 2001
+--- src/audio/SDL_sysaudio.h.orig	Mon Jul 23 04:58:42 2001
 +++ src/audio/SDL_sysaudio.h
 @@ -109,7 +109,7 @@
- #ifdef __OpenBSD__
- extern AudioBootStrap OBSD_bootstrap;
+ #ifdef ALSA_SUPPORT
+ extern AudioBootStrap ALSA_bootstrap;
  #endif
 -#if (defined(unix) && !defined(__CYGWIN32__)) && \
 +#if (defined(__NetBSD__) || defined(unix) && !defined(__CYGWIN32__)) && \
diff --git a/devel/SDL/patches/patch-af b/devel/SDL/patches/patch-af
new file mode 100644
index 00000000000..62fb8fa6107
--- /dev/null
+++ b/devel/SDL/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.5 2001/09/24 14:28:55 rh Exp $
+
+--- src/audio/SDL_audiodev.c.orig	Mon Sep 24 14:11:43 2001
++++ src/audio/SDL_audiodev.c
+@@ -39,7 +39,7 @@
+ #include "SDL_audiodev_c.h"
+ 
+ #ifndef _PATH_DEV_DSP
+-#ifdef __OpenBSD__
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ #define _PATH_DEV_DSP  "/dev/audio"
+ #else
+ #define _PATH_DEV_DSP  "/dev/dsp"
diff --git a/devel/SDL/patches/patch-ai b/devel/SDL/patches/patch-ai
index f89d020090c..5de5d973291 100644
--- a/devel/SDL/patches/patch-ai
+++ b/devel/SDL/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.3 2001/04/17 16:27:22 rh Exp $
+$NetBSD: patch-ai,v 1.4 2001/09/24 14:28:55 rh Exp $
 
---- include/SDL_syswm.h.orig	Wed Feb 28 13:35:28 2001
+--- include/SDL_syswm.h.orig	Sun Jul  8 11:00:06 2001
 +++ include/SDL_syswm.h
 @@ -49,7 +49,7 @@
  #else
  
  /* This is the structure for custom window manager events */
--#if (defined(unix) || defined(__unix__) || defined(_AIX)) && \
-+#if (defined(unix) || defined(__unix__) || defined(__NetBSD__) || defined(_AIX)) && \
+-#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
++#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
      (!defined(DISABLE_X11) && !defined(__CYGWIN32__))
   /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
  #include <X11/Xlib.h>
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 309e3e9d997..858152726a8 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2001/07/14 15:45:35 jlam Exp $
+$NetBSD: patch-aj,v 1.8 2001/09/24 14:28:56 rh Exp $
 
---- configure.in.orig	Mon Jun 18 11:21:38 2001
+--- configure.in.orig	Mon Jul 23 21:54:03 2001
 +++ configure.in
-@@ -354,10 +354,7 @@
+@@ -366,10 +366,7 @@
                    , enable_nas=yes)
      if test x$enable_audio = xyes -a x$enable_nas = xyes; then
          AC_MSG_CHECKING(for NAS audio support)
@@ -14,7 +14,7 @@ $NetBSD: patch-aj,v 1.7 2001/07/14 15:45:35 jlam Exp $
          AC_MSG_RESULT($have_nas)
          if test x$have_nas = xyes; then
              CFLAGS="$CFLAGS -DNAS_SUPPORT"
-@@ -410,7 +407,7 @@
+@@ -420,7 +417,7 @@
                    NASMFLAGS="-f win32"
                    ;;
                *)
@@ -23,7 +23,7 @@ $NetBSD: patch-aj,v 1.7 2001/07/14 15:45:35 jlam Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -889,8 +886,8 @@
+@@ -930,8 +927,8 @@
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -34,7 +34,15 @@ $NetBSD: patch-aj,v 1.7 2001/07/14 15:45:35 jlam Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1577,7 +1574,11 @@
+@@ -1348,6 +1345,7 @@
+         CheckDummyVideo
+         CheckDiskAudio
+         CheckNASM
++        CheckOPENBSDAUDIO
+         CheckOSS
+         CheckARTSC
+         CheckESD
+@@ -1642,7 +1640,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)
@@ -47,7 +55,7 @@ $NetBSD: patch-aj,v 1.7 2001/07/14 15:45:35 jlam 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)
-@@ -1956,6 +1957,10 @@
+@@ -2021,6 +2023,10 @@
  
  if test $ARCH = solaris; then
    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
diff --git a/devel/SDL/pkg/PLIST b/devel/SDL/pkg/PLIST
index b8c3dda4075..ed3385277d8 100644
--- a/devel/SDL/pkg/PLIST
+++ b/devel/SDL/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/07/03 06:17:33 rh Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/09/24 14:28:56 rh Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -30,7 +30,7 @@ lib/libSDL.a
 lib/libSDL.la
 lib/libSDL.so
 lib/libSDL.so.0
-lib/libSDL.so.0.1
+lib/libSDL.so.0.2
 lib/libSDLmain.a
 man/man3/SDLKey.3
 man/man3/SDL_ActiveEvent.3