summaryrefslogtreecommitdiff
path: root/audio/xmix/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'audio/xmix/patches/patch-ab')
-rw-r--r--audio/xmix/patches/patch-ab32
1 files changed, 14 insertions, 18 deletions
diff --git a/audio/xmix/patches/patch-ab b/audio/xmix/patches/patch-ab
index 3a97fadd44a..c67feb49d79 100644
--- a/audio/xmix/patches/patch-ab
+++ b/audio/xmix/patches/patch-ab
@@ -1,30 +1,26 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:21 agc Exp $
-
-diff -u ../../work/xmix/Imakefile ./Imakefile
---- ../../work/xmix/Imakefile Thu Oct 30 01:21:25 1997
-+++ ./Imakefile Thu Oct 30 00:46:39 1997
-@@ -12,7 +12,7 @@
-
- all:: $(PROGRAMS)
-
--LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lossaudio
-
- PROGRAM = $(PROGRAMS)
-
-diff -u ../../work/xmix/xmix.c ./xmix.c
---- ../../work/xmix/xmix.c Thu Oct 30 01:21:25 1997
-+++ ./xmix.c Thu Oct 30 00:45:45 1997
+diff -r -u ../../src/xmix-2.1/xmix.c ./xmix.c
+--- ../../src/xmix-2.1/xmix.c Sun Jan 17 13:13:12 1999
++++ ./xmix.c Sun Jan 17 13:16:12 1999
@@ -77,7 +77,12 @@
#include "square_empty.bit"
#include "square_with_x.bit"
+-#include <linux/soundcard.h>
+#ifdef __NetBSD__
+#include <sys/ioctl.h>
+#include <soundcard.h>
+#else
- #include <machine/soundcard.h>
++#include <machine/soundcard.h>
+#endif
#define SOUND_FULL_SCALE 100.0
#define MAX_SOUND_VOL 95
+@@ -742,7 +747,7 @@
+ mic.locked = 0;
+ reclvl.locked = 0;
+
+- printf("supported = 0x%x\n",supported);
++ /*printf("supported = 0x%x\n",supported);*/
+ set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0);
+ set_supported(&bass,(supported & SOUND_MASK_BASS) != 0);
+ set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0);