Use the native audio interface.

2 files changed, 80 insertions, 51 deletions

diff --git a/audio/mikmod/patches/patch-ad b/audio/mikmod/patches/patch-ad
index 75aedb3c407..38c4a239e63 100644
--- a/audio/mikmod/patches/patch-ad
+++ b/audio/mikmod/patches/patch-ad
@@ -1,55 +1,73 @@
-diff -u ../../../work/mikmod-2.14-unix/source/Makefile ./Makefile
---- ../../../work/mikmod-2.14-unix/source/Makefile	Mon Oct 27 22:04:48 1997
-+++ ./Makefile	Mon Oct 27 21:31:45 1997
-@@ -42,6 +42,10 @@
- LIBS=-lncurses -lm $(ULTRALIB)
- DRIVERS = drv_nos.o drv_raw.o drv_vox.o $(ULTRADRV)
- 
-+# NetBSD needs to find ncurses and the oss audio library
-+OSFLAGS += -I${PREFIX}/include
-+LIBS= -L${PREFIX}/lib -lncurses -lossaudio -lm
+--- Makefile.orig	Sat Mar  7 05:45:21 1998
++++ Makefile	Sat Mar  7 05:47:52 1998
+@@ -25,8 +25,8 @@
+ #
+ ############################################################################
+ 
+-OSDEF=-DOSS
+-CC = gcc
++#OSDEF=-DOSS
++#CC = gcc
+ 
+ # if you want to use the Ultra driver uncomment the 3 lines below. 
+ # You need a Gravis Ultrasound and the library from the Linux Ultrasound 
+@@ -35,12 +35,25 @@
+ #ULTRALIB=-lgus
+ #ULTRADRV=drv_ultra.o
+ 
+-OSFLAGS = -O2 $(OSDEF) $(ULTRA)
++#OSFLAGS = -O2 $(OSDEF) $(ULTRA)
+ #debug options
+ #OSFLAGS = -g $(OSDEF) $(ULTRA)
+ 
+-LIBS=-lncurses -lm $(ULTRALIB)
+-DRIVERS = drv_nos.o drv_raw.o drv_vox.o $(ULTRADRV)
++#LIBS=-lncurses -lm $(ULTRALIB)
++#DRIVERS = drv_nos.o drv_raw.o drv_vox.o $(ULTRADRV)
++
++############################################################################
++#
++# NetBSD definitions
++#
++# for output on the Sun-like audio device (/dev/audio)
++#
++############################################################################
 +
++CC = cc
++OSFLAGS = -O2 -I${PREFIX}/include
++LIBS = -L${PREFIX}/lib -lncurses -lm
++DRIVERS = drv_nos.o drv_raw.o drv_sun.o
+ 
  ############################################################################
  #
- # SUN / Solaris definitions (including Solaris/i386)
-diff -u ../../../work/mikmod-2.14-unix/source/drv_vox.c ./drv_vox.c
---- ../../../work/mikmod-2.14-unix/source/drv_vox.c	Tue Dec 17 01:21:12 1996
-+++ ./drv_vox.c	Mon Oct 27 21:52:18 1997
-@@ -35,8 +35,10 @@
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__)
- #include <machine/soundcard.h>
-+#elif defined(__NetBSD__)
-+#include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif /* __FreeBSD__ */
-@@ -52,9 +54,15 @@
- static char* audiobuffer;
- 
- 
-+#ifdef __NetBSD__
-+#define DEV "/dev/audio"
-+#else
-+#define DEV "/dev/dsp"
-+#endif
+--- mikmod.h.orig	Sun Dec 29 13:46:39 1996
++++ mikmod.h	Sat Mar  7 05:49:57 1998
+@@ -59,11 +59,15 @@
+ 
+ #elif defined(SUN) 
+ #define mikbannerdriver \
+-" - Sun/Solaris driver by Valtteri Vuorikoski <vuori@sci.fi>\n"
++" - Sun/Solaris/NetBSD driver by Valtteri Vuorikoski <vuori@sci.fi>\n"
+ 
+ #elif defined(SOLARIS)
+ #define mikbannerdriver \
+-" - Sun/Solaris driver by Valtteri Vuorikoski <vuori@sci.fi>\n"
++" - Sun/Solaris/NetBSD driver by Valtteri Vuorikoski <vuori@sci.fi>\n"
 +
- static BOOL Vox_IsThere(void)
- {
--	return (access("/dev/dsp",W_OK)==0);
-+	return (access(DEV,W_OK)==0);
- }
- 
- 
-@@ -64,7 +72,7 @@
- 	int play_precision,play_stereo,play_rate;
- 	int fragsize,numfrags;
- 	
--	if((sndfd=open("/dev/dsp",O_WRONLY))<0){
-+	if((sndfd=open(DEV,O_WRONLY))<0){
- 		myerr="Cannot open sounddevice";
- 		return 0;
- 	}
++#elif defined(__NetBSD__)
++#define mikbannerdriver \
++" - Sun/Solaris/NetBSD driver by Valtteri Vuorikoski <vuori@sci.fi>\n"
+ 
+ #elif defined(__alpha)
+ #define mikbannerdriver \
+--- mikmodux.c.orig	Mon Dec 16 19:31:16 1996
++++ mikmodux.c	Sat Mar  7 05:45:21 1998
+@@ -199,6 +199,8 @@
+ 	MD_RegisterDriver(&drv_sun);
+ #elif defined(SOLARIS)
+ 	MD_RegisterDriver(&drv_sun);
++#elif defined(__NetBSD__)
++	MD_RegisterDriver(&drv_sun);
+ #elif defined(__alpha)
+         MD_RegisterDriver(&drv_AF);
+ #elif defined(OSS)
diff --git a/audio/mikmod/patches/patch-ae b/audio/mikmod/patches/patch-ae
new file mode 100644
index 00000000000..37d4b6986f4
--- /dev/null
+++ b/audio/mikmod/patches/patch-ae
@@ -0,0 +1,11 @@
+--- drv_sun.c.orig	Sat Nov 30 22:09:55 1996
++++ drv_sun.c	Sat Mar  7 05:59:39 1998
+@@ -33,7 +33,7 @@
+ 
+ #include "mikmod.h"
+ 
+-#define DEFAULT_FRAGSIZE 2048
++#define DEFAULT_FRAGSIZE 8192
+ 
+ static int sndfd; /* we need these in a few places */
+ static int play_encoding = -1, play_precision, fragsize = DEFAULT_FRAGSIZE;