Update SDL to 1.2.1. Changes include:

    * Added Linux PlayStation 2 Graphics Synthesizer support
    * Added an audio driver that writes to disk
    * Mouse wheel sends mouse button (4/5) events on Windows
    * Added MacOS X Project Builder projects
    * Added initial support for Quartz video
    * Disabled Linux /dev/event joystick interface by default
    * Added native OpenBSD audio driver
    * Added detection of Open Sound System on Solaris x86
    * Added initial support for Nano-X
    * Fixed endian detection on IA64 architectures
    * Added --disable-dga configure option to disable DGA
    * Fixed stuck keys when changing the video mode
    * Fixed double-mouse event bug on Windows using OpenGL
    * Fixed 320x200 video mode on framebuffer console
    * Improved robustness for the ELO touchpad
    * Added support for building under Cygwin on Windows
    * Added a dummy video driver for benchmarking
    * Fixed fullscreen cursor offset bug on BeOS

11 files changed, 62 insertions, 141 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 52caf20383a..025136307f4 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/07/01 20:13:14 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/07/03 06:17:32 rh Exp $
 #
 
-DISTNAME=	SDL-1.2.0
+DISTNAME=	SDL-1.2.1
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 168a2b4e986..f178e6b303c 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/03 06:17:32 rh Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -17,7 +17,7 @@ SDL_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.SDL?=	SDL>=1.2.0
+BUILDLINK_DEPENDS.SDL?=	SDL>=1.2.1
 DEPENDS+=		${BUILDLINK_DEPENDS.SDL}:../../devel/SDL
 
 BUILDLINK_PREFIX.SDL=	${LOCALBASE}
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index ddb7c6a822b..bb0f268a05b 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.6 2001/06/26 03:49:24 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/07/03 06:17:32 rh Exp $
 
-SHA1 (SDL-1.2.0.tar.gz) = ba99b4fbf04a7a9622dc6f8d103216abcf17ee19
-Size (SDL-1.2.0.tar.gz) = 1375872 bytes
+SHA1 (SDL-1.2.1.tar.gz) = c2968bfd3dc4f5b3c8a2b0f541796390ce90d0a5
+Size (SDL-1.2.1.tar.gz) = 1478755 bytes
 SHA1 (patch-aa) = 43b3532f1939fb6d1ead45297aa34dd5b1f2383d
 SHA1 (patch-ab) = f04507e6faaa43ff7ae276bd1f6dc10bf42539d9
-SHA1 (patch-ac) = a1f66a4df82beabbd1e29b3d3ed07c18faa0cdd6
-SHA1 (patch-ad) = 04d1327490b71043a81a8576226c6396b9c0783a
-SHA1 (patch-ae) = 38e96e34e7e2bc8b6955ad71a25f5a4a2a9ee9b6
+SHA1 (patch-ac) = 6806707f5ae3b2c8e128d1c888c5ea6e9e7d6200
+SHA1 (patch-ad) = bff300dd22af3cbfa59f760858a3b25ab97e685a
+SHA1 (patch-ae) = 48be5569eb631b095c0a8af3b3a295c3f34958a6
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6
 SHA1 (patch-ai) = 9c732852520b86e2ffa4b467d4b5220a53c9ecc6
-SHA1 (patch-aj) = 4059a74bf4dfb074813af5314de9eb1c78337760
+SHA1 (patch-aj) = d69dc748ed59ecbdd29d3480daf7805c91d22c08
 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29
-SHA1 (patch-am) = 1231a8617f34c5bbdb3c8adc19cba4b0e18bb477
 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187
-SHA1 (patch-ap) = c93c5d477dffb18fe9e83ce9248ecf5201d256bf
-SHA1 (patch-aq) = a9f429212c50bdce975322a578f79fa0982820e3
+SHA1 (patch-aq) = 45f63636a9caa338274db68596c8cf8c1d3cd0f0
 SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
index f3bbebcf551..b1debb3e931 100644
--- a/devel/SDL/patches/patch-ac
+++ b/devel/SDL/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2001/04/17 16:27:21 rh Exp $
+$NetBSD: patch-ac,v 1.4 2001/07/03 06:17:32 rh Exp $
 
---- src/audio/SDL_audio.c.orig	Wed Mar 21 18:19:56 2001
+--- src/audio/SDL_audio.c.orig	Sat Jun 16 03:51:42 2001
 +++ src/audio/SDL_audio.c
