Date: Tue, 16 Nov 2004 19:02:58 +1000 From: Dima Panov <redfox@Fluffy.Khv.RU> To: Sean McNeil <sean@mcneil.com> Cc: ports@freebsd.org Subject: Re: audio/nas broken on install Message-ID: <20041116090258.GE48024@Fluffy.Khv.RU> In-Reply-To: <20041116082819.GD48024@Fluffy.Khv.RU> References: <1100576307.25638.1.camel@server.mcneil.com> <20041116082819.GD48024@Fluffy.Khv.RU>
next in thread | previous in thread | raw e-mail | index | archive | help
--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
>>>>>>> G'day, Sean McNeil!
>>>>>>> On Mon, Nov 15, 2004 at 19:38:27 -0800, You wrote:
SM>> make works fine, but then make install does something funky:
SM>> install in include/audio done
SM>> installing in ./server...
SM>> making all in server/dia...
SM>> making all in server/os...
SM>> making all in server/dda/voxware...
SM>> rm -f auvoxware.o
SM>> cc -c -g -O -pipe -I. -I../../include -I../../../include -I../../dia -I../../../include -I/usr/X11R6/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO auvoxware.c
SM>> auvoxware.c:180:32: machine/pcaudioio.h: No such file or directory
SM>> *** Error code 1
SM>> Stop in /usr/ports/audio/nas/work/nas-1.7/server/dda/voxware.
SM>> *** Error code 1
DP> It's very strange.
DP> /usr/include/machine/pcaudioio.h live in tree in ages, and gcc include
DP> "-I/usr/include" search path automatically.
DP> Or you have non-i386 machine?
Oh, I found it. server/dda/voxware contains unused PC Speaker
functions (they are #ifdef'ed by AUDIO_GETINFO varible, which is not
used in any place in NAS sources more).
Try attached patch.
--
Dmitry "Red Fox" Panov @ Home | FreeBSD since September, 1995
Khabarovsk, Russia | YaIM:redfox_dm | Jabber.org:fluffy | ICQ:1745024
--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="nas-pcspkr.diff"
--- audio/nas/files/patch-ab Mon Nov 15 21:15:08 2004
+++ audio/nas/files/patch-ab Tue Nov 16 18:54:37 2004
@@ -9,7 +9,17 @@
#include <getopt.h>
#endif
#include <sys/types.h>
-@@ -670,7 +670,11 @@
+@@ -177,7 +177,9 @@
+ # else
+ # include <machine/soundcard.h>
+ # endif
++/* PC Speaker functions seems to be unused here
+ # include <machine/pcaudioio.h>
++*/
+ #else
+ # ifdef __NetBSD__
+ # include <sys/ioctl.h>
+@@ -670,7 +672,11 @@
if(sndStatOut.fd == -1)
{
while ((sndStatOut.fd = open(sndStatOut.device,
--d6Gm4EdcadzBjdND--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041116090258.GE48024>