View | Details | Raw Unified | Return to bug 73967
Collapse All | Expand All

(-)audio/nas/Makefile (-1 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	nas
8
PORTNAME=	nas
9
PORTVERSION=	1.6
9
PORTVERSION=	1.7
10
CATEGORIES=	audio
10
CATEGORIES=	audio
11
MASTER_SITES=	http://nas.codebrilliance.com/nas/
11
MASTER_SITES=	http://nas.codebrilliance.com/nas/
12
EXTRACT_SUFX=	.src.tar.gz
12
EXTRACT_SUFX=	.src.tar.gz
(-)audio/nas/distinfo (-2 / +4 lines)
Lines 1-2 Link Here
1
MD5 (nas-1.6.src.tar.gz) = 08b54fbf3af8c2ffab39f6f84f2ab337
1
SHA1 (nas-1.7.src.tar.gz) = a41adef84d0bf4c8e02b14d77bec0d284e7c9317
2
SIZE (nas-1.6.src.tar.gz) = 1099385
2
RMD160 (nas-1.7.src.tar.gz) = 227ddc4f5f9d264c97066dc461bad138776d1dfd
3
MD5 (nas-1.7.src.tar.gz) = c9918e9c9c95d587a95b455bbabe3b49
4
SIZE (nas-1.7.src.tar.gz) = 1288569
(-)audio/nas/files/patch-ab (-34 / +13 lines)
Lines 1-5 Link Here
1
--- server/dda/voxware/auvoxware.c.orig	Thu Jul 25 09:42:28 2002
1
--- server/dda/voxware/auvoxware.c.orig	Sat Oct 23 08:44:47 2004
2
+++ server/dda/voxware/auvoxware.c	Sat Oct 26 02:54:26 2002
2
+++ server/dda/voxware/auvoxware.c	Mon Nov 15 21:13:49 2004
3
@@ -133,7 +133,7 @@
3
@@ -133,7 +133,7 @@
4
 
4
 
5
 #include <stdio.h>
5
 #include <stdio.h>
Lines 9-48 Link Here
9
 #include <getopt.h>
9
 #include <getopt.h>
10
 #endif
10
 #endif
11
 #include <sys/types.h>
11
 #include <sys/types.h>
12
@@ -171,16 +171,11 @@
12
@@ -670,7 +670,11 @@
13
 #include <sys/param.h>
13
   if(sndStatOut.fd == -1)
14
 #include <assert.h>
15
 
16
-#ifdef __FreeBSD__
17
-# include <machine/soundcard.h>
18
-# include <machine/pcaudioio.h>
19
+#ifdef __NetBSD__
20
+# include <sys/ioctl.h>
21
+# include <soundcard.h>
22
 #else
23
-# ifdef __NetBSD__
24
-#  include <sys/ioctl.h>
25
-#  include <soundcard.h>
26
-# else
27
-#  include <sys/soundcard.h>
28
-# endif
29
+# include <sys/soundcard.h>
30
 #endif
31
 
32
 #include <audio/audio.h>
33
@@ -659,7 +654,11 @@
34
     if(sndStatOut.fd == -1)
35
     {
14
     {
36
        while ((sndStatOut.fd = open(sndStatOut.device, 
15
       while ((sndStatOut.fd = open(sndStatOut.device, 
37
+#if defined(__FreeBSD__)
16
+#if defined(__FreeBSD__)
38
+				    sndStatOut.howToOpen|extramode, 
17
+                                   sndStatOut.howToOpen|extramode, 
39
+#else
18
+#else
40
 				    sndStatOut.howToOpen|O_SYNC|extramode, 
19
                                    sndStatOut.howToOpen|O_SYNC|extramode, 
41
+#endif
20
+#endif
42
 				    0666)) == -1 && wait)
21
                                    0666)) == -1 && wait)
43
        {
22
         {
44
            osLogMsg("openDevice: waiting on output device\n");
23
           osLogMsg("openDevice: waiting on output device\n");
45
@@ -1310,6 +1309,11 @@
24
@@ -1330,6 +1334,11 @@
46
 /*
25
 /*
47
  * Setup soundcard at maximum audio quality.
26
  * Setup soundcard at maximum audio quality.
48
  */
27
  */
Lines 54-60 Link Here
54
 static void setupSoundcard(sndStatPtr)
33
 static void setupSoundcard(sndStatPtr)
55
 SndStat* sndStatPtr;
34
 SndStat* sndStatPtr;
56
 {
35
 {
57
@@ -1472,7 +1476,11 @@
36
@@ -1571,7 +1580,11 @@
58
 		   sndStatOut.device, sndStatOut.howToOpen);
37
 		   sndStatOut.device, sndStatOut.howToOpen);
59
 	
38
 	
60
 	if ((fd = open(sndStatOut.device, 
39
 	if ((fd = open(sndStatOut.device, 
Lines 65-68 Link Here
65
+#endif
44
+#endif
66
 	  {
45
 	  {
67
 	    UNIDENTMSG;
46
 	    UNIDENTMSG;
68
 	    return AuFalse;
47
             osLogMsg("Output open(%s) failed: %s\n",
(-)audio/nas/files/patch-ad (-11 lines)
Lines 1-11 Link Here
1
--- clients/audio/auedit/Graph.c.orig	Mon Oct 25 02:24:08 1999
2
+++ clients/audio/auedit/Graph.c	Sat Mar 25 14:56:23 2000
3
@@ -28,7 +28,7 @@
4
  */
5
 
6
 #ifndef WIN32
7
-# ifdef __NetBSD__
8
+# if defined(__NetBSD__) || defined(__FreeBSD__)
9
 #  include <limits.h>
10
 #  define MAXSHORT SHRT_MAX
11
 #  define MINSHORT SHRT_MIN
(-)audio/nas/files/patch-ae (-17 / +9 lines)
Lines 1-19 Link Here
1
--- lib/audio/Imakefile.orig	Sat Jan  1 18:28:13 2000
1
--- lib/audio/Imakefile.orig	Sun Sep 12 06:23:33 2004
2
+++ lib/audio/Imakefile	Sat Mar 25 14:56:19 2000
2
+++ lib/audio/Imakefile	Mon Nov 15 21:42:49 2004
3
@@ -64,10 +64,15 @@
3
@@ -60,7 +60,7 @@
4
     COMPAT_OBJS = AuGetBest.o
5
 #endif /* ProjectX < 5 */
6
 
4
 
7
+#if HasBSD44Sockets
5
 XCOMM JET - hmmm.
8
+   SOCK_DEFINES = -DBSD44SOCKETS
6
 #if (defined(FreeBSDArchitecture) || defined(BSDArchitecture)) && defined(HasBSD44Sockets)
9
+#endif
7
-	EXTRA_DEFINES = -DBSD44SOCKETS
10
+
8
+   EXTRA_DEFINES = -DBSD44SOCKETS
11
+
9
 #endif
12
      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
13
 
10
 
14
         DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
11
 XCOMM JET - see if we should avoid streams
15
-   CONN_DEFINES = ConnectionFlags
16
+   CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
17
 
18
 HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h    \
19
           voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \

Return to bug 73967