>Number:         6830
>Category:       pkg
>Synopsis:       audio/xmix patch set is crufty
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 17 11:35:00 1999
>Last-Modified:
>Originator:     Rob Windsor
>Organization:
Nose Pickers Anonymous
>Release:        1.3.3
>Environment:
System: NetBSD nimh 1.3.3 NetBSD 1.3.3 (NIMH) #6: Sat Jan 9 21:35:52 CST 1999 windsor@nimh:/usr/src/sys/arch/i386/compile/NIMH i386


>Description:
	Patches for audio/xmix need to be consolidated.
>How-To-Repeat:
	cat $PKG/audio/xsrc/patches/patch-??
>Fix:
	Throw out patch-aa,patch-ab,patch-ac and add the following as
	patch-aa:

====
$NetBSD$

diff -r -u ../../src/xmix-2.1/Imakefile ./Imakefile
--- ../../src/xmix-2.1/Imakefile	Tue Feb  1 22:54:35 1994
+++ ./Imakefile	Sun Jan 17 13:16:12 1999
@@ -12,6 +12,8 @@
 
 all::  $(PROGRAMS)
 
-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lossaudio
 
-NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
+PROGRAM = $(PROGRAMS)
+
+ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
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>
+#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);

>Audit-Trail:
>Unformatted: