From owner-freebsd-ports  Sat Dec 16 16:40: 9 2000
From owner-freebsd-ports@FreeBSD.ORG  Sat Dec 16 16:40:02 2000
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 440E337B402
	for <freebsd-ports@hub.freebsd.org>; Sat, 16 Dec 2000 16:40:02 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eBH0e2d28437;
	Sat, 16 Dec 2000 16:40:02 -0800 (PST)
	(envelope-from gnats)
Resent-Date: Sat, 16 Dec 2000 16:40:02 -0800 (PST)
Resent-Message-Id: <200012170040.eBH0e2d28437@freefall.freebsd.org>
Resent-From: gnats-admin@FreeBSD.org (GNATS Management)
Resent-To: freebsd-ports@FreeBSD.org
Resent-Reply-To: gnats-admin@FreeBSD.org, naddy@mips.inka.de
Received: from mail.inka.de (quechua.inka.de [212.227.14.2])
	by hub.freebsd.org (Postfix) with ESMTP id 5140237B400
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 16 Dec 2000 16:30:39 -0800 (PST)
Received: from kemoauc.mips.inka.de (uucp@)
	by mail.inka.de with local-bsmtp 
	id 147Rii-0000kw-01; Sun, 17 Dec 2000 01:30:32 +0100
Received: (from naddy@localhost)
	by kemoauc.mips.inka.de (8.11.1/8.11.1) id eBH09tc04309;
	Sun, 17 Dec 2000 01:09:55 +0100 (CET)
	(envelope-from naddy)
Message-Id: <200012170009.eBH09tc04309@kemoauc.mips.inka.de>
Date: Sun, 17 Dec 2000 01:09:55 +0100 (CET)
From: Christian Weisgerber <naddy@mips.inka.de>
Reply-To: naddy@mips.inka.de
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/23592: audio/nas doesn't build on alpha
Resent-Sender: gnats@FreeBSD.org
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         23592
>Category:       ports
>Synopsis:       audio/nas doesn't build on alpha
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 16 16:40:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Christian Weisgerber
>Release:        FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Thu Dec 7 17:54:55 CET 2000 naddy@kemoauc.mips.inka.de:/usr/obj/usr/src/sys/KEMOAUC alpha

>Description:

The audio/nas port fails to build on alpha since it unconditionally
includes <machine/pcaudioio.h>, which is only available on i386.
Further references to the PC speaker audio subsystem are already
properly ifdef'ed, so only the #include needs to be conditionalized.

>How-To-Repeat:

>Fix:

diff -uNr --exclude=CVS /home/naddy/tmp/nas/files/patch-ab nas/files/patch-ab
--- /home/naddy/tmp/nas/files/patch-ab	Thu Mar 30 05:25:57 2000
+++ nas/files/patch-ab	Sat Dec 16 22:13:45 2000
@@ -1,6 +1,17 @@
---- server/dda/voxware/auvoxware.c.orig	Sun Mar  5 11:40:55 2000
-+++ server/dda/voxware/auvoxware.c	Sat Mar 25 15:18:36 2000
-@@ -610,7 +610,11 @@
+--- server/dda/voxware/auvoxware.c.orig	Sun Mar  5 03:40:55 2000
++++ server/dda/voxware/auvoxware.c	Sat Dec 16 22:11:35 2000
+@@ -156,7 +156,9 @@
+ 
+ #ifdef __FreeBSD__
+ # include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
++# ifdef __i386__
++#  include <machine/pcaudioio.h>
++# endif
+ #else
+ # ifdef __NetBSD__
+ #  include <sys/ioctl.h>
+@@ -610,7 +612,11 @@
  
      if(sndStatOut.fd == -1)
      {
@@ -12,7 +23,7 @@
         {
             osLogMsg("openDevice: waiting on output device\n");
             sleep(1);
-@@ -1230,6 +1234,11 @@
+@@ -1230,6 +1236,11 @@
  /*
   * Setup soundcard at maximum audio quality.
   */
@@ -24,7 +35,7 @@
  static void setupSoundcard(sndStatPtr)
  SndStat* sndStatPtr;
  {
-@@ -1380,7 +1389,11 @@
+@@ -1380,7 +1391,11 @@
  
      AL_initialized = AuTrue;
  

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message