Updated to SDL-1.1.5 and bugfixes

13 files changed, 74 insertions, 63 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 29fd46eb546..1bc9a5dd816 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/06/26 01:09:08 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/10/15 07:39:43 wulf Exp $
 #
 
-DISTNAME=	SDL-1.1.3
+DISTNAME=	SDL-1.1.5
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/files/md5 b/devel/SDL/files/md5
index 1ce247334cb..01b0aad84f2 100644
--- a/devel/SDL/files/md5
+++ b/devel/SDL/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: md5,v 1.2 2000/10/15 07:39:44 wulf Exp $
 
-MD5 (SDL-1.1.3.tar.gz) = 675cd5df455b32e7648c86cd734d5a33
+MD5 (SDL-1.1.5.tar.gz) = f3e32edb188674ded00eb0b88ddd32bf
diff --git a/devel/SDL/files/patch-sum b/devel/SDL/files/patch-sum
index d72ff8f67f7..3c6616d1b3b 100644
--- a/devel/SDL/files/patch-sum
+++ b/devel/SDL/files/patch-sum
@@ -1,14 +1,14 @@
-$NetBSD: patch-sum,v 1.2 2000/10/13 20:43:33 skrll Exp $
+$NetBSD: patch-sum,v 1.3 2000/10/15 07:39:44 wulf Exp $
 
 MD5 (patch-aa) = 9f1f063534b7a1687ee160a02ba55957
 MD5 (patch-ab) = 9b3e6e48901394b9af2146c9e3d23bad
-MD5 (patch-ac) = 6cc0b292c6d1704e24cdf9a3ef92b1ca
-MD5 (patch-ad) = 1b09e6e6dd5647323d486d5cb19afc06
-MD5 (patch-ae) = 4deec123b2cc9244e970161e015c2c8e
-MD5 (patch-af) = bfb4ca65f34df8034c3a580087ce6d43
-MD5 (patch-ag) = d65ea50c5e770d265b1be404df5b4e60
+MD5 (patch-ac) = bd199884f6f4d01f136f1c8a33bef923
+MD5 (patch-ad) = ea17ac0f6f78ea80757e7203bc565fe6
+MD5 (patch-ae) = 95ba5bb7e7fae19d80c527ed35de9c9e
+MD5 (patch-af) = 5afdab3c08524b68d64c4c988c62ef26
+MD5 (patch-ag) = 4adf64909111de90a5a64aece847e343
 MD5 (patch-ah) = 5dcfce9c64721177b198ccf2dd584f14
-MD5 (patch-ai) = a87655d1307a2482af8b26a9b94dea7e
-MD5 (patch-aj) = 616ba95aaea20fa79f9bbb5406ac6324
-MD5 (patch-ak) = 7f8029d5b1194f50454e634582f1c1bb
-MD5 (patch-al) = a1b63ba6d6b046532ef8c93029004fff
+MD5 (patch-ai) = dd9eebc4a45a6809cf72e7a4b57b2384
+MD5 (patch-aj) = ad8ccfdc0cc3a56e14bf252709ad19b1
+MD5 (patch-ak) = 4914b1b04a740338a8ffc7ca42e46fe1
+MD5 (patch-al) = 1d1ce08c9ec803e011386cacb33c7fa8
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
index 4436a72df2b..339fe21ac56 100644
--- a/devel/SDL/patches/patch-ac
+++ b/devel/SDL/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2000/10/15 07:39:44 wulf Exp $
 
---- src/audio/SDL_audio.c.orig	Wed Apr 12 20:44:19 2000
-+++ src/audio/SDL_audio.c	Fri Jun 23 03:53:50 2000
+--- src/audio/SDL_audio.c.orig	Mon Sep 18 08:59:24 2000
++++ src/audio/SDL_audio.c	Mon Oct  2 13:22:55 2000
 @@ -45,6 +45,9 @@
  #ifdef unix
  	&AUDIO_bootstrap,
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
  #ifdef linux
  	&DMA_bootstrap,
  #endif
-@@ -170,7 +173,7 @@
+@@ -175,7 +178,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 0f7f38f6657..ac1deafb788 100644
--- a/devel/SDL/patches/patch-ad
+++ b/devel/SDL/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2000/10/15 07:39:44 wulf Exp $ 
 
---- src/audio/SDL_audiomem.c.orig	Thu Mar 16 16:20:37 2000
-+++ src/audio/SDL_audiomem.c	Fri Jun 23 03:53:50 2000
-@@ -33,6 +33,7 @@
- #include <sys/types.h>
+--- 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 @@
  #include <sys/ipc.h>
  #include <sys/shm.h>
+ #include <stddef.h>
 +#include <stdlib.h>
  #else
  #include <stdlib.h>
diff --git a/devel/SDL/patches/patch-ae b/devel/SDL/patches/patch-ae
index ea175ebaf20..42f4bc8dca1 100644
--- a/devel/SDL/patches/patch-ae
+++ b/devel/SDL/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2000/10/15 07:39:44 wulf Exp $
 
---- src/audio/SDL_sysaudio.h.orig	Thu Mar 16 16:20:37 2000
-+++ src/audio/SDL_sysaudio.h	Fri Jun 23 03:53:51 2000
-@@ -102,6 +102,9 @@
+--- src/audio/SDL_sysaudio.h.orig	Tue Sep 12 03:52:41 2000
++++ src/audio/SDL_sysaudio.h	Mon Oct  2 13:23:29 2000
+@@ -103,6 +103,9 @@
  #ifdef unix
  extern AudioBootStrap AUDIO_bootstrap;
  #endif
diff --git a/devel/SDL/patches/patch-af b/devel/SDL/patches/patch-af
index 5d03e1e5e47..92e509a7937 100644
--- a/devel/SDL/patches/patch-af
+++ b/devel/SDL/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-af,v 1.2 2000/10/15 07:39:45 wulf Exp $
 
---- src/audio/Makefile.am.orig	Fri Apr  7 08:29:23 2000
-+++ src/audio/Makefile.am	Fri Jun 23 03:53:51 2000
+--- src/audio/Makefile.am.orig	Wed Aug 23 13:05:26 2000
++++ src/audio/Makefile.am	Sun Oct  8 00:34:41 2000
 @@ -3,7 +3,7 @@
  
  noinst_LTLIBRARIES = libaudio.la
  
--EXTRA_SUBDIRS = aix beos irix linux macos openbsd solaris win32
-+EXTRA_SUBDIRS = aix beos irix linux macos netbsd openbsd solaris win32
+-EXTRA_SUBDIRS = aix amigaos beos irix linux macos openbsd solaris win32
++EXTRA_SUBDIRS = aix amigaos beos irix linux macos netbsd openbsd solaris win32
  
  SUBDIRS = @AUDIO_ARCH@
  
diff --git a/devel/SDL/patches/patch-ag b/devel/SDL/patches/patch-ag
index bafeaeec87f..7a872ed65aa 100644
--- a/devel/SDL/patches/patch-ag
+++ b/devel/SDL/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2000/10/15 07:39:45 wulf Exp $
 
