Changes 1.2.8:

* Fixed compiling under newer versions of gcc
* Fixed floating point exception with Linux 2.6 joysticks
* Added 4/6 channel surround sound support on ALSA (not 3D audio)
* Fixed mouse coordinate inversion on MacOS X
* Added a CoreAudio sound driver for MacOS X
* Added MacOS X Xcode build environment support
* Updated QNX support for QNX6
* Improved Atari port, including OSMesa support
* Numerous other bug fixes and platform support improvements

16 files changed, 124 insertions, 444 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 2c1b12d1d34..a7885296c6a 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2004/10/03 00:13:24 tv Exp $
-#
+# $NetBSD: Makefile,v 1.59 2005/01/05 12:05:19 adam Exp $
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKGREVISION=4
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index 3b169cdf6c0..8fd81d7b405 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.16 2004/08/24 21:07:04 hubertf Exp $
-#
+# $NetBSD: Makefile.common,v 1.17 2005/01/05 12:05:19 adam Exp $
 
-DISTNAME=	SDL-1.2.7
+DISTNAME=	SDL-1.2.8
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 6026e46fbfc..e698beeedb1 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.33 2004/07/26 20:42:28 dillo Exp $
+$NetBSD: distinfo,v 1.34 2005/01/05 12:05:19 adam Exp $
 
-SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
-Size (SDL-1.2.7.tar.gz) = 2470936 bytes
-SHA1 (patch-aa) = a78e6bd1e5c858d51f05d0e121300977eb6bff63
-SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
+SHA1 (SDL-1.2.8.tar.gz) = 26f2104a60a28914b809d3cb77d5790bfdfd024c
+Size (SDL-1.2.8.tar.gz) = 2602449 bytes
+SHA1 (patch-aa) = d96902d3de2eb1f0c4edaa8b174f09ae1a654625
+SHA1 (patch-ab) = 6693545cafa5f5e73fb3f6f34d1a0b59a17872d2
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-aj) = bc132adf7f2f81ded884e0bfd29f7f4cedc98f4b
+SHA1 (patch-aj) = bf5173f8a510cfb86a5d48b7afbbaee6c501f3a0
 SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = dafc020b5ccae6970a1212e6ad2c5fd8531bf72e
+SHA1 (patch-am) = 8ed1ce2ef11210e0fe865ba8f1b315853900f2e4
 SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
-SHA1 (patch-as) = 98813c71b10e209df90b5024cf8e6287113563ce
-SHA1 (patch-at) = 5e470473bd9ed1d278b23a06db8af2b346301794
-SHA1 (patch-au) = 7571582ea7654f99f721ef6d1c81a7bee3fb712a
-SHA1 (patch-av) = a19c162dcb85cf0d0d1c1d6ab50651782b60a96f
-SHA1 (patch-aw) = 6f6b2ca8cc499b23f95591f874c436318d2fcf1a
-SHA1 (patch-ba) = 0621af3f2c0abba700c30d7f4809f405a7ffe729
-SHA1 (patch-bb) = 48407d4a2d881cb3427b29682fc7e417023d1b99
-SHA1 (patch-bc) = 40012e55c20e8c10b575a6de0ac4f3f2a35baf15
-SHA1 (patch-bd) = 191e5140254224228d7a8f27af16f88086278849
+SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
+SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
+SHA1 (patch-bb) = a3b7f5e161b4c497a1ad818e2607dfca21288b53
+SHA1 (patch-bc) = 8f34e6d914f9edda1ea494e3970d11b238e47bb8
+SHA1 (patch-bd) = 3d8b20cfe774280d1c8e96405ae26bc23444ee8d
 SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
diff --git a/devel/SDL/patches/patch-aa b/devel/SDL/patches/patch-aa
index 3a0e2b34bb1..52b2987dbb1 100644
--- a/devel/SDL/patches/patch-aa
+++ b/devel/SDL/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
 
---- src/joystick/bsd/SDL_sysjoystick.c.orig	2004-02-18 18:22:01.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c	2004-07-13 22:43:44.000000000 +0200
-@@ -60,7 +60,7 @@
+--- src/joystick/bsd/SDL_sysjoystick.c.orig	2004-12-13 07:54:32.000000000 +0000
++++ src/joystick/bsd/SDL_sysjoystick.c
+@@ -60,7 +60,7 @@ static char rcsid =
  #include <sys/joystick.h>
  #endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  #include <machine/joystick.h>
  #endif
  
