summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/SDL/Makefile76
-rw-r--r--devel/SDL/Makefile.common78
-rw-r--r--devel/SDL/PLIST12
-rw-r--r--devel/SDL/buildlink3.mk6
-rw-r--r--devel/SDL/distinfo26
-rw-r--r--devel/SDL/options.mk28
-rw-r--r--devel/SDL/patches/patch-aa127
-rw-r--r--devel/SDL/patches/patch-ac13
-rw-r--r--devel/SDL/patches/patch-ad22
-rw-r--r--devel/SDL/patches/patch-aj229
-rw-r--r--devel/SDL/patches/patch-al112
-rw-r--r--devel/SDL/patches/patch-am950
-rw-r--r--devel/SDL/patches/patch-ar12
-rw-r--r--devel/SDL/patches/patch-as12
-rw-r--r--devel/SDL/patches/patch-ba113
-rw-r--r--devel/SDL/patches/patch-bb21
-rw-r--r--devel/SDL/patches/patch-bc21
-rw-r--r--devel/SDL/patches/patch-bd21
-rw-r--r--devel/SDL/patches/patch-da13
-rw-r--r--devel/SDL/patches/patch-db13
-rw-r--r--devel/SDL/patches/patch-dc40
-rw-r--r--devel/SDL/patches/patch-dd13
22 files changed, 147 insertions, 1811 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 673f986a46c..22328234cfc 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,77 @@
-# $NetBSD: Makefile,v 1.63 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: Makefile,v 1.64 2006/06/12 16:20:44 wiz Exp $
-PKGREVISION= 2
+DISTNAME= SDL-1.2.10
+CATEGORIES= devel games
+MASTER_SITES= http://www.libsdl.org/release/
+
+MAINTAINER= wiz@NetBSD.org
+HOMEPAGE= http://www.libsdl.org/
+COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library
+
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+PTHREAD_OPTS+= require
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "Makefile.common"
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+. include "../../devel/binutils/buildlink3.mk"
+BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
+NASMFLAGS_ELF= -f elf
+NASMFLAGS_a.out= -f aoutb
+.endif
+
+CONFIGURE_ARGS+= --enable-dlopen
+CONFIGURE_ARGS+= --enable-video-aalib
+CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
+MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
+
+# Pass in LDFLAGS via SYSTEM_LIBS as it's used as the linker options for
+# finding various libraries. This ensure that any unusual -Wl,-R options
+# are noted correctly in the generated sdl-config.
+#
+CONFIGURE_ENV+= SYSTEM_LIBS=${LDFLAGS:M*:Q}
+
+# buildlink passthru the directories required for the Cocoa framework
+# on Darwin if they exist.
+.if ${OPSYS} == "Darwin"
+COCOA_DIRS+= /System /Library /Developer
+. for dir in ${COCOA_DIRS}
+. if exists(${dir})
+BUILDLINK_PASSTHRU_DIRS+= ${dir}
+. endif
+. endfor
+
+# XXX: still necessary after 1.2.10 update?
+SUBST_CLASSES+= links
+SUBST_MESSAGE.links= Fixing linking command.
+SUBST_STAGE.links= pre-configure
+SUBST_FILES.links= src/Makefile.in
+SUBST_SED.links= -e 's,tag=CC --mode=link,tag=CXX --mode=link,g'
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
+MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
+
+# Irix comes with GL, which works fine for SDL
+.if ${OPSYS} != "IRIX"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.endif
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
+# Let SDL know that we do not have native pthreads and are using GNU pth.
+CONFIGURE_ARGS+= --disable-pthreads
+CONFIGURE_ARGS+= --enable-pth
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
deleted file mode 100644
index 90f9f957993..00000000000
--- a/devel/SDL/Makefile.common
+++ /dev/null
@@ -1,78 +0,0 @@
-# $NetBSD: Makefile.common,v 1.29 2006/04/11 22:11:31 minskim Exp $
-
-DISTNAME= SDL-1.2.9
-CATEGORIES= devel games
-MASTER_SITES= http://www.libsdl.org/release/
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://www.libsdl.org/
-COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library
-
-DISTINFO_FILE= ${.CURDIR}/../../devel/SDL/distinfo
-PATCHDIR= ${.CURDIR}/../../devel/SDL/patches
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-PTHREAD_OPTS+= require
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-. include "../../devel/binutils/buildlink3.mk"
-BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-NASMFLAGS_ELF= -f elf
-NASMFLAGS_a.out= -f aoutb
-.endif
-
-CONFIGURE_ARGS+= --enable-dlopen
-CONFIGURE_ARGS+= --disable-arts
-CONFIGURE_ARGS+= --disable-esd
-CONFIGURE_ARGS+= --disable-nas
-
-CONFIGURE_ARGS+= --enable-video-aalib
-CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
-MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
-
-# Pass in LDFLAGS via SYSTEM_LIBS as it's used as the linker options for
-# finding various libraries. This ensure that any unusual -Wl,-R options
-# are noted correctly in the generated sdl-config.
-#
-CONFIGURE_ENV+= SYSTEM_LIBS=${LDFLAGS:M*:Q}
-
-# buildlink passthru the directories required for the Cocoa framework
-# on Darwin if they exist.
-.if ${OPSYS} == "Darwin"
-COCOA_DIRS+= /System /Library /Developer
-. for dir in ${COCOA_DIRS}
-. if exists(${dir})
-BUILDLINK_PASSTHRU_DIRS+= ${dir}
-. endif
-. endfor
-
-SUBST_CLASSES+= links
-SUBST_MESSAGE.links= Fixing linking command.
-SUBST_STAGE.links= pre-configure
-SUBST_FILES.links= src/Makefile.in
-SUBST_SED.links= -e 's,tag=CC --mode=link,tag=CXX --mode=link,g'
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-
-AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
-MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
-
-# Irix comes with GL, which works fine for SDL
-.if ${OPSYS} != "IRIX"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.endif
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
-# Let SDL know that we do not have native pthreads and are using GNU pth.
-CONFIGURE_ARGS+= --disable-pthreads
-CONFIGURE_ARGS+= --enable-pth
-.endif
diff --git a/devel/SDL/PLIST b/devel/SDL/PLIST
index a8fd9491141..30034e7d4f6 100644
--- a/devel/SDL/PLIST
+++ b/devel/SDL/PLIST
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/12 16:20:44 wiz Exp $
bin/sdl-config
include/SDL/SDL.h
include/SDL/SDL_active.h
include/SDL/SDL_audio.h
include/SDL/SDL_byteorder.h
include/SDL/SDL_cdrom.h
+include/SDL/SDL_config.h
+include/SDL/SDL_config_amiga.h
+include/SDL/SDL_config_dreamcast.h
+include/SDL/SDL_config_macos.h
+include/SDL/SDL_config_macosx.h
+include/SDL/SDL_config_minimal.h
+include/SDL/SDL_config_os2.h
+include/SDL/SDL_config_win32.h
include/SDL/SDL_copying.h
include/SDL/SDL_cpuinfo.h
include/SDL/SDL_endian.h
@@ -20,8 +28,10 @@ include/SDL/SDL_mouse.h
include/SDL/SDL_mutex.h
include/SDL/SDL_name.h
include/SDL/SDL_opengl.h
+include/SDL/SDL_platform.h
include/SDL/SDL_quit.h
include/SDL/SDL_rwops.h
+include/SDL/SDL_stdinc.h
include/SDL/SDL_syswm.h
include/SDL/SDL_thread.h
include/SDL/SDL_timer.h
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index c60c3722f25..ba315fbb926 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:21:43 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/06/12 16:20:44 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL}
BUILDLINK_PACKAGES+= SDL
.if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5
-BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.9nb2
+BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5
+BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.10
BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
.endif # SDL_BUILDLINK3_MK
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 8db33be2a79..cb5830988ce 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,21 +1,7 @@
-$NetBSD: distinfo,v 1.42 2006/02/07 18:15:50 wiz Exp $
+$NetBSD: distinfo,v 1.43 2006/06/12 16:20:44 wiz Exp $
-SHA1 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
-RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
-Size (SDL-1.2.9.tar.gz) = 2688179 bytes
-SHA1 (patch-aa) = f41d0de165d41826a6de2fdf9521d4f41f97221a
-SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
-SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
-SHA1 (patch-aj) = 53dad2397355cb0282e449f794f84f5b4a0c3f3d
-SHA1 (patch-al) = a427d5b5a4e18a37d241142df575a71db2483a1e
-SHA1 (patch-am) = a4732f0563fe9bcc3c5329cf794ddf4a717bd5e4
-SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
-SHA1 (patch-as) = c099a77a9643621322fea1d5cf079abcab80a071
-SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
-SHA1 (patch-bb) = ebf35acf99240be873c64fcac07570e61f50b83e
-SHA1 (patch-bc) = f1eb12c2f9049af6a65bba9fe215ef3dc165fd83
-SHA1 (patch-bd) = cbfd61c48f95094f54a098b9ee921dfe0da96589
-SHA1 (patch-da) = 9a38b1e2fcc0eb4c499c52402e70083f30e7ec96
-SHA1 (patch-db) = 4543d1fe47fa068bcda83eb53d495e0c6085b371
-SHA1 (patch-dc) = 7d0bc4a78ad1a589cb797094e39e3099e2414e99
-SHA1 (patch-dd) = a80c43d5cab4cc83c98dae7449219f68e1dbea88
+SHA1 (SDL-1.2.10.tar.gz) = ad64b3b58b3cf83a28a1c21bedf270da43118f67
+RMD160 (SDL-1.2.10.tar.gz) = e2e73a580638ab29d4b000152ed80999545e9fb5
+Size (SDL-1.2.10.tar.gz) = 2792344 bytes
+SHA1 (patch-aj) = 21b77004d782b5da7973e8ccb8bdd686efca1684
+SHA1 (patch-am) = 0a99757ca6dbed3f46c6ed2a04a3e65d81f92b3b
diff --git a/devel/SDL/options.mk b/devel/SDL/options.mk
new file mode 100644
index 00000000000..e98953465a5
--- /dev/null
+++ b/devel/SDL/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2006/06/12 16:20:44 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.SDL
+PKG_SUPPORTED_OPTIONS= arts esound nas
+PKG_SUGGESTED_OPTIONS= arts esound nas
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Marts)
+CONFIGURE_ARGS+= --enable-arts
+.include "../../audio/arts/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-arts
+.endif
+
+.if !empty(PKG_OPTIONS:Mesound)
+CONFIGURE_ARGS+= --enable-esd
+.include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-esd
+.endif
+
+.if !empty(PKG_OPTIONS:Mnas)
+CONFIGURE_ARGS+= --enable-nas
+.include "../../audio/nas/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-nas
+.endif
diff --git a/devel/SDL/patches/patch-aa b/devel/SDL/patches/patch-aa
deleted file mode 100644
index 4d9edc10f07..00000000000
--- a/devel/SDL/patches/patch-aa
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2005/05/31 17:37:50 wiz Exp $
-
---- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-12-13 08:54:32.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -44,8 +44,13 @@ static char rcsid =
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
-+#ifdef __DragonFly__
-+#include <bus/usb/usb.h>
-+#include <bus/usb/usbhid.h>
-+#else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+#endif
-
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
-@@ -55,12 +60,14 @@ static char rcsid =
- #include <libusbhid.h>
- #endif
-
--#ifdef __FreeBSD__
-+#ifdef __DragonFly__
-+#include <sys/joystick.h>
-+#elif defined(__FreeBSD__)
- #include <osreldate.h>
- #include <sys/joystick.h>
- #endif
-
--#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__)
- #include <machine/joystick.h>
- #endif
-
-@@ -239,6 +246,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
- struct hid_data *hdata;
- struct report *rep;
- int fd;
-+ int i;
-
- fd = open(path, O_RDONLY);
- if (fd == -1) {
-@@ -303,6 +311,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
- joy->nbuttons = 0;
- joy->nhats = 0;
- joy->nballs = 0;
-+ for (i=0; i<JOYAXE_count; i++)
-+ hw->axis_map[i] = -1;
-
- while (hid_get_item(hdata, &hitem) > 0) {
- char *sp;
-@@ -329,8 +339,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
- unsigned usage = HID_USAGE(hitem.usage);
- int joyaxe = usage_to_joyaxe(usage);
- if (joyaxe >= 0) {
-- hw->axis_map[joyaxe] = joy->naxes;
-- joy->naxes++;
-+ hw->axis_map[joyaxe] = 1;
- } else if (usage == HUG_HAT_SWITCH) {
- joy->nhats++;
- }
-@@ -348,6 +357,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
- }
- }
- hid_end_parse(hdata);
-+ for (i=0; i<JOYAXE_count; i++)
-+ if (hw->axis_map[i] > 0)
-+ hw->axis_map[i] = joy->naxes++;
-
- usbend:
- /* The poll blocks the event thread. */
-@@ -370,7 +382,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
- int nbutton, naxe = -1;
- Sint32 v;
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__) || defined(__DragonFly__)
- struct joystick gameport;
- static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
-
-@@ -419,7 +431,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
- }
- return;
- }
--#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
-+#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)*/
-
- rep = &joy->hwdata->inreport;
-
-@@ -457,7 +469,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
- } else if (usage == HUG_HAT_SWITCH) {
- v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
- &hitem);
-- SDL_PrivateJoystickHat(joy, 0, hatval_to_sdl(v));
-+ SDL_PrivateJoystickHat(joy, 0,
-+ hatval_to_sdl(v)-hitem.logical_minimum);
- }
- break;
- }
-@@ -518,7 +531,9 @@ report_alloc(struct report *r, struct re
- {
- int len;
-
--#ifdef __FreeBSD__
-+#ifdef __DragonFly__
-+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
-+#elif defined(__FreeBSD__)
- # if (__FreeBSD_version >= 460000)
- # if (__FreeBSD_version <= 500111)
- len = hid_report_size(rd, r->rid, repinfo[repind].kind);
-@@ -527,12 +542,12 @@ report_alloc(struct report *r, struct re
- # endif
- # else
- len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
--#endif
-+# endif
- #else
- # ifdef USBHID_NEW
-- len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
--# else
- len = hid_report_size(rd, repinfo[repind].kind, r->rid);
-+# else
-+ len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
- # endif
- #endif
-
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
deleted file mode 100644
index 1565da70a5f..00000000000
--- a/devel/SDL/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2005/01/12 22:58:19 kristerw Exp $
-
---- src/video/SDL_yuv_mmx.c.orig Wed Jan 12 23:20:48 2005
-+++ src/video/SDL_yuv_mmx.c Wed Jan 12 23:22:43 2005
-@@ -26,7 +26,7 @@
- #endif
-
-
--#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
-+#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT)
-
- #include "SDL_types.h"
-
diff --git a/devel/SDL/patches/patch-ad b/devel/SDL/patches/patch-ad
deleted file mode 100644
index 5854b29ed54..00000000000
--- a/devel/SDL/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2005/01/12 22:58:19 kristerw Exp $
-
---- src/video/SDL_yuv_sw.c.orig Wed Feb 18 18:22:04 2004
-+++ src/video/SDL_yuv_sw.c Wed Jan 12 23:43:27 2005
-@@ -1067,7 +1067,7 @@
- case SDL_YV12_OVERLAY:
- case SDL_IYUV_OVERLAY:
- if ( display->format->BytesPerPixel == 2 ) {
--#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
-+#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT)
- /* inline assembly functions */
- if ( SDL_HasMMX() && (Rmask == 0xF800) &&
- (Gmask == 0x07E0) &&
-@@ -1089,7 +1089,7 @@
- swdata->Display2X = Color24DitherYV12Mod2X;
- }
- if ( display->format->BytesPerPixel == 4 ) {
--#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
-+#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT)
- /* inline assembly functions */
- if ( SDL_HasMMX() && (Rmask == 0x00FF0000) &&
- (Gmask == 0x0000FF00) &&
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index c5a3046fb35..3d49a969cd6 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,154 +1,31 @@
-$NetBSD: patch-aj,v 1.24 2006/02/07 18:15:50 wiz Exp $
+$NetBSD: patch-aj,v 1.25 2006/06/12 16:20:44 wiz Exp $
---- configure.in.orig 2005-08-28 06:31:18.000000000 +0000
+--- configure.in.orig 2006-05-17 03:16:07.000000000 +0000
+++ configure.in
-@@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
-
- # libtool versioning
- LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
--LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
--LT_REVISION=$SDL_INTERFACE_AGE
--LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
-+LT_CURRENT=$SDL_INTERFACE_AGE
-+LT_REVISION=$SDL_BINARY_AGE
-+LT_AGE=0
-
- AC_SUBST(LT_RELEASE)
- AC_SUBST(LT_CURRENT)
-@@ -267,6 +267,8 @@ CheckOSS()
- AC_MSG_RESULT($have_oss)
- if test x$have_oss = xyes; then
- CFLAGS="$CFLAGS -DOSS_SUPPORT"
-+ LDFLAGS="$LDFLAGS $LIBOSSAUDIO"
-+ SDL_LIBS="$SDL_LIBS $LIBOSSAUDIO"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
- AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -456,9 +458,9 @@ CheckNAS()
+@@ -512,10 +512,10 @@ AC_HELP_STRING([--enable-nas], [support
if test x$enable_audio = xyes -a x$enable_nas = xyes; then
AC_MSG_CHECKING(for NAS audio support)
have_nas=no
- if test -r /usr/X11R6/include/audio/audiolib.h; then
+ if true; then
have_nas=yes
-- CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/"
-+ CFLAGS="$CFLAGS -DNAS_SUPPORT"
- SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
- AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-@@ -539,7 +541,7 @@ CheckNASM()
- NASMFLAGS="-f aoutb"
- ;;
- *)
-- NASMFLAGS="-f elf"
-+ test -n "$NASMFLAGS" || NASMFLAGS="-f elf"
- ;;
- esac
- AC_SUBST(NASMFLAGS)
-@@ -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
-- AC_PATH_PROG(PTH_CONFIG, pth-config, no)
-- if test "$PTH_CONFIG" = "no"; then
-+ # Use the libpthread version of the pth library.
-+ AC_PATH_PROG(PTHREAD_CONFIG, pthread-config, no)
-+ if test "$PTHREAD_CONFIG" = "no"; then
- use_pth=no
- else
-- PTH_CFLAGS=`$PTH_CONFIG --cflags`
-- PTH_LIBS=`$PTH_CONFIG --libs --all`
-+ PTH_CFLAGS=`$PTHREAD_CONFIG --cflags`
-+ PTH_LIBS=`$PTHREAD_CONFIG --libs --all`
- SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
- SDL_LIBS="$SDL_LIBS $PTH_LIBS"
- CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1247,9 +1250,13 @@ CheckPTHREAD()
- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
- pthread_lib="-pthread"
+- NAS_CFLAGS="-I/usr/X11R6/include/"
+- NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
++ NAS_CFLAGS=""
++ NAS_LIBS="-laudio -lXt"
+
+ dnl On IRIX, the NAS includes are in a different directory,
+ dnl and libnas must be explicitly linked in
+@@ -1642,7 +1642,7 @@ AC_HELP_STRING([--enable-pthread-sem], [
;;
-+ *-*-dragonfly*)
-+ pthread_cflags="-D_REENTRANT"
-+ pthread_lib="-pthread"
-+ ;;
*-*-netbsd*)
-- pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
-- pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
-+ pthread_cflags="-D_REENTRANT"
+ pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+- pthread_lib="-L/usr/lib -lpthread"
+ pthread_lib="-lpthread"
;;
*-*-openbsd*)
pthread_cflags="-D_REENTRANT"
-@@ -1723,29 +1730,31 @@ CheckUSBHID()
- have_libusbhid=no
- have_libusb=no
- AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
-- AC_CHECK_LIB(usb, hid_init, have_libusb=yes)
- if test x$have_libusbhid = xyes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-+
-+ AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes)
-+ AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes)
-+ if test x$have_usbhid_h = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_USBHID_H"
-+ fi
-+ if test x$have_libusbhid_h = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
- fi
-+ else
-+ AC_CHECK_LIB(usb, hid_init, have_libusb=yes)
- if test x$have_libusb = xyes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
-- fi
-
- AC_CHECK_HEADER(usb.h, have_usb_h=yes)
-- AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes)
- AC_CHECK_HEADER(libusb.h, have_libusb_h=yes)
-- AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes)
- if test x$have_usb_h = xyes; then
- CFLAGS="$CFLAGS -DHAVE_USB_H"
- fi
-- if test x$have_usbhid_h = xyes; then
-- CFLAGS="$CFLAGS -DHAVE_USBHID_H"
-- fi
- if test x$have_libusb_h = xyes; then
- CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
- fi
-- if test x$have_libusbhid_h = xyes; then
-- CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
-+ fi
- fi
-
- AC_MSG_CHECKING(for usbhid)
-@@ -1755,8 +1764,13 @@ CheckUSBHID()
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
-+ #ifdef __DragonFly__
-+ #include <bus/usb/usb.h>
-+ #include <bus/usb/usbhid.h>
-+ #else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+ #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
-@@ -1781,8 +1795,13 @@ CheckUSBHID()
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
-+ #ifdef __DragonFly__
-+ #include <bus/usb/usb.h>
-+ #include <bus/usb/usbhid.h>
-+ #else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+ #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
-@@ -1808,8 +1827,13 @@ CheckUSBHID()
+@@ -1985,8 +1985,13 @@ CheckUSBHID()
#if defined(HAVE_USB_H)
#include <usb.h>
#endif
@@ -162,81 +39,3 @@ $NetBSD: patch-aj,v 1.24 2006/02/07 18:15:50 wiz Exp $
#if defined(HAVE_USBHID_H)
#include <usbhid.h>
#elif defined(HAVE_LIBUSB_H)
-@@ -1834,6 +1858,26 @@ CheckUSBHID()
- fi
- }
-
-+dnl Check for the NetBSD machine/joystick.h
-+CheckMachineJoystick()
-+{
-+ if test x$enable_joystick = xyes; then
-+ AC_MSG_CHECKING(whether struct joystick is defined in machine/joystick.h)
-+ have_machine_joystick=no
-+ AC_TRY_COMPILE([
-+ #include <machine/joystick.h>
-+ ],[
-+ struct joystick t;
-+ ],[
-+ have_machine_joystick=yes
-+ ])
-+ AC_MSG_RESULT($have_machine_joystick)
-+ if test x$have_machine_joystick = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_MACHINE_JOYSTICK"
-+ fi
-+ fi
-+}
-+
- dnl Check for altivec instruction support using gas syntax
- CheckAltivec()
- {
-@@ -2013,7 +2057,7 @@ case "$target" in
- COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
- fi
- ;;
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
- ARCH=freebsd
- CheckDummyVideo
- CheckDiskAudio
-@@ -2065,17 +2109,19 @@ case "$target" in
- CheckESD
- CheckNAS
- CheckX11
-+ CheckDGA
- CheckAAlib
- CheckOpenGL
- CheckPTHREAD
- CheckSIGACTION
- CheckUSBHID
- CheckRPATH
-+ CheckMachineJoystick
- # Set up files for the audio library
- if test x$enable_audio = xyes; then
-- CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
-- AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
-- AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
-+ CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
-+ AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
-+ AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-@@ -2084,9 +2130,6 @@ case "$target" in
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
-- if test x$use_pthreads = xyes; then
-- CFLAGS="$CFLAGS -D_POSIX_THREAD_SYSCALL_SOFT=1"
-- fi
- CopyUnixThreadSource
- fi
- # Set up files for the timer library
-@@ -2755,7 +2798,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
- # Set runtime shared library paths as needed
-
- if test "x$enable_rpath" = "xyes"; then
-- if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
-+ if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then
- SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
- fi
- if test $ARCH = solaris; then
diff --git a/devel/SDL/patches/patch-al b/devel/SDL/patches/patch-al
deleted file mode 100644
index ea47f126024..00000000000
--- a/devel/SDL/patches/patch-al
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-al,v 1.7 2006/02/07 18:15:50 wiz Exp $
-
---- src/audio/openbsd/SDL_openbsdaudio.c.orig 2004-01-04 17:49:15.000000000 +0100
-+++ src/audio/openbsd/SDL_openbsdaudio.c
-@@ -46,8 +46,12 @@
- #include "SDL_audiodev_c.h"
- #include "SDL_openbsdaudio.h"
-
--/* The tag name used by OpenBSD audio */
-+/* The tag name used by NetBSD/OpenBSD audio */
-+#ifdef __NetBSD__
-+#define OBSD_DRIVER_NAME "netbsd"
-+#else
- #define OBSD_DRIVER_NAME "openbsd"
-+#endif
-
- /* Open the audio device for playback, and don't block if busy */
- /* #define USE_BLOCKING_WRITES */
-@@ -132,7 +136,11 @@ static SDL_AudioDevice
- }
-
- AudioBootStrap OPENBSD_AUDIO_bootstrap = {
-+#ifdef __NetBSD__
-+ OBSD_DRIVER_NAME, "Native NetBSD audio",
-+#else
- OBSD_DRIVER_NAME, "Native OpenBSD audio",
-+#endif
- Audio_Available, Audio_CreateDevice
- };
-
-@@ -140,6 +148,7 @@ AudioBootStrap OPENBSD_AUDIO_bootstrap =
- static void
- OBSD_WaitAudio(_THIS)
- {
-+#ifdef __OpenBSD__
- /* Check to see if the thread-parent process is still alive */
- { static int cnt = 0;
- /* Note that this only works with thread implementations
-@@ -151,6 +160,7 @@ OBSD_WaitAudio(_THIS)
- }
- }
- }
-+#endif
-
- #ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */
- /* See if we need to use timed audio synchronization */
-@@ -262,20 +272,20 @@ OBSD_Status(_THIS)
- return;
- }
-
-- fprintf(stderr,"
--[play/record info]
--buffer size : %d bytes
--sample rate : %i Hz
--channels : %i
--precision : %i-bit
--encoding : 0x%x
--seek : %i
--sample count : %i
--EOF count : %i
--paused : %s
--error occured : %s
--waiting : %s
--active : %s
-+ fprintf(stderr,"\n\
-+[play/record info]\n\
-+buffer size : %d bytes\n\
-+sample rate : %i Hz\n\
-+channels : %i\n\
-+precision : %i-bit\n\
-+encoding : 0x%x\n\
-+seek : %i\n\
-+sample count : %i\n\
-+EOF count : %i\n\
-+paused : %s\n\
-+error occured : %s\n\
-+waiting : %s\n\
-+active : %s\n\
- ",
- info.play.buffer_size,
- info.play.sample_rate,
-@@ -290,13 +300,13 @@ active : %s
- info.play.waiting ? "yes" : "no",
- info.play.active ? "yes": "no");
-
-- fprintf(stderr,"
--[audio info]
--monitor_gain : %i
--hw block size : %d bytes
--hi watermark : %i
--lo watermark : %i
--audio mode : %s
-+ fprintf(stderr,"\n\
-+[audio info]\n\
-+monitor_gain : %i\n\
-+hw block size : %d bytes\n\
-+hi watermark : %i\n\
-+lo watermark : %i\n\
-+audio mode : %s\n\
- ",
- info.monitor_gain,
- info.blocksize,
-@@ -388,6 +398,9 @@ OBSD_OpenAudio(_THIS, SDL_AudioSpec *spe
- spec->channels = 1;
- AUDIO_INITINFO(&info);
- info.play.sample_rate = spec->freq;
-+ info.blocksize = spec->size;
-+ info.hiwat = 5;
-+ info.lowat = 3;
- (void)ioctl(audio_fd, AUDIO_SETINFO, &info);
- (void)ioctl(audio_fd, AUDIO_GETINFO, &info);
- spec->freq = info.play.sample_rate;
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index b0bca6f3f65..77cf299caef 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,826 +1,31 @@
-$NetBSD: patch-am,v 1.19 2006/02/07 18:15:50 wiz Exp $
+$NetBSD: patch-am,v 1.20 2006/06/12 16:20:44 wiz Exp $
---- configure.orig 2005-08-28 08:32:11.000000000 +0200
+--- configure.orig 2006-05-17 06:53:45.000000000 +0000
+++ configure
-@@ -463,7 +463,8 @@ 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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'
-+# add AALIB_CONFIG
-+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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 AALIB_CONFIG'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -1593,9 +1594,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO
-
- # libtool versioning
- LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
--LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
--LT_REVISION=$SDL_INTERFACE_AGE
--LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
-+LT_CURRENT=$SDL_INTERFACE_AGE
-+LT_REVISION=$SDL_BINARY_AGE
-+LT_AGE=0
-
-
-
-@@ -21948,6 +21949,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"
-+ LDFLAGS="$LDFLAGS $LIBOSSAUDIO"
-+ SDL_LIBS="$SDL_LIBS $LIBOSSAUDIO"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
- AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -22885,9 +22888,9 @@ fi;
+@@ -24747,10 +24747,10 @@ 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
- if test -r /usr/X11R6/include/audio/audiolib.h; then
+ if true; then
have_nas=yes
-- CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/"
-+ CFLAGS="$CFLAGS -DNAS_SUPPORT"
- SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
- AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-@@ -23153,7 +23156,7 @@ fi
- NASMFLAGS="-f aoutb"
- ;;
- *)
-- NASMFLAGS="-f elf"
-+ test -n "$NASMFLAGS" || NASMFLAGS="-f elf"
- ;;
- esac
+- NAS_CFLAGS="-I/usr/X11R6/include/"
+- NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
++ NAS_CFLAGS=""
++ NAS_LIBS="-laudio -lXt"
-@@ -26755,16 +26758,17 @@ else
- enable_pth=yes
- fi;
- if test x$enable_threads = xyes -a x$enable_pth = xyes; then
-- # Extract the first word of "pth-config", so it can be a program name with args.
--set dummy pth-config; ac_word=$2
-+ # Use the libpthread version of the pth library.
-+ # Extract the first word of "pthread-config", so it can be a program name with args.
-+set dummy pthread-config; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PTH_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PTHREAD_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $PTH_CONFIG in
-+ case $PTHREAD_CONFIG in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a path.
-+ ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26774,32 +26778,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
-- ac_cv_path_PTH_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_PTHREAD_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-- test -z "$ac_cv_path_PTH_CONFIG" && ac_cv_path_PTH_CONFIG="no"
-+ test -z "$ac_cv_path_PTHREAD_CONFIG" && ac_cv_path_PTHREAD_CONFIG="no"
- ;;
- esac
- fi
--PTH_CONFIG=$ac_cv_path_PTH_CONFIG
-+PTHREAD_CONFIG=$ac_cv_path_PTHREAD_CONFIG
-
--if test -n "$PTH_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PTH_CONFIG" >&5
--echo "${ECHO_T}$PTH_CONFIG" >&6
-+if test -n "$PTHREAD_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $PTHREAD_CONFIG" >&5
-+echo "${ECHO_T}$PTHREAD_CONFIG" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-- if test "$PTH_CONFIG" = "no"; then
-+ if test "$PTHREAD_CONFIG" = "no"; then
- use_pth=no
- else
-- PTH_CFLAGS=`$PTH_CONFIG --cflags`
-- PTH_LIBS=`$PTH_CONFIG --libs --all`
-+ PTH_CFLAGS=`$PTHREAD_CONFIG --cflags`
-+ PTH_LIBS=`$PTHREAD_CONFIG --libs --all`
- SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
- SDL_LIBS="$SDL_LIBS $PTH_LIBS"
- CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -26847,9 +26851,13 @@ fi;
- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
- pthread_lib="-pthread"
+ elif test -r /usr/freeware/include/nas/audiolib.h; then
+@@ -29638,7 +29638,7 @@ fi;
;;
-+ *-*-dragonfly*)
-+ pthread_cflags="-D_REENTRANT"
-+ pthread_lib="-pthread"
-+ ;;
*-*-netbsd*)
-- pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
-- pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
-+ pthread_cflags="-D_REENTRANT"
+ pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+- pthread_lib="-L/usr/lib -lpthread"
+ pthread_lib="-lpthread"
;;
*-*-openbsd*)
pthread_cflags="-D_REENTRANT"
-@@ -28677,93 +28685,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
- have_libusbhid=yes
- fi
-
-- 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
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lusb $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char hid_init ();
--int
--main ()
--{
--hid_init ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_usb_hid_init=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_usb_hid_init=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5
--echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6
--if test $ac_cv_lib_usb_hid_init = yes; then
-- have_libusb=yes
--fi
--
- if test x$have_libusbhid = xyes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-- fi
-- if test x$have_libusb = xyes; then
-- SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
-- fi
-
-- if test "${ac_cv_header_usb_h+set}" = set; then
-- 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
-+ if test "${ac_cv_header_usbhid_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for usbhid.h" >&5
-+echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_usbhid_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
--echo "${ECHO_T}$ac_cv_header_usb_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking usb.h usability" >&5
--echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking usbhid.h usability" >&5
-+echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -28771,7 +28707,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <usb.h>
-+#include <usbhid.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28807,15 +28743,15 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--echo "$as_me:$LINENO: checking usb.h presence" >&5
--echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking usbhid.h presence" >&5
-+echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <usb.h>
-+#include <usbhid.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28849,25 +28785,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: )
-- { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+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: usb.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;}
-+ { 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
-+echo "$as_me: WARNING: usbhid.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: usbhid.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
-+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;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
-@@ -28878,34 +28814,34 @@ _ASBOX
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--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 "$as_me:$LINENO: checking for usbhid.h" >&5
-+echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_usbhid_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_header_usb_h=$ac_header_preproc
-+ ac_cv_header_usbhid_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
--echo "${ECHO_T}$ac_cv_header_usb_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
-
- fi
--if test $ac_cv_header_usb_h = yes; then
-- have_usb_h=yes
-+if test $ac_cv_header_usbhid_h = yes; then
-+ have_usbhid_h=yes
- fi
-
-
-- if test "${ac_cv_header_usbhid_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for usbhid.h" >&5
--echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
--if test "${ac_cv_header_usbhid_h+set}" = set; then
-+ if test "${ac_cv_header_libusbhid_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for libusbhid.h" >&5
-+echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusbhid_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
--echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking usbhid.h usability" >&5
--echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking libusbhid.h usability" >&5
-+echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -28913,7 +28849,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <usbhid.h>
-+#include <libusbhid.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28949,15 +28885,15 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--echo "$as_me:$LINENO: checking usbhid.h presence" >&5
--echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking libusbhid.h presence" >&5
-+echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <usbhid.h>
-+#include <libusbhid.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28991,25 +28927,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: )
-- { echo "$as_me:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
--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;}
-+ { 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
--echo "$as_me: WARNING: usbhid.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usbhid.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: usbhid.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
--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: 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
-+echo "$as_me: WARNING: libusbhid.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libusbhid.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
-@@ -29020,34 +28956,112 @@ _ASBOX
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--echo "$as_me:$LINENO: checking for usbhid.h" >&5
--echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
--if test "${ac_cv_header_usbhid_h+set}" = set; then
-+echo "$as_me:$LINENO: checking for libusbhid.h" >&5
-+echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusbhid_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_header_usbhid_h=$ac_header_preproc
-+ ac_cv_header_libusbhid_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
--echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
-
- fi
--if test $ac_cv_header_usbhid_h = yes; then
-- have_usbhid_h=yes
-+if test $ac_cv_header_libusbhid_h = yes; then
-+ have_libusbhid_h=yes
- fi
-
-
-- if test "${ac_cv_header_libusb_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for libusb.h" >&5
--echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
--if test "${ac_cv_header_libusb_h+set}" = set; then
-+ if test x$have_usbhid_h = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_USBHID_H"
-+ fi
-+ if test x$have_libusbhid_h = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
-+ fi
-+ else
-+ 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
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lusb $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char hid_init ();
-+int
-+main ()
-+{
-+hid_init ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_usb_hid_init=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_usb_hid_init=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6
-+if test $ac_cv_lib_usb_hid_init = yes; then
-+ have_libusb=yes
-+fi
-+
-+ if test x$have_libusb = xyes; then
-+ SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
-+
-+ if test "${ac_cv_header_usb_h+set}" = set; then
-+ 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 "$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
- # Is the header compilable?
--echo "$as_me:$LINENO: checking libusb.h usability" >&5
--echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking usb.h usability" >&5
-+echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29055,7 +29069,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <libusb.h>
-+#include <usb.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29091,15 +29105,15 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--echo "$as_me:$LINENO: checking libusb.h presence" >&5
--echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking usb.h presence" >&5
-+echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <libusb.h>
-+#include <usb.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -29133,25 +29147,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: )
-- { echo "$as_me:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: libusb.h: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusb.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: libusb.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusb.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: libusb.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
-@@ -29162,34 +29176,34 @@ _ASBOX
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--echo "$as_me:$LINENO: checking for libusb.h" >&5
--echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
--if test "${ac_cv_header_libusb_h+set}" = set; then
-+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
- else
-- ac_cv_header_libusb_h=$ac_header_preproc
-+ ac_cv_header_usb_h=$ac_header_preproc
- 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
-
- fi
--if test $ac_cv_header_libusb_h = yes; then
-- have_libusb_h=yes
-+if test $ac_cv_header_usb_h = yes; then
-+ have_usb_h=yes
- fi
-
-
-- if test "${ac_cv_header_libusbhid_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for libusbhid.h" >&5
--echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
--if test "${ac_cv_header_libusbhid_h+set}" = set; then
-+ if test "${ac_cv_header_libusb_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for libusb.h" >&5
-+echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
--echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking libusbhid.h usability" >&5
--echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking libusb.h usability" >&5
-+echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29197,7 +29211,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <libusbhid.h>
-+#include <libusb.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -29233,15 +29247,15 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--echo "$as_me:$LINENO: checking libusbhid.h presence" >&5
--echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking libusb.h presence" >&5
-+echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <libusbhid.h>
-+#include <libusb.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -29275,25 +29289,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: )
-- { 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;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libusb.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
--echo "$as_me: WARNING: libusbhid.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusbhid.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: libusbhid.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libusb.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libusb.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
-@@ -29304,33 +29318,29 @@ _ASBOX
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--echo "$as_me:$LINENO: checking for libusbhid.h" >&5
--echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
--if test "${ac_cv_header_libusbhid_h+set}" = set; then
-+echo "$as_me:$LINENO: checking for libusb.h" >&5
-+echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_header_libusbhid_h=$ac_header_preproc
-+ ac_cv_header_libusb_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
--echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
-
- fi
--if test $ac_cv_header_libusbhid_h = yes; then
-- have_libusbhid_h=yes
-+if test $ac_cv_header_libusb_h = yes; then
-+ have_libusb_h=yes
- fi
-
-
- if test x$have_usb_h = xyes; then
- CFLAGS="$CFLAGS -DHAVE_USB_H"
- fi
-- if test x$have_usbhid_h = xyes; then
-- CFLAGS="$CFLAGS -DHAVE_USBHID_H"
-- fi
- if test x$have_libusb_h = xyes; then
- CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
- fi
-- if test x$have_libusbhid_h = xyes; then
-- CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
-+ fi
- fi
-
- echo "$as_me:$LINENO: checking for usbhid" >&5
-@@ -29347,8 +29357,13 @@ cat >>conftest.$ac_ext <<_ACEOF
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
-+ #ifdef __DragonFly__
-+ #include <bus/usb/usb.h>
-+ #include <bus/usb/usbhid.h>
-+ #else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+ #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
-@@ -29418,8 +29433,13 @@ cat >>conftest.$ac_ext <<_ACEOF
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
-+ #ifdef __DragonFly__
-+ #include <bus/usb/usb.h>
-+ #include <bus/usb/usbhid.h>
-+ #else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+ #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
-@@ -29490,8 +29510,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -31986,8 +31986,13 @@ cat >>conftest.$ac_ext <<_ACEOF
#if defined(HAVE_USB_H)
#include <usb.h>
#endif
@@ -834,134 +39,3 @@ $NetBSD: patch-am,v 1.19 2006/02/07 18:15:50 wiz Exp $
#if defined(HAVE_USBHID_H)
#include <usbhid.h>
#elif defined(HAVE_LIBUSB_H)
-@@ -29554,6 +29579,70 @@ echo "${ECHO_T}$have_usbhid_new" >&6
- fi
- }
-
-+CheckMachineJoystick()
-+{
-+ if test x$enable_joystick = xyes; then
-+ echo "$as_me:$LINENO: checking whether struct joystick is defined in machine/joystick.h" >&5
-+echo $ECHO_N "checking whether struct joystick is defined in machine/joystick.h... $ECHO_C" >&6
-+ have_machine_joystick=no
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ #include <machine/joystick.h>
-+
-+int
-+main ()
-+{
-+
-+ struct joystick t;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+ have_machine_joystick=yes
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $have_machine_joystick" >&5
-+echo "${ECHO_T}$have_machine_joystick" >&6
-+ if test x$have_machine_joystick = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_MACHINE_JOYSTICK"
-+ fi
-+ fi
-+}
-+
- CheckAltivec()
- {
- echo "$as_me:$LINENO: checking for GCC Altivec instruction support" >&5
-@@ -29948,7 +30037,7 @@ __EOF__
-
- fi
- ;;
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
- ARCH=freebsd
- CheckDummyVideo
- CheckDiskAudio
-@@ -30014,17 +30103,19 @@ __EOF__
- CheckESD
- CheckNAS
- CheckX11
-+ CheckDGA
- CheckAAlib
- CheckOpenGL
- CheckPTHREAD
- CheckSIGACTION
- CheckUSBHID
- CheckRPATH
-+ CheckMachineJoystick
- # Set up files for the audio library
- if test x$enable_audio = xyes; then
-- CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
-- AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
-- AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
-+ CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
-+ AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
-+ AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-@@ -30033,9 +30124,6 @@ __EOF__
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
-- if test x$use_pthreads = xyes; then
-- CFLAGS="$CFLAGS -D_POSIX_THREAD_SYSCALL_SOFT=1"
-- fi
- CopyUnixThreadSource
- fi
- # Set up files for the timer library
-@@ -31670,7 +31758,7 @@ fi
- # Set runtime shared library paths as needed
-
- if test "x$enable_rpath" = "xyes"; then
-- if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
-+ if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then
- SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
- fi
- if test $ARCH = solaris; then
-@@ -32818,7 +32906,7 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
- s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
- s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;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
- s,@TARGET_LINUX_FALSE@,$TARGET_LINUX_FALSE,;t t
diff --git a/devel/SDL/patches/patch-ar b/devel/SDL/patches/patch-ar
deleted file mode 100644
index 5e4705e857c..00000000000
--- a/devel/SDL/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2004/04/17 00:15:21 snj Exp $
-
---- src/Makefile.am.orig 2004-04-10 14:48:03.000000000 -0700
-+++ src/Makefile.am 2004-04-10 14:48:08.000000000 -0700
-@@ -21,7 +21,6 @@ lib_LTLIBRARIES = libSDL.la
- libSDL_la_SOURCES = $(GENERAL_SRCS)
- libSDL_la_LDFLAGS = \
- -no-undefined \
-- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libSDL_la_LIBADD = \
- main/libarch.la \
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
deleted file mode 100644
index 856fa2dd387..00000000000
--- a/devel/SDL/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.5 2006/02/07 18:15:50 wiz Exp $
-
---- src/Makefile.in.orig 2005-08-28 08:31:37.000000000 +0200
-+++ src/Makefile.in
-@@ -306,7 +306,6 @@ lib_LTLIBRARIES = libSDL.la
- libSDL_la_SOURCES = $(GENERAL_SRCS)
- libSDL_la_LDFLAGS = \
- -no-undefined \
-- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libSDL_la_LIBADD = \
diff --git a/devel/SDL/patches/patch-ba b/devel/SDL/patches/patch-ba
deleted file mode 100644
index 5f24555043e..00000000000
--- a/devel/SDL/patches/patch-ba
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2005/01/05 12:05:19 adam Exp $
-
---- 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"
- #include "SDL_sysaudio.h"
-
-+#include "SDL_name.h"
-+#include "SDL_loadso.h"
-+
- /* Available audio drivers */
- static AudioBootStrap *bootstrap[] = {
-+ NULL, /* Optional 1: either arts, esd, nas */
-+ NULL, /* Optional 2: either arts, esd, nas */
-+ NULL, /* Optional 3: either arts, esd, nas */
-+#define PLUGIN_COUNT 3
- #ifdef OPENBSD_AUDIO_SUPPORT
- &OPENBSD_AUDIO_bootstrap,
- #endif
-@@ -59,15 +66,6 @@ static AudioBootStrap *bootstrap[] = {
- #ifdef DMEDIA_SUPPORT
- &DMEDIA_bootstrap,
- #endif
--#ifdef ARTSC_SUPPORT
-- &ARTSC_bootstrap,
--#endif
--#ifdef ESD_SUPPORT
-- &ESD_bootstrap,
--#endif
--#ifdef NAS_SUPPORT
-- &NAS_bootstrap,
--#endif
- #ifdef ENABLE_DIRECTX
- &DSOUND_bootstrap,
- #endif
-@@ -268,16 +266,48 @@ static void SDL_UnlockAudio_Default(SDL_
- SDL_mutexV(audio->mixer_lock);
- }
-
-+static int SDL_LoadAudioPlugins(void)
-+{
-+ int first = PLUGIN_COUNT;
-+ char *envvar;
-+ void *plugin;
-+
-+#define DO_LOAD(IDNAME, SONAME, BSNAME, PKGNAME) \
-+ envvar = getenv("SDL_AUDIO_PLUGIN"); \
-+ if (envvar == NULL || strcmp(envvar, IDNAME) == 0) { \
-+ plugin = SDL_LoadObject(SONAME); \
-+ if (plugin != NULL) { \
-+ struct AudioBootStrap *bs; \
-+ bs = SDL_LoadFunction(plugin, BSNAME); \
-+ if (bs != NULL) { \
-+ bootstrap[--first] = bs; \
-+ } \
-+ } else if (envvar != NULL && strcmp(envvar, IDNAME) == 0) { \
-+ fprintf(stderr, "SDL (pkgsrc): SDL_AUDIO_PLUGIN is explicitly set to `" IDNAME "'.\n"); \
-+ fprintf(stderr, "SDL (pkgsrc): Please install the " PKGNAME " package and retry.\n"); \
-+ } \
-+ }
-+
-+ DO_LOAD("arts", "libaudio_arts.so", "ARTSC_bootstrap", "audio/SDL-arts");
-+ DO_LOAD("esound", "libaudio_esd.so", "ESD_bootstrap", "audio/SDL-esound");
-+ DO_LOAD("nas", "libaudio_nas.so", "NAS_bootstrap", "audio/SDL-nas");
-+#undef DO_LOAD
-+
-+ return first;
-+}
-+
- int SDL_AudioInit(const char *driver_name)
- {
- SDL_AudioDevice *audio;
-- int i = 0, idx;
-+ int i = 0, idx, first;
-
- /* Check to make sure we don't overwrite 'current_audio' */
- if ( current_audio != NULL ) {
- SDL_AudioQuit();
- }
-
-+ first = SDL_LoadAudioPlugins();
-+
- /* Select the proper audio driver */
- audio = NULL;
- idx = 0;
-@@ -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! :)
- */
-- for ( i=0; bootstrap[i]; ++i ) {
-+ for ( i=first; bootstrap[i]; ++i ) {
- if ( strcmp(bootstrap[i]->name, "esd") == 0 ) {
- const char *esd_no_spawn;
-
-@@ -316,7 +346,7 @@ int SDL_AudioInit(const char *driver_nam
- idx = atoi(strrchr(driver_name, ':')+1);
- }
- #endif
-- for ( i=0; bootstrap[i]; ++i ) {
-+ for ( i=first; bootstrap[i]; ++i ) {
- if (strncmp(bootstrap[i]->name, driver_name,
- strlen(bootstrap[i]->name)) == 0) {
- if ( bootstrap[i]->available() ) {
-@@ -326,7 +356,7 @@ int SDL_AudioInit(const char *driver_nam
- }
- }
- } else {
-- for ( i=0; bootstrap[i]; ++i ) {
-+ for ( i=first; bootstrap[i]; ++i ) {
- if ( bootstrap[i]->available() ) {
- audio = bootstrap[i]->create(idx);
- if ( audio != NULL ) {
diff --git a/devel/SDL/patches/patch-bb b/devel/SDL/patches/patch-bb
deleted file mode 100644
index e1d84e90b19..00000000000
--- a/devel/SDL/patches/patch-bb
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2005/09/07 10:15:39 adam Exp $
-
---- src/audio/esd/Makefile.in.orig 2005-08-28 06:31:40.000000000 +0000
-+++ src/audio/esd/Makefile.in
-@@ -47,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(install_sh) -d
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libaudio_esd_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(ESD_LIBS)
- libaudio_esd_la_LIBADD =
- am__objects_1 = SDL_esdaudio.lo
- am_libaudio_esd_la_OBJECTS = $(am__objects_1)
-@@ -320,7 +321,7 @@ clean-noinstLTLIBRARIES:
- rm -f "$${dir}/so_locations"; \
- done
- libaudio_esd.la: $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_DEPENDENCIES)
-- $(LINK) $(libaudio_esd_la_LDFLAGS) $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libaudio_esd_la_LDFLAGS) $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/devel/SDL/patches/patch-bc b/devel/SDL/patches/patch-bc
deleted file mode 100644
index 76055b9c857..00000000000
--- a/devel/SDL/patches/patch-bc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bc,v 1.4 2005/09/07 10:15:39 adam Exp $
-
---- src/audio/arts/Makefile.in.orig 2005-08-28 06:31:38.000000000 +0000
-+++ src/audio/arts/Makefile.in
-@@ -47,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(install_sh) -d
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libaudio_arts_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) `$(ARTSCONFIG) --libs`
- libaudio_arts_la_LIBADD =
- am__objects_1 = SDL_artsaudio.lo
- am_libaudio_arts_la_OBJECTS = $(am__objects_1)
-@@ -320,7 +321,7 @@ clean-noinstLTLIBRARIES:
- rm -f "$${dir}/so_locations"; \
- done
- libaudio_arts.la: $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_DEPENDENCIES)
-- $(LINK) $(libaudio_arts_la_LDFLAGS) $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libaudio_arts_la_LDFLAGS) $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/devel/SDL/patches/patch-bd b/devel/SDL/patches/patch-bd
deleted file mode 100644
index d13aee795dd..00000000000
--- a/devel/SDL/patches/patch-bd
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bd,v 1.4 2005/09/07 10:15:39 adam Exp $
-
---- src/audio/nas/Makefile.in.orig 2005-08-28 06:31:42.000000000 +0000
-+++ src/audio/nas/Makefile.in
-@@ -47,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(install_sh) -d
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libaudio_nas_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(SHARED_SYSTEM_LIBS)
- libaudio_nas_la_LIBADD =
- am__objects_1 = SDL_nasaudio.lo
- am_libaudio_nas_la_OBJECTS = $(am__objects_1)
-@@ -320,7 +321,7 @@ clean-noinstLTLIBRARIES:
- rm -f "$${dir}/so_locations"; \
- done
- libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES)
-- $(LINK) $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/devel/SDL/patches/patch-da b/devel/SDL/patches/patch-da
deleted file mode 100644
index 18b6f004cc3..00000000000
--- a/devel/SDL/patches/patch-da
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-da,v 1.1 2005/05/20 20:08:40 wiz Exp $
-
---- src/video/vgl/SDL_vglvideo.c.orig 2002-03-06 12:23:08.000000000 +0100
-+++ src/video/vgl/SDL_vglvideo.c
-@@ -557,7 +557,7 @@ VGLListModes(int depth, int mem_model)
- case V_INFO_MM_VGAX:
- vminfop->Type = VIDBUF8X;
- break;
--#if defined(__FreeBSD_version) && __FreeBSD_version >= 500000
-+#if defined(__DragonFly__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 500000)
- case V_INFO_MM_DIRECT:
- vminfop->PixelBytes = minfo.vi_pixel_size;
- switch (vminfop->PixelBytes) {
diff --git a/devel/SDL/patches/patch-db b/devel/SDL/patches/patch-db
deleted file mode 100644
index d78ae529d08..00000000000
--- a/devel/SDL/patches/patch-db
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-db,v 1.1 2005/05/20 20:08:40 wiz Exp $
-
---- src/video/svga/SDL_svgavideo.c.orig 2004-02-18 18:22:09.000000000 +0100
-+++ src/video/svga/SDL_svgavideo.c
-@@ -38,7 +38,7 @@ static char rcsid =
-
- #if defined(linux)
- #include <linux/vt.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/consio.h>
- #else
- #error You must choose your operating system here
diff --git a/devel/SDL/patches/patch-dc b/devel/SDL/patches/patch-dc
deleted file mode 100644
index 1c5fc933880..00000000000
--- a/devel/SDL/patches/patch-dc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-dc,v 1.1 2005/05/20 20:08:40 wiz Exp $
-
---- src/video/svga/SDL_svgaevents.c.orig 2004-02-18 18:22:09.000000000 +0100
-+++ src/video/svga/SDL_svgaevents.c
-@@ -36,7 +36,7 @@ static char rcsid =
- #if defined(linux)
- #include <linux/kd.h>
- #include <linux/keyboard.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/kbio.h>
- #else
- #error You must choose your operating system here
-@@ -52,7 +52,7 @@ static char rcsid =
- #if defined(linux)
- #define NUM_VGAKEYMAPS (1<<KG_CAPSSHIFT)
- static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS];
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- /* FIXME: Free the keymap when we shut down the video mode */
- static keymap_t *vga_keymap = NULL;
- #else
-@@ -135,7 +135,7 @@ int SVGA_initkeymaps(int fd)
- }
- return(0);
- }
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- int SVGA_initkeymaps(int fd)
- {
- vga_keymap = malloc(sizeof(keymap_t));
-@@ -383,7 +383,7 @@ static SDL_keysym *TranslateKey(int scan
- }
- return(keysym);
- }
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
- {
- /* Set the keysym information */
diff --git a/devel/SDL/patches/patch-dd b/devel/SDL/patches/patch-dd
deleted file mode 100644
index 8cbf26e4a86..00000000000
--- a/devel/SDL/patches/patch-dd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dd,v 1.1 2005/05/20 20:08:40 wiz Exp $
-
---- src/timer/linux/SDL_systimer.c.orig 2004-02-18 18:22:03.000000000 +0100
-+++ src/timer/linux/SDL_systimer.c
-@@ -55,7 +55,7 @@ static char rcsid =
- /* Linux select() changes its timeout parameter upon return to contain
- the remaining time. Most other unixen leave it unchanged or undefined. */
- #define SELECT_SETS_REMAINING
--#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__sun)
-+#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__sun) || defined(__DragonFly__)
- #define USE_NANOSLEEP
- #endif
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 13:20:49 +0000