-@@ -40,7 +40,7 @@
- 
- /* Available audio drivers */
- static AudioBootStrap *bootstrap[] = {
--#if defined(unix) && \
-+#if defined(__NetBSD__) || defined(unix) && \
-    !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
-    && !defined(__bsdi__)
+@@ -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,
-@@ -185,7 +185,7 @@
+ #endif
+@@ -241,7 +241,7 @@
  	/* Select the proper audio driver */
  	audio = NULL;
  	idx = 0;
diff --git a/devel/SDL/patches/patch-ad b/devel/SDL/patches/patch-ad
index ac1deafb788..3e12078523f 100644
--- a/devel/SDL/patches/patch-ad
+++ b/devel/SDL/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.2 2000/10/15 07:39:44 wulf Exp $ 
+$NetBSD: patch-ad,v 1.3 2001/07/03 06:17:33 rh Exp $
 
---- src/audio/SDL_audiomem.c.orig	Sun Sep 24 12:37:32 2000
-+++ src/audio/SDL_audiomem.c	Mon Oct  2 13:25:47 2000
-@@ -34,6 +34,7 @@
+--- src/audio/SDL_audiomem.c.orig	Thu Apr 26 18:50:17 2001
++++ src/audio/SDL_audiomem.c
+@@ -35,6 +35,7 @@
  #include <sys/ipc.h>
  #include <sys/shm.h>
  #include <stddef.h>
 +#include <stdlib.h>
- #else
- #include <stdlib.h>
  #endif
+ 
+ #include "SDL_audiomem.h"
diff --git a/devel/SDL/patches/patch-ae b/devel/SDL/patches/patch-ae
index dc432829b84..7af65e4fc63 100644
--- a/devel/SDL/patches/patch-ae
+++ b/devel/SDL/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2001/04/17 16:27:21 rh Exp $
+$NetBSD: patch-ae,v 1.4 2001/07/03 06:17:33 rh Exp $
 
---- src/audio/SDL_sysaudio.h.orig	Wed Mar 21 18:19:56 2001
+--- src/audio/SDL_sysaudio.h.orig	Sat Jun 16 03:51:42 2001
 +++ src/audio/SDL_sysaudio.h
-@@ -99,7 +99,7 @@
- 	SDL_AudioDevice *(*create)(int devindex);
- } AudioBootStrap;
- 
--#if defined(unix) && \
-+#if defined(__NetBSD__) || defined(unix) && \
-    !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
-    && !defined(__bsdi__)
+@@ -109,7 +109,7 @@
+ #ifdef __OpenBSD__
+ extern AudioBootStrap OBSD_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 9196f6e71d0..3255cde7c0c 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2001/05/05 13:47:13 rh Exp $
+$NetBSD: patch-aj,v 1.6 2001/07/03 06:17:33 rh Exp $
 
---- configure.in.orig	Tue Mar 27 05:39:19 2001
+--- configure.in.orig	Mon Jun 18 17:21:38 2001
 +++ configure.in
-@@ -389,7 +389,7 @@
+@@ -410,7 +410,7 @@
                    NASMFLAGS="-f win32"
                    ;;
                *)
@@ -11,7 +11,16 @@ $NetBSD: patch-aj,v 1.5 2001/05/05 13:47:13 rh Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -1199,7 +1199,11 @@
+@@ -890,7 +890,7 @@
+             ;;
+         *-*-netbsd*)
+             pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
+-            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
++            pthread_lib="-L/usr/pkg/lib -lpthread"
+             ;;
+         *-*-openbsd*)
+             pthread_cflags="-D_REENTRANT"
+@@ -1577,7 +1577,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)
@@ -24,31 +33,14 @@ $NetBSD: patch-aj,v 1.5 2001/05/05 13:47:13 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)
-@@ -1209,7 +1213,7 @@
-             COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
-         fi
-         # NetBSD does not define "unix"
--        CFLAGS="$CFLAGS -Dunix"
-+        CFLAGS="$CFLAGS -Dunix -D_POSIX_THREAD_SYSCALL_SOFT=1"
-         ;;
-     *-*-openbsd*)
-         ARCH=openbsd
-@@ -1769,6 +1773,7 @@
- AM_CONDITIONAL(TARGET_IRIX, test $ARCH = irix)
- AM_CONDITIONAL(TARGET_BSDI, test $ARCH = bsdi)
- AM_CONDITIONAL(TARGET_FREEBSD, test $ARCH = freebsd)
-+AM_CONDITIONAL(TARGET_NETBSD, test $ARCH = netbsd)
- AM_CONDITIONAL(TARGET_OPENBSD, test $ARCH = openbsd)
- AM_CONDITIONAL(TARGET_AIX, test $ARCH = aix)
- AM_CONDITIONAL(TARGET_WIN32, test $ARCH = win32)
-@@ -1788,6 +1793,10 @@
+@@ -1956,6 +1960,10 @@
  
  if test $ARCH = solaris; then
    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
 +fi
 +
 +if test $ARCH = netbsd; then
