defuzz

5 files changed, 67 insertions, 59 deletions

diff --git a/audio/xamp/patches/patch-aa b/audio/xamp/patches/patch-aa
index 2e713c03e20..6b5082acff5 100644
--- a/audio/xamp/patches/patch-aa
+++ b/audio/xamp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 1999/11/15 13:07:12 rh Exp $
 
---- ../audioIO.c.old	Sun Oct 26 10:55:27 1997
-+++ ../audioIO.c	Sun Oct 26 10:56:03 1997
+--- ../audioIO.c.orig	Sat May 31 19:47:58 1997
++++ ../audioIO.c	Mon Nov 15 13:58:45 1999
 @@ -18,7 +18,7 @@
    #include "audioIO_HPUX.c"
  #endif
@@ -11,59 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
    #include "audioIO_SunOS.c"
  #endif
  
---- ../audioIO.h.old	Sun Oct 26 10:57:10 1997
-+++ ../audioIO.h	Fri Oct 31 06:43:07 1997
-@@ -27,3 +27,7 @@
- #ifdef OS_SunOS
-   #define AUSIZ 4096
- #endif
-+
-+#ifdef OS_NetBSD
-+  #define AUSIZ 32768
-+#endif
---- ../audioIO_SunOS.c.old	Sun Oct 26 10:58:36 1997
-+++ ../audioIO_SunOS.c	Sun Oct 26 11:13:51 1997
-@@ -8,7 +8,11 @@
- 
- #include "amp.h"
- #include <sys/types.h>
-+#ifndef OS_NetBSD
- #include <sys/stropts.h>
-+#else
-+#include <sys/ioctl.h>
-+#endif
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-@@ -36,8 +40,7 @@
- 	}
- 	DB(audio, msg("Audio device opened on %d\n",audio_fd) );
- 
--	if (ioctl(audio_fd,AUDIO_GETINFO,&auinfo)<0)
--		die("Unable to get audio info\n");
-+	AUDIO_INITINFO(&auinfo);
- 
- 	auinfo.play.precision=16;
- 	auinfo.play.encoding=AUDIO_ENCODING_LINEAR;
---- configure.in.old	Sun Oct 26 10:53:03 1997
-+++ configure.in	Sun Oct 26 10:54:32 1997
-@@ -58,7 +58,7 @@
-     DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-     ;;
- 
--  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD)
-     CC="gcc"
-     if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
---- configure.old	Sun Oct 26 11:18:18 1997
-+++ configure	Sun Oct 26 11:18:45 1997
-@@ -1398,7 +1398,7 @@
-     DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-     ;;
- 
--  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD)
-     CC="gcc"
-     if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
diff --git a/audio/xamp/patches/patch-af b/audio/xamp/patches/patch-af
new file mode 100644
index 00000000000..b10f4e184f0
--- /dev/null
+++ b/audio/xamp/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 1999/11/15 13:07:12 rh Exp $
+
+--- ../audioIO.h.orig	Sat May 31 19:47:58 1997
++++ ../audioIO.h	Mon Nov 15 13:58:45 1999
+@@ -26,3 +26,7 @@
+ #ifdef OS_SunOS
+   #define AUSIZ 4096
+ #endif
++
++#ifdef OS_NetBSD
++  #define AUSIZ 32768
++#endif
diff --git a/audio/xamp/patches/patch-ag b/audio/xamp/patches/patch-ag
new file mode 100644
index 00000000000..608ba040344
--- /dev/null
+++ b/audio/xamp/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 1999/11/15 13:07:12 rh Exp $
+
+--- ../audioIO_SunOS.c.orig	Sat May 31 19:47:58 1997
++++ ../audioIO_SunOS.c	Mon Nov 15 13:58:45 1999
+@@ -8,7 +8,11 @@
+ 
+ #include "amp.h"
+ #include <sys/types.h>
++#ifndef OS_NetBSD
+ #include <sys/stropts.h>
++#else
++#include <sys/ioctl.h>
++#endif
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -36,8 +40,7 @@
+ 	}
+ 	DB(audio, msg("Audio device opened on %d\n",audio_fd) );
+ 
+-	if (ioctl(audio_fd,AUDIO_GETINFO,&auinfo)<0)
+-		die("Unable to get audio info\n");
++	AUDIO_INITINFO(&auinfo);
+ 
+ 	auinfo.play.precision=16;
+ 	auinfo.play.encoding=AUDIO_ENCODING_LINEAR;
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
new file mode 100644
index 00000000000..da218fd7bf9
--- /dev/null
+++ b/audio/xamp/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 1999/11/15 13:07:12 rh Exp $
+
+--- configure.in.orig	Sun Oct  5 18:42:34 1997
++++ configure.in	Mon Nov 15 13:58:45 1999
+@@ -57,7 +57,7 @@
+     CFLAGS="-O3 -ffast-math -funroll-loops"
+     ;;
+ 
+-  Linux|FreeBSD)
++  Linux|FreeBSD|NetBSD)
+     CC="gcc"
+     if test "$ARCH_TYPE" = "i486" ; then
+       CFLAGS_ARCH="-m486"
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
new file mode 100644
index 00000000000..41f6cb4b65a
--- /dev/null
+++ b/audio/xamp/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1999/11/15 13:07:13 rh Exp $
+
+--- configure.orig	Sun Oct 26 17:55:34 1997
++++ configure	Mon Nov 15 13:58:45 1999
+@@ -1700,7 +1700,7 @@
+     CFLAGS="-O3 -ffast-math -funroll-loops"
+     ;;
+ 
+-  Linux|FreeBSD)
++  Linux|FreeBSD|NetBSD)
+     CC="gcc"
+     if test "$ARCH_TYPE" = "i486" ; then
+       CFLAGS_ARCH="-m486"