---- src/video/SDL_yuv_sw.c.orig	Wed May 24 04:33:58 2000
-+++ src/video/SDL_yuv_sw.c	Fri Jun 23 04:00:45 2000
-@@ -905,7 +905,7 @@
+--- src/video/SDL_yuv_sw.c.orig	Sun Sep 24 10:29:46 2000
++++ src/video/SDL_yuv_sw.c	Mon Oct  2 13:23:42 2000
+@@ -909,7 +909,7 @@
  	    case SDL_IYUV_OVERLAY:
  		cpu_mmx = CPU_Flags() & MMX_CPU;
  		if ( display->format->BytesPerPixel == 2 ) {
@@ -10,8 +10,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
 +#if defined(i386) && defined(__GNUC__) && !defined(__NetBSD__) /* inline assembly functions */
  			if ( cpu_mmx && (Rmask == 0xF800) &&
  			                (Gmask == 0x07E0) &&
- 				        (Bmask == 0x001F) ) {
-@@ -920,7 +920,7 @@
+ 				        (Bmask == 0x001F) &&
+@@ -925,7 +925,7 @@
  #endif
  			swdata->Display2X = Color16DitherYV12Mod2X;
  		} else {
@@ -19,4 +19,4 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
 +#if defined(i386) && defined(__GNUC__) && !defined(__NetBSD__) /* inline assembly functions */
  			if ( cpu_mmx && (Rmask == 0x00FF0000) &&
  			                (Gmask == 0x0000FF00) &&
- 				        (Bmask == 0x000000FF) ) {
+ 				        (Bmask == 0x000000FF) && 
diff --git a/devel/SDL/patches/patch-ai b/devel/SDL/patches/patch-ai
index 91cf772940d..adc3f5bc890 100644
--- a/devel/SDL/patches/patch-ai
+++ b/devel/SDL/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2000/10/15 07:39:45 wulf Exp $
 
---- include/SDL_syswm.h.orig	Thu Mar 16 16:20:37 2000
-+++ include/SDL_syswm.h	Fri Jun 23 03:53:52 2000
+--- include/SDL_syswm.h.orig	Thu Jul 27 05:25:52 2000
++++ include/SDL_syswm.h	Mon Oct  2 13:29:35 2000
 @@ -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(_AIX) || defined(__NetBSD__)
+-#if (defined(unix) || defined(__unix__) || defined(_AIX)) && \
++#if (defined(unix) || defined(__unix__) || defined(__NetBSD__)|| defined(_AIX)) && \
+     !defined(DISABLE_X11)
   /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
  #include <X11/Xlib.h>
- #include <X11/Xatom.h>
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 2c8e5e3521c..d35989096fe 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2000/10/15 07:39:45 wulf Exp $
 
---- configure.in.orig	Tue Jun  6 06:36:10 2000
-+++ configure.in	Fri Jun 23 03:53:52 2000
-@@ -810,6 +810,51 @@
-             COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
-         fi
+--- configure.in.orig	Wed Sep 27 15:45:33 2000
++++ configure.in	Mon Oct  2 13:23:58 2000
+@@ -939,6 +939,51 @@
+         # NetBSD does not define "unix"
+         CFLAGS="$CFLAGS -Dunix"
          ;;
 +    *-*-netbsd*)
 +        ARCH=netbsd
@@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
      *-*-openbsd*)
          ARCH=openbsd
          CheckESD
-@@ -1147,6 +1192,7 @@
+@@ -1325,6 +1370,7 @@
  AM_CONDITIONAL(TARGET_SOLARIS, test $ARCH = solaris)
  AM_CONDITIONAL(TARGET_IRIX, test $ARCH = irix)
  AM_CONDITIONAL(TARGET_FREEBSD, test $ARCH = freebsd)
@@ -62,7 +62,18 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
  AM_CONDITIONAL(TARGET_OPENBSD, test $ARCH = openbsd)
  AM_CONDITIONAL(TARGET_AIX, test $ARCH = aix)
  AM_CONDITIONAL(TARGET_WIN32, test $ARCH = win32)
-@@ -1214,6 +1260,7 @@
+@@ -1341,6 +1387,10 @@
+   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"
++fi
++
+ dnl Output the video drivers we use
+ if test x$enable_video = xtrue; then
+     if test "$VIDEO_SUBDIRS" = ""; then
+@@ -1395,6 +1445,7 @@
  src/audio/irix/Makefile
  src/audio/linux/Makefile
  src/audio/macos/Makefile
diff --git a/devel/SDL/patches/patch-ak b/devel/SDL/patches/patch-ak
index 691d6f96f9a..be72587649e 100644
--- a/devel/SDL/patches/patch-ak
+++ b/devel/SDL/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2000/10/15 07:39:45 wulf Exp $
 
---- sdl-config.in.orig	Mon May 22 20:01:18 2000
-+++ sdl-config.in	Sun Jun 25 16:19:04 2000
-@@ -46,7 +46,7 @@
+--- sdl-config.in.orig	Sun Sep 24 10:29:01 2000
++++ sdl-config.in	Mon Oct  2 13:24:05 2000
+@@ -49,7 +49,7 @@
        ;;
      --libs)
        libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
diff --git a/devel/SDL/patches/patch-al b/devel/SDL/patches/patch-al
index b2769c38645..ea5e3820511 100644
--- a/devel/SDL/patches/patch-al
+++ b/devel/SDL/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1 2000/10/13 20:43:35 skrll Exp $
+$NetBSD: patch-al,v 1.2 2000/10/15 07:39:45 wulf Exp $ 
 
---- src/joystick/Makefile.am.orig	Fri Oct 13 18:51:25 2000
-+++ src/joystick/Makefile.am
+--- src/joystick/Makefile.am.orig	Wed Aug 23 13:05:26 2000
++++ src/joystick/Makefile.am	Sun Oct 15 03:35:25 2000
 @@ -12,15 +12,7 @@
  	SDL_sysjoystick.h
  
  # Include the architecture-specific sources
 -if TARGET_BEOS
--ARCH_SRCS = SDL_sysjoystick.cc
+-ARCH_SRCS = SDL_bejoystick.cc
 -else
 -if TARGET_WIN32
 -ARCH_SRCS = SDL_mmjoystick.c
diff --git a/devel/SDL/pkg/PLIST b/devel/SDL/pkg/PLIST
index 1b348bf9e27..98902a34537 100644
--- a/devel/SDL/pkg/PLIST
+++ b/devel/SDL/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/22 13:46:13 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/10/15 07:39:46 wulf Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -28,6 +28,6 @@ include/SDL/close_code.h
 @dirrm include/SDL
 lib/libSDL.a
 lib/libSDL.la
-lib/libSDL-1.1.so.3.0
+lib/libSDL-1.1.so.5.0
 lib/libSDLmain.a
 share/aclocal/sdl.m4