-+  SDL_RLD_FLAGS="-Wl,-R\${exec_prefix}/lib -Wl,-R\${X11BASE}/lib"
++  SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib"
  fi
  
- dnl Output the video drivers we use
+ if test $ARCH = openbsd; then
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
deleted file mode 100644
index 8d98a1f6e75..00000000000
--- a/devel/SDL/patches/patch-am
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-am,v 1.1 2000/10/22 16:55:20 rh Exp $
-
---- src/cdrom/openbsd/SDL_syscdrom.c.orig	Thu Mar 16 16:20:38 2000
-+++ src/cdrom/openbsd/SDL_syscdrom.c
-@@ -35,6 +35,7 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/ioctl.h>
- #include <sys/cdio.h>
- 
- #include "SDL_error.h"
-@@ -63,7 +64,8 @@
- 
- /* Some ioctl() errno values which occur when the tray is empty */
- #define ERRNO_TRAYEMPTY(errno)	\
--	((errno == EIO) || (errno == ENOENT) || (errno == EINVAL))
-+	((errno == EIO) || (errno == ENOENT) || (errno == EINVAL) || \
-+	 (errno == ENODEV))
- 
- /* Check a drive to see if it is a CD-ROM */
- static int CheckDrive(char *drive, struct stat *stbuf)
-@@ -95,6 +97,8 @@
- 			}
- 			close(cdfd);
- 		}
-+		else if (ERRNO_TRAYEMPTY(errno))
-+			is_cd = 1;
- 	}
- 	return(is_cd);
- }
-@@ -136,7 +140,11 @@
- int  SDL_SYS_CDInit(void)
- {
- 	static char *checklist[] = {
-+#ifdef __NetBSD__
-+		"?0 cd?a", "cdrom", NULL
-+#else
- 		"?0 cd?c", "?0 acd?c", "cdrom", NULL
-+#endif
- 	};
- 	char *SDLcdrom;
- 	int i, j, exists;
diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap
deleted file mode 100644
index 355b93920de..00000000000
--- a/devel/SDL/patches/patch-ap
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2000/12/03 04:33:11 wiz Exp $
-
---- src/timer/linux/SDL_systimer.c.orig	Sun Oct 22 22:35:19 2000
-+++ src/timer/linux/SDL_systimer.c
-@@ -36,6 +36,10 @@
- #include "SDL_timer.h"
- #include "SDL_timer_c.h"
- 
-+#if _POSIX_THREAD_SYSCALL_SOFT
-+#include <pthread.h>
-+#endif
-+
- #if defined(DISABLE_THREADS) || defined(FORK_HACK)
- #define USE_ITIMER
- #endif
-@@ -96,6 +100,9 @@
- 	do {
- 		errno = 0;
- 
-+#if _POSIX_THREAD_SYSCALL_SOFT
-+		pthread_yield_np();
-+#endif
- #ifdef USE_NANOSLEEP
- 		tv.tv_sec = elapsed.tv_sec;
- 		tv.tv_nsec = elapsed.tv_nsec;
diff --git a/devel/SDL/patches/patch-aq b/devel/SDL/patches/patch-aq
index 866ded307d3..7d959b2b85e 100644
--- a/devel/SDL/patches/patch-aq
+++ b/devel/SDL/patches/patch-aq
@@ -1,15 +1,14 @@
-$NetBSD: patch-aq,v 1.1 2000/10/22 16:55:21 rh Exp $
+$NetBSD: patch-aq,v 1.2 2001/07/03 06:17:33 rh Exp $
 
---- src/video/x11/SDL_x11events.c.orig	Sun Oct 22 17:42:30 2000
+--- src/video/x11/SDL_x11events.c.orig	Tue May  1 23:12:57 2001
 +++ src/video/x11/SDL_x11events.c
-@@ -51,6 +51,10 @@
+@@ -53,6 +53,9 @@
  #include "SDL_x11mouse_c.h"
  #include "SDL_x11events_c.h"
  
 +#if _POSIX_THREAD_SYSCALL_SOFT
 +#include <pthread.h>
 +#endif
-+
  
- /* The translation tables from an X11 keysym to a SDL keysym */
- static SDLKey ODD_keymap[256];
+ /* Define this if you want to debug X11 events */
+ /*#define DEBUG_XEVENTS*/
diff --git a/devel/SDL/pkg/PLIST b/devel/SDL/pkg/PLIST
index f741202f19c..b8c3dda4075 100644
--- a/devel/SDL/pkg/PLIST
+++ b/devel/SDL/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2001/04/17 16:27:24 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/07/03 06:17:33 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.0
+lib/libSDL.so.0.1
 lib/libSDLmain.a
 man/man3/SDLKey.3
 man/man3/SDL_ActiveEvent.3