-@@ -238,6 +238,7 @@
+@@ -239,6 +239,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  	struct hid_data *hdata;
  	struct report *rep;
  	int fd;
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  
  	fd = open(path, O_RDONLY);
  	if (fd == -1) {
-@@ -302,6 +303,8 @@
+@@ -303,6 +304,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  	joy->nbuttons = 0;
  	joy->nhats = 0;
  	joy->nballs = 0;
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  
  	while (hid_get_item(hdata, &hitem) > 0) {
  		char *sp;
-@@ -328,8 +331,7 @@
+@@ -329,8 +332,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  			    unsigned usage = HID_USAGE(hitem.usage);
  			    int joyaxe = usage_to_joyaxe(usage);
  			    if (joyaxe >= 0) {
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  			    } else if (usage == HUG_HAT_SWITCH) {
  				joy->nhats++;
  			    }
-@@ -347,6 +349,9 @@
+@@ -348,6 +350,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  		}
  	}
  	hid_end_parse(hdata);
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  
  usbend:
  	/* The poll blocks the event thread. */
-@@ -369,7 +374,7 @@
+@@ -370,7 +375,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
  	int nbutton, naxe = -1;
  	Sint32 v;
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  	struct joystick gameport;
  	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
   
-@@ -456,7 +461,8 @@
+@@ -457,7 +462,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
  			    } else if (usage == HUG_HAT_SWITCH) {
  				v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
  							 &hitem);
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
  			    }
  			    break;
  			}
-@@ -529,9 +535,9 @@
+@@ -530,9 +536,9 @@ report_alloc(struct report *r, struct re
  #endif
  #else
  # ifdef USBHID_NEW
diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab
index 38e0cee969f..57b87a841a9 100644
--- a/devel/SDL/patches/patch-ab
+++ b/devel/SDL/patches/patch-ab
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2002/11/06 19:02:56 atatat Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/05 12:05:19 adam Exp $
 
-We are similar enough to OpenBSD to use this, especially since it
-makes the graphics/avifile-devel pkg build again.
-
---- include/SDL_syswm.h.orig	Sun Aug 25 02:21:49 2002
-+++ include/SDL_syswm.h	Mon Nov  4 13:00:07 2002
-@@ -49,7 +49,7 @@
+--- include/SDL_syswm.h.orig	2004-12-13 07:54:31.000000000 +0000
++++ include/SDL_syswm.h
+@@ -49,7 +49,7 @@ typedef struct SDL_SysWMinfo SDL_SysWMin
  #else
  
  /* This is the structure for custom window manager events */
 -#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
 +#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
-     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX))
+     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
+      !defined(__QNXNTO__))
   /* 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 b900466f381..78c2aedcdea 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
 
---- configure.in.orig	Sun Feb 22 22:31:47 2004
-+++ configure.in	Tue Jul 13 22:28:09 2004
-@@ -28,9 +28,9 @@
+--- configure.in.orig	2004-12-13 09:02:08.000000000 +0000
++++ configure.in
+@@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -15,7 +15,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
  
  AC_SUBST(LT_RELEASE)
  AC_SUBST(LT_CURRENT)
-@@ -267,6 +267,8 @@
+@@ -267,6 +267,8 @@ CheckOSS()
          AC_MSG_RESULT($have_oss)
          if test x$have_oss = xyes; then
              CFLAGS="$CFLAGS -DOSS_SUPPORT"
@@ -24,7 +24,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
              AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -422,9 +424,9 @@
+@@ -456,9 +458,9 @@ CheckNAS()
      if test x$enable_audio = xyes -a x$enable_nas = xyes; then
          AC_MSG_CHECKING(for NAS audio support)
          have_nas=no
@@ -36,7 +36,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
              AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-@@ -505,7 +507,7 @@
+@@ -539,7 +541,7 @@ CheckNASM()
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -45,7 +45,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -943,18 +945,18 @@
+@@ -985,18 +987,18 @@ CheckAAlib()
  [  --enable-video-aalib    use AAlib video driver [default=no]],
                    , enable_video_aalib=no)
      if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
@@ -70,7 +70,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -1125,12 +1127,13 @@
+@@ -1202,12 +1204,13 @@ CheckPTH()
  [  --enable-pth            use GNU pth library for multi-threading [default=yes]],
                    , enable_pth=yes)
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -88,7 +88,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1171,8 +1174,8 @@
+@@ -1248,8 +1251,8 @@ CheckPTHREAD()
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -99,7 +99,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1638,29 +1641,31 @@
+@@ -1724,29 +1727,31 @@ CheckUSBHID()
          have_libusbhid=no
          have_libusb=no
          AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -140,7 +140,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
          fi
  
          AC_MSG_CHECKING(for usbhid)
-@@ -1749,6 +1754,26 @@
+@@ -1835,6 +1840,26 @@ CheckUSBHID()
      fi
  }
  
@@ -167,7 +167,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
  dnl Check for altivec instruction support using gas syntax
  CheckAltivec()
  {
-@@ -1957,16 +1982,18 @@
+@@ -2043,16 +2068,18 @@ case "$target" in
          CheckESD
          CheckNAS
          CheckX11
@@ -189,7 +189,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -1975,9 +2002,6 @@
+@@ -2061,9 +2088,6 @@ case "$target" in
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -199,7 +199,7 @@ $NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -2606,7 +2630,7 @@
+@@ -2724,7 +2748,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
  
  # Set runtime shared library paths as needed
  
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index d5ac3905cc4..75e510be5ff 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,17 +1,17 @@
-$NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
 
---- configure.orig	Sun Feb 22 22:32:33 2004
-+++ configure	Tue Jul 13 22:33:55 2004
-@@ -463,7 +463,7 @@
+--- configure.orig	2004-12-13 09:04:51.000000000 +0000
++++ configure
+@@ -463,7 +463,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS AALIB_CONFIG PTHREAD_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ALSA_CFLAGS ALSA_LIBS alsa_lib ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS OSMESA_CONFIG PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ALSA_CFLAGS ALSA_LIBS alsa_lib ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS AALIB_CONFIG OSMESA_CONFIG PTHREAD_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -1587,9 +1587,9 @@
+@@ -1592,9 +1592,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -24,7 +24,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  
  
  
-@@ -21563,6 +21563,8 @@
+@@ -21907,6 +21907,8 @@ rm -f conftest.err conftest.$ac_objext c
  echo "${ECHO_T}$have_oss" >&6
          if test x$have_oss = xyes; then
              CFLAGS="$CFLAGS -DOSS_SUPPORT"
@@ -33,7 +33,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
              AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -22262,9 +22264,9 @@
+@@ -22844,9 +22846,9 @@ fi;
          echo "$as_me:$LINENO: checking for NAS audio support" >&5
  echo $ECHO_N "checking for NAS audio support... $ECHO_C" >&6
          have_nas=no
@@ -45,7 +45,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
              AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-@@ -22530,7 +22532,7 @@
+@@ -23112,7 +23114,7 @@ fi
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -54,7 +54,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
                    ;;
              esac
  
-@@ -25053,63 +25055,58 @@
+@@ -25643,63 +25645,58 @@ else
    enable_video_aalib=no
  fi;
      if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
@@ -148,10 +148,10 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
 +        echo "$as_me:$LINENO: checking for AAlib support" >&5
 +echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
 +        if test x$AALIB_CONFIG = x; then
-+            video_aalib=no
++        video_aalib=no
 +	else
 +            AALIB_LIBS=`$AALIB_CONFIG --libs`
-+            video_aalib=yes
++        video_aalib=yes
 +        fi
          echo "$as_me:$LINENO: result: $video_aalib" >&5
  echo "${ECHO_T}$video_aalib" >&6
@@ -162,7 +162,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -25837,16 +25834,17 @@
+@@ -26714,16 +26711,17 @@ else
    enable_pth=yes
  fi;
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -185,7 +185,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -25856,32 +25854,32 @@
+@@ -26733,32 +26731,32 @@ do
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -227,7 +227,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -25930,8 +25928,8 @@
+@@ -26807,8 +26805,8 @@ fi;
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -238,7 +238,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -27751,93 +27749,21 @@
+@@ -28637,93 +28635,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
    have_libusbhid=yes
  fi
  
@@ -340,7 +340,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27845,7 +27771,7 @@
+@@ -28731,7 +28657,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -349,7 +349,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -27881,15 +27807,15 @@
+@@ -28767,15 +28693,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -368,7 +368,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -27923,25 +27849,25 @@
+@@ -28809,25 +28735,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -410,7 +410,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -27952,34 +27878,34 @@
+@@ -28838,34 +28764,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -461,7 +461,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27987,7 +27913,7 @@
+@@ -28873,7 +28799,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -470,7 +470,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28023,15 +27949,15 @@
+@@ -28909,15 +28835,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -489,7 +489,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28065,25 +27991,25 @@
+@@ -28951,25 +28877,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -497,9 +497,13 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
 -echo "$as_me: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the compiler's result" >&5
 -echo "$as_me: WARNING: usbhid.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libusbhid.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: usbhid.h: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: usbhid.h: present but cannot be compiled" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: usbhid.h:     check for missing prerequisite headers?" >&5
@@ -512,13 +516,6 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
 -echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: usbhid.h: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libusbhid.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
 +    { echo "$as_me:$LINENO: WARNING: libusbhid.h: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: libusbhid.h: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: libusbhid.h:     check for missing prerequisite headers?" >&5
@@ -534,7 +531,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28094,34 +28020,112 @@
+@@ -28980,34 +28906,112 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -576,7 +573,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
 +            echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5
 +echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6
 +if test "${ac_cv_lib_usb_hid_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lusb  $LIBS"
@@ -630,9 +627,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_cv_lib_usb_hid_init=no
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
--echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
++fi
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
@@ -650,8 +645,10 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
 +  echo "$as_me:$LINENO: checking for usb.h" >&5
 +echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
 +if test "${ac_cv_header_usb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
 +echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
 +echo "${ECHO_T}$ac_cv_header_usb_h" >&6
  else
@@ -663,7 +660,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28129,7 +28133,7 @@
+@@ -29015,7 +29019,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -672,7 +669,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28165,15 +28169,15 @@
+@@ -29051,15 +29055,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -691,7 +688,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28207,25 +28211,25 @@
+@@ -29093,25 +29097,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -733,7 +730,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28236,34 +28240,34 @@
+@@ -29122,34 +29126,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -784,7 +781,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28271,7 +28275,7 @@
+@@ -29157,7 +29161,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -793,7 +790,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28307,15 +28311,15 @@
+@@ -29193,15 +29197,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -812,7 +809,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28349,25 +28353,25 @@
+@@ -29235,25 +29239,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -854,7 +851,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28378,33 +28382,29 @@
+@@ -29264,33 +29268,29 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -897,7 +894,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
          fi
  
          echo "$as_me:$LINENO: checking for usbhid" >&5
-@@ -28628,6 +28628,70 @@
+@@ -29514,6 +29514,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
      fi
  }
  
@@ -968,7 +965,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
  CheckAltivec()
  {
      echo "$as_me:$LINENO: checking for GCC Altivec instruction support" >&5
-@@ -28922,16 +28986,18 @@
+@@ -29808,16 +29872,18 @@ __EOF__
          CheckESD
          CheckNAS
          CheckX11
@@ -978,7 +975,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
          CheckPTHREAD
          CheckSIGACTION
          CheckUSBHID
-+	CheckMachineJoystick
++        CheckMachineJoystick
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
 -            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
@@ -990,7 +987,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -28940,9 +29006,6 @@
+@@ -29826,9 +29892,6 @@ __EOF__
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -1000,7 +997,7 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -30425,7 +30488,7 @@
+@@ -31455,7 +31518,7 @@ fi
  
  # Set runtime shared library paths as needed
  
@@ -1009,12 +1006,13 @@ $NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
  fi
  if test $ARCH = solaris; then
-@@ -31564,7 +31627,8 @@
+@@ -32598,8 +32661,9 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
  s,@PKG_CONFIG@,$PKG_CONFIG,;t t
  s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
  s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t
--s,@PTH_CONFIG@,$PTH_CONFIG,;t t
 +s,@AALIB_CONFIG@,$AALIB_CONFIG,;t t
+ s,@OSMESA_CONFIG@,$OSMESA_CONFIG,;t t
+-s,@PTH_CONFIG@,$PTH_CONFIG,;t t
 +s,@PTHREAD_CONFIG@,$PTHREAD_CONFIG,;t t
  s,@ARCH@,$ARCH,;t t
  s,@TARGET_LINUX_TRUE@,$TARGET_LINUX_TRUE,;t t
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
index f18b38efb27..38a411aea4b 100644
--- a/devel/SDL/patches/patch-as
+++ b/devel/SDL/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.3 2004/04/17 00:15:21 snj Exp $
+$NetBSD: patch-as,v 1.4 2005/01/05 12:05:19 adam Exp $
 
---- src/Makefile.in.orig	2004-02-22 13:32:05.000000000 -0800
-+++ src/Makefile.in	2004-04-10 14:51:01.000000000 -0700
-@@ -300,7 +300,6 @@ lib_LTLIBRARIES = libSDL.la
+--- src/Makefile.in.orig	2004-12-13 09:03:05.000000000 +0000
++++ src/Makefile.in
+@@ -304,7 +304,6 @@ lib_LTLIBRARIES = libSDL.la
  libSDL_la_SOURCES = $(GENERAL_SRCS)
  libSDL_la_LDFLAGS = \
  	-no-undefined		\
diff --git a/devel/SDL/patches/patch-at b/devel/SDL/patches/patch-at
deleted file mode 100644
index 561cf988f1e..00000000000
--- a/devel/SDL/patches/patch-at
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/07/09 18:19:09 drochner Exp $
-
---- src/audio/SDL_mixer_MMX.c.orig	2002-11-08 23:13:28.000000000 -0700
-+++ src/audio/SDL_mixer_MMX.c
-@@ -15,13 +15,11 @@ void SDL_MixAudio_MMX_S16(char* dst,char
- {
-     __asm__ __volatile__ (
- 
--"	movl %0,%%edi\n"	// edi = dst
--"	movl %1,%%esi\n"	// esi = src
- "	movl %3,%%eax\n"	// eax = volume
- 
--"	movl %2,%%ebx\n"	// ebx = size
-+"      movl %2,%%edx\n"        // edx = size
- 
--"	shrl $4,%%ebx\n"	// process 16 bytes per iteration = 8 samples
-+"      shrl $4,%%edx\n"        // process 16 bytes per iteration = 8 samples
- 
- "	jz .endS16\n"
- 
-@@ -39,14 +37,14 @@ void SDL_MixAudio_MMX_S16(char* dst,char
- ".align 16\n"
- "	.mixloopS16:\n"
- 
--"	movq (%%esi),%%mm1\n" // mm1 = a|b|c|d
-+"      movq (%1),%%mm1\n" // mm1 = a|b|c|d
- 
- "	movq %%mm1,%%mm2\n" // mm2 = a|b|c|d
- 
--"	movq 8(%%esi),%%mm4\n" // mm4 = e|f|g|h
-+"      movq 8(%1),%%mm4\n" // mm4 = e|f|g|h
- 
- 	// pré charger le buffer dst dans mm7
--"	movq (%%edi),%%mm7\n" // mm7 = dst[0]"
-+"      movq (%0),%%mm7\n" // mm7 = dst[0]"
- 
- 	// multiplier par le volume
- "	pmullw %%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v)
-@@ -69,11 +67,11 @@ void SDL_MixAudio_MMX_S16(char* dst,char
- "	punpcklwd %%mm5,%%mm6\n" // mm6 = g*v|h*v
- 
- 	// pré charger le buffer dst dans mm5
--"	movq 8(%%edi),%%mm5\n" // mm5 = dst[1]
-+"      movq 8(%0),%%mm5\n" // mm5 = dst[1]
- 
- 	// diviser par 128
- "	psrad $7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME
--"	addl $16,%%esi\n"
-+"      add $16,%1\n"
- 
- "	psrad $7,%%mm3\n" // mm3 = c*v/128|d*v/128
- 
-@@ -87,15 +85,15 @@ void SDL_MixAudio_MMX_S16(char* dst,char
- 
- 	// mm4 = le sample avec le volume modifié
- "	packssdw %%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v)
--"	movq %%mm3,(%%edi)\n"
-+"      movq %%mm3,(%0)\n"
- 
- "	paddsw %%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst
- 
--"	movq %%mm6,8(%%edi)\n"
-+"      movq %%mm6,8(%0)\n"
- 
--"	addl $16,%%edi\n"
-+"      add $16,%0\n"
- 
--"	dec %%ebx\n"
-+"      dec %%edx\n"
- 
- "	jnz .mixloopS16\n"
- 
-@@ -103,9 +101,9 @@ void SDL_MixAudio_MMX_S16(char* dst,char
- 
- ".endS16:\n"
- 	 :
--	 : "m" (dst), "m"(src),"m"(size),
-+        : "r" (dst), "r"(src),"m"(size),
- 	 "m"(volume)
--	 : "eax","ebx", "esi", "edi","memory"
-+        : "eax","edx","memory"
- 	 );
- }
- 
-@@ -119,11 +117,9 @@ void SDL_MixAudio_MMX_S8(char* dst,char*
- {
-     __asm__ __volatile__ (
- 
--"	movl %0,%%edi\n"	// edi = dst
--"	movl %1,%%esi\n"	// esi = src
- "	movl %3,%%eax\n"	// eax = volume
- 
--"	movd %%ebx,%%mm0\n"
-+"      movd %%edx,%%mm0\n"
- "	movq %%mm0,%%mm1\n"
- "	psllq $16,%%mm0\n"
- "	por %%mm1,%%mm0\n"
-@@ -132,17 +128,17 @@ void SDL_MixAudio_MMX_S8(char* dst,char*
- "	psllq $16,%%mm0\n"
- "	por %%mm1,%%mm0\n"
- 
--"	movl %2,%%ebx\n"	// ebx = size
--"	shr $3,%%ebx\n"	// process 8 bytes per iteration = 8 samples
-+"      movl %2,%%edx\n"        // edx = size
-+"      shr $3,%%edx\n" // process 8 bytes per iteration = 8 samples
- 
--"	cmp $0,%%ebx\n"
-+"      cmp $0,%%edx\n"
- "	je .endS8\n"
- 
- ".align 16\n"
- "	.mixloopS8:\n"
- 
- "	pxor %%mm2,%%mm2\n"		// mm2 = 0
--"	movq (%%esi),%%mm1\n"	// mm1 = a|b|c|d|e|f|g|h
-+"      movq (%1),%%mm1\n"      // mm1 = a|b|c|d|e|f|g|h
- 
- "	movq %%mm1,%%mm3\n" 	// mm3 = a|b|c|d|e|f|g|h
- 
-@@ -152,10 +148,10 @@ void SDL_MixAudio_MMX_S8(char* dst,char*
- "	punpckhbw %%mm2,%%mm1\n"	// mm1 = 0|a|0|b|0|c|0|d
- 
- "	punpcklbw %%mm2,%%mm3\n"	// mm3 = 0|e|0|f|0|g|0|h
--"	movq (%%edi),%%mm2\n"	// mm2 = destination
-+"      movq (%0),%%mm2\n"      // mm2 = destination
- 
- "	pmullw %%mm0,%%mm1\n"	// mm1 = v*a|v*b|v*c|v*d
--"	addl $8,%%esi\n"
-+"      add $8,%1\n"
- 
- "	pmullw %%mm0,%%mm3\n"	// mm3 = v*e|v*f|v*g|v*h
- "	psraw $7,%%mm1\n"		// mm1 = v*a/128|v*b/128|v*c/128|v*d/128 
-@@ -166,19 +162,19 @@ void SDL_MixAudio_MMX_S8(char* dst,char*
- 
- "	paddsb %%mm2,%%mm3\n"	// add to destination buffer
- 
--"	movq %%mm3,(%%edi)\n"	// store back to ram
--"	addl $8,%%edi\n"
-+"      movq %%mm3,(%0)\n"      // store back to ram
-+"      add $8,%0\n"
- 
--"	dec %%ebx\n"
-+"      dec %%edx\n"
- 
- "	jnz .mixloopS8\n"
- 
- ".endS8:\n"
- "	emms\n"
- 	 :
--	 : "m" (dst), "m"(src),"m"(size),
-+        : "r" (dst), "r"(src),"m"(size),
- 	 "m"(volume)
--	 : "eax","ebx", "esi", "edi","memory"
-+        : "eax","edx","memory"
- 	 );
- }
- #endif
diff --git a/devel/SDL/patches/patch-au b/devel/SDL/patches/patch-au
deleted file mode 100644
index f22651040e4..00000000000
--- a/devel/SDL/patches/patch-au
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/07/09 18:19:09 drochner Exp $
-
---- src/cpuinfo/SDL_cpuinfo.c.orig	2004-02-10 08:31:35.000000000 -0700
-+++ src/cpuinfo/SDL_cpuinfo.c
-@@ -81,6 +81,26 @@ static __inline__ int CPU_haveCPUID()
- 	:
- 	: "%eax", "%ecx"
- 	);
-+#elif defined(__GNUC__) && defined(__x86_64__)
-+/* Technically, if this is being compiled under __x86_64__ then it has
-+CPUid by definition.  But it's nice to be able to prove it.  :)      */
-+        __asm__ (
-+"        pushfq                      # Get original EFLAGS             \n"
-+"        popq    %%rax                                                 \n"
-+"        movq    %%rax,%%rcx                                           \n"
-+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
-+"        pushq   %%rax               # Save new EFLAGS value on stack  \n"
-+"        popfq                       # Replace current EFLAGS value    \n"
-+"        pushfq                      # Get new EFLAGS                  \n"
-+"        popq    %%rax               # Store new EFLAGS in EAX         \n"
-+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
-+"        jz      1f                  # Processor=80486                 \n"
-+"        movl    $1,%0               # We have CPUID support           \n"
-+"1:                                                                    \n"
-+        : "=m" (has_CPUID)
-+        :
-+        : "%rax", "%rcx"
-+        );
- #elif defined(_MSC_VER)
- 	__asm {
-         pushfd                      ; Get original EFLAGS
-@@ -103,7 +123,7 @@ done:
- static __inline__ int CPU_getCPUIDFeatures()
- {
- 	int features = 0;
--#if defined(__GNUC__) && defined(i386)
-+#if defined(__GNUC__) && ( defined(i386) || defined(__x86_64__) )
- 	__asm__ (
- "        movl    %%ebx,%%edi\n"
- "        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
-@@ -118,7 +138,7 @@ static __inline__ int CPU_getCPUIDFeatur
- "        movl    %%edi,%%ebx\n"
- 	: "=m" (features)
- 	:
--	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-+        : "%eax", "%ecx", "%edx", "%edi"
- 	);
- #elif defined(_MSC_VER)
- 	__asm {
-@@ -139,7 +159,7 @@ done:
- static __inline__ int CPU_getCPUIDFeaturesExt()
- {
- 	int features = 0;
--#if defined(__GNUC__) && defined(i386)
-+#if defined(__GNUC__) && (defined(i386) || defined (__x86_64__) )
- 	__asm__ (
- "        movl    %%ebx,%%edi\n"
- "        movl    $0x80000000,%%eax   # Query for extended functions    \n"
-@@ -153,7 +173,7 @@ static __inline__ int CPU_getCPUIDFeatur
- "        movl    %%edi,%%ebx\n"
- 	: "=m" (features)
- 	:
--	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-+        : "%eax", "%ecx", "%edx", "%edi"
- 	);
- #elif defined(_MSC_VER)
- 	__asm {
diff --git a/devel/SDL/patches/patch-av b/devel/SDL/patches/patch-av
deleted file mode 100644
index 05950ad39cc..00000000000
--- a/devel/SDL/patches/patch-av
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/07/09 18:19:09 drochner Exp $
-
---- src/video/SDL_yuv_mmx.c.orig	2004-06-30 20:19:04.000000000 +0200
-+++ src/video/SDL_yuv_mmx.c
-@@ -239,7 +239,6 @@ void ColorRGBDitherYV12MMX1X( int *color
- 		 :
- 		 : "m" (cr), "r"(cb),"r"(lum),
- 		 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
--		 : "%ebx"
- 		 );
- }
- 
-@@ -414,7 +413,6 @@ void Color565DitherYV12MMX1X( int *color
-          :
-          :"m" (cr), "r"(cb),"r"(lum),
- 	 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
--	 : "%ebx"
-          );
- }
- 
diff --git a/devel/SDL/patches/patch-aw b/devel/SDL/patches/patch-aw
deleted file mode 100644
index eaa251723d6..00000000000
--- a/devel/SDL/patches/patch-aw
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/07/19 10:48:46 wiz Exp $
-
---- src/audio/dmedia/SDL_irixaudio.c.orig	2003-08-30 21:13:02.000000000 +0200
-+++ src/audio/dmedia/SDL_irixaudio.c
-@@ -28,6 +28,7 @@ static char rcsid =
- #endif
- 
- /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */
-+/* patch for IRIX 5 by Georg Schwarz 18/07/2004 */
- 
- #include <stdlib.h>
- 
-@@ -39,6 +40,21 @@ static char rcsid =
- #include "SDL_irixaudio.h"
- 
- 
-+#ifdef AL_RESOURCE /* as a test whether we use the "new" IRIX
-+                       audio libraries */
-+#define NEW_IRIX_AUDIO
-+#else
-+#define alClosePort(x) ALcloseport(x)
-+#define alFreeConfig(x) ALfreeconfig(x)
-+#define alGetFillable(x) ALgetfillable(x)
-+#define alNewConfig() ALnewconfig()
-+#define alOpenPort(x,y,z) ALopenport(x,y,z)
-+#define alSetChannels(x,y) ALsetchannels(x,y)
-+#define alSetQueueSize(x,y) ALsetqueuesize(x,y)
-+#define alSetSampFmt(x,y) ALsetsampfmt(x,y)
-+#define alSetWidth(x,y) ALsetwidth(x,y)
-+#endif
-+
- /* Audio driver functions */
- static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec);
- static void AL_WaitAudio(_THIS);
-@@ -137,7 +153,11 @@ static void AL_CloseAudio(_THIS)
- static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec)
- {
- 	ALconfig audio_config;
-+#ifdef NEW_IRIX_AUDIO
- 	ALpv audio_param;
-+#else
-+	long audio_param[2];
-+#endif
- 	int width;
- 
- 	/* Determine the audio parameters from the AudioSpec */
-@@ -165,9 +185,16 @@ static int AL_OpenAudio(_THIS, SDL_Audio
- 	SDL_CalculateAudioSpec(spec);
- 
- 	/* Set output frequency */
-+#ifdef NEW_IRIX_AUDIO
- 	audio_param.param = AL_RATE;
- 	audio_param.value.i = spec->freq;
--	if( alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0 ) {
-+	if( alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0 )
-+#else
-+	audio_param[0] = AL_OUTPUT_RATE;
-+	audio_param[1] = spec->freq;
-+	if( ALsetparams(AL_DEFAULT_DEVICE, audio_param, 2) < 0 )
-+#endif
-+	{
- 		SDL_SetError("alSetParams failed");
- 		return(-1);
- 	}
diff --git a/devel/SDL/patches/patch-ba b/devel/SDL/patches/patch-ba
index 3bcc2e58be5..5f24555043e 100644
--- a/devel/SDL/patches/patch-ba
+++ b/devel/SDL/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $
+$NetBSD: patch-ba,v 1.3 2005/01/05 12:05:19 adam Exp $
 
---- src/audio/SDL_audio.c.orig	2002-10-05 18:50:56.000000000 +0200
+--- src/audio/SDL_audio.c.orig	2004-12-13 07:54:31.000000000 +0000
 +++ src/audio/SDL_audio.c
 @@ -38,8 +38,15 @@ static char rcsid =
  #include "SDL_audiomem.h"
@@ -18,7 +18,7 @@ $NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $
  #ifdef OPENBSD_AUDIO_SUPPORT
  	&OPENBSD_AUDIO_bootstrap,
  #endif
-@@ -56,15 +63,6 @@ static AudioBootStrap *bootstrap[] = {
+@@ -59,15 +66,6 @@ static AudioBootStrap *bootstrap[] = {
  #ifdef DMEDIA_SUPPORT
  	&DMEDIA_bootstrap,
  #endif
@@ -34,7 +34,7 @@ $NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $
  #ifdef ENABLE_DIRECTX
  	&DSOUND_bootstrap,
  #endif
-@@ -252,16 +250,48 @@ static void SDL_UnlockAudio_Default(SDL_
+@@ -268,16 +266,48 @@ static void SDL_UnlockAudio_Default(SDL_
  	SDL_mutexV(audio->mixer_lock);
  }
  
@@ -84,7 +84,7 @@ $NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $
  	/* Select the proper audio driver */
  	audio = NULL;
  	idx = 0;
-@@ -271,7 +301,7 @@ int SDL_AudioInit(const char *driver_nam
+@@ -287,7 +317,7 @@ int SDL_AudioInit(const char *driver_nam
  		   to use ESD, but don't start it if it's not already running.
  		   This probably isn't the place to do this, but... Shh! :)
  		 */
@@ -93,7 +93,7 @@ $NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $
  			if ( strcmp(bootstrap[i]->name, "esd") == 0 ) {
  				const char *esd_no_spawn;
  
-@@ -300,7 +330,7 @@ int SDL_AudioInit(const char *driver_nam
+@@ -316,7 +346,7 @@ int SDL_AudioInit(const char *driver_nam
  				idx = atoi(strrchr(driver_name, ':')+1);
  			}
  #endif
@@ -102,7 +102,7 @@ $NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $
  				if (strncmp(bootstrap[i]->name, driver_name,
  				            strlen(bootstrap[i]->name)) == 0) {
  					if ( bootstrap[i]->available() ) {
-@@ -310,7 +340,7 @@ int SDL_AudioInit(const char *driver_nam
+@@ -326,7 +356,7 @@ int SDL_AudioInit(const char *driver_nam
  				}
  			}
  		} else {
diff --git a/devel/SDL/patches/patch-bb b/devel/SDL/patches/patch-bb
index 1bb78e54a24..db3e9799f7c 100644
--- a/devel/SDL/patches/patch-bb
+++ b/devel/SDL/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.2 2004/04/17 00:15:21 snj Exp $
+$NetBSD: patch-bb,v 1.3 2005/01/05 12:05:19 adam Exp $
 
---- src/audio/esd/Makefile.in.orig	2004-02-22 13:32:08.000000000 -0800
-+++ src/audio/esd/Makefile.in	2004-04-10 14:54:04.000000000 -0700
+--- src/audio/esd/Makefile.in.orig	2004-12-13 09:03:15.000000000 +0000
++++ src/audio/esd/Makefile.in
 @@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES =
@@ -10,7 +10,7 @@ $NetBSD: patch-bb,v 1.2 2004/04/17 00:15:21 snj Exp $
  libaudio_esd_la_LIBADD =
  am__objects_1 = SDL_esdaudio.lo
  am_libaudio_esd_la_OBJECTS = $(am__objects_1)
-@@ -317,7 +318,7 @@ clean-noinstLTLIBRARIES:
+@@ -321,7 +322,7 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libaudio_esd.la: $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_DEPENDENCIES) 
diff --git a/devel/SDL/patches/patch-bc b/devel/SDL/patches/patch-bc
index adae79e469d..d8e6d01ea02 100644
--- a/devel/SDL/patches/patch-bc
+++ b/devel/SDL/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.2 2004/04/17 00:15:21 snj Exp $
+$NetBSD: patch-bc,v 1.3 2005/01/05 12:05:19 adam Exp $
 
---- src/audio/arts/Makefile.in.orig	2004-02-22 13:32:05.000000000 -0800
-+++ src/audio/arts/Makefile.in	2004-04-10 14:55:41.000000000 -0700
+--- src/audio/arts/Makefile.in.orig	2004-12-13 09:03:08.000000000 +0000
++++ src/audio/arts/Makefile.in
 @@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES =
@@ -10,7 +10,7 @@ $NetBSD: patch-bc,v 1.2 2004/04/17 00:15:21 snj Exp $
  libaudio_arts_la_LIBADD =
  am__objects_1 = SDL_artsaudio.lo
  am_libaudio_arts_la_OBJECTS = $(am__objects_1)
-@@ -317,7 +318,7 @@ clean-noinstLTLIBRARIES:
+@@ -321,7 +322,7 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libaudio_arts.la: $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_DEPENDENCIES) 
diff --git a/devel/SDL/patches/patch-bd b/devel/SDL/patches/patch-bd
index ed6e37fac9e..9c20b33ad27 100644
--- a/devel/SDL/patches/patch-bd
+++ b/devel/SDL/patches/patch-bd
@@ -1,7 +1,7 @@
-$NetBSD: patch-bd,v 1.2 2004/04/17 00:15:21 snj Exp $
+$NetBSD: patch-bd,v 1.3 2005/01/05 12:05:19 adam Exp $
 
---- src/audio/nas/Makefile.in.orig	2004-02-22 13:32:09.000000000 -0800
-+++ src/audio/nas/Makefile.in	2004-04-10 14:57:22.000000000 -0700
+--- src/audio/nas/Makefile.in.orig	2004-12-13 09:03:21.000000000 +0000
++++ src/audio/nas/Makefile.in
 @@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES =
@@ -10,7 +10,7 @@ $NetBSD: patch-bd,v 1.2 2004/04/17 00:15:21 snj Exp $
  libaudio_nas_la_LIBADD =
  am__objects_1 = SDL_nasaudio.lo
  am_libaudio_nas_la_OBJECTS = $(am__objects_1)
-@@ -317,7 +318,7 @@ clean-noinstLTLIBRARIES:
+@@ -321,7 +322,7 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES)