FreeBSD Bugzilla – Attachment 48321 Details for
Bug 73967
Update audio/nas
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 5.31 KB, created by
Dmitry Panov
on 2004-11-15 13:00:48 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Dmitry Panov
Created:
2004-11-15 13:00:48 UTC
Size:
5.31 KB
patch
obsolete
>Index: audio/nas/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/nas/Makefile,v >retrieving revision 1.27 >diff -u -r1.27 Makefile >--- audio/nas/Makefile 14 Apr 2004 18:41:44 -0000 1.27 >+++ audio/nas/Makefile 15 Nov 2004 12:18:26 -0000 >@@ -6,7 +6,7 @@ > # > > PORTNAME= nas >-PORTVERSION= 1.6 >+PORTVERSION= 1.7 > CATEGORIES= audio > MASTER_SITES= http://nas.codebrilliance.com/nas/ > EXTRACT_SUFX= .src.tar.gz >Index: audio/nas/distinfo >=================================================================== >RCS file: /home/ncvs/ports/audio/nas/distinfo,v >retrieving revision 1.7 >diff -u -r1.7 distinfo >--- audio/nas/distinfo 27 Jan 2004 20:50:55 -0000 1.7 >+++ audio/nas/distinfo 15 Nov 2004 10:53:56 -0000 >@@ -1,2 +1,4 @@ >-MD5 (nas-1.6.src.tar.gz) = 08b54fbf3af8c2ffab39f6f84f2ab337 >-SIZE (nas-1.6.src.tar.gz) = 1099385 >+SHA1 (nas-1.7.src.tar.gz) = a41adef84d0bf4c8e02b14d77bec0d284e7c9317 >+RMD160 (nas-1.7.src.tar.gz) = 227ddc4f5f9d264c97066dc461bad138776d1dfd >+MD5 (nas-1.7.src.tar.gz) = c9918e9c9c95d587a95b455bbabe3b49 >+SIZE (nas-1.7.src.tar.gz) = 1288569 >Index: audio/nas/files/patch-ab >=================================================================== >RCS file: /home/ncvs/ports/audio/nas/files/patch-ab,v >retrieving revision 1.7 >diff -u -r1.7 patch-ab >--- audio/nas/files/patch-ab 26 Oct 2002 07:58:47 -0000 1.7 >+++ audio/nas/files/patch-ab 15 Nov 2004 11:15:08 -0000 >@@ -1,5 +1,5 @@ >---- server/dda/voxware/auvoxware.c.orig Thu Jul 25 09:42:28 2002 >-+++ server/dda/voxware/auvoxware.c Sat Oct 26 02:54:26 2002 >+--- server/dda/voxware/auvoxware.c.orig Sat Oct 23 08:44:47 2004 >++++ server/dda/voxware/auvoxware.c Mon Nov 15 21:13:49 2004 > @@ -133,7 +133,7 @@ > > #include <stdio.h> >@@ -9,40 +9,19 @@ > #include <getopt.h> > #endif > #include <sys/types.h> >-@@ -171,16 +171,11 @@ >- #include <sys/param.h> >- #include <assert.h> >- >--#ifdef __FreeBSD__ >--# include <machine/soundcard.h> >--# include <machine/pcaudioio.h> >-+#ifdef __NetBSD__ >-+# include <sys/ioctl.h> >-+# include <soundcard.h> >- #else >--# ifdef __NetBSD__ >--# include <sys/ioctl.h> >--# include <soundcard.h> >--# else >--# include <sys/soundcard.h> >--# endif >-+# include <sys/soundcard.h> >- #endif >- >- #include <audio/audio.h> >-@@ -659,7 +654,11 @@ >- if(sndStatOut.fd == -1) >+@@ -670,7 +670,11 @@ >+ if(sndStatOut.fd == -1) > { >- while ((sndStatOut.fd = open(sndStatOut.device, >+ while ((sndStatOut.fd = open(sndStatOut.device, > +#if defined(__FreeBSD__) >-+ sndStatOut.howToOpen|extramode, >++ sndStatOut.howToOpen|extramode, > +#else >- sndStatOut.howToOpen|O_SYNC|extramode, >+ sndStatOut.howToOpen|O_SYNC|extramode, > +#endif >- 0666)) == -1 && wait) >- { >- osLogMsg("openDevice: waiting on output device\n"); >-@@ -1310,6 +1309,11 @@ >+ 0666)) == -1 && wait) >+ { >+ osLogMsg("openDevice: waiting on output device\n"); >+@@ -1330,6 +1334,11 @@ > /* > * Setup soundcard at maximum audio quality. > */ >@@ -54,7 +33,7 @@ > static void setupSoundcard(sndStatPtr) > SndStat* sndStatPtr; > { >-@@ -1472,7 +1476,11 @@ >+@@ -1571,7 +1580,11 @@ > sndStatOut.device, sndStatOut.howToOpen); > > if ((fd = open(sndStatOut.device, >@@ -65,4 +44,4 @@ > +#endif > { > UNIDENTMSG; >- return AuFalse; >+ osLogMsg("Output open(%s) failed: %s\n", >Index: audio/nas/files/patch-ad >=================================================================== >RCS file: /home/ncvs/ports/audio/nas/files/patch-ad,v >retrieving revision 1.3 >diff -u -r1.3 patch-ad >--- audio/nas/files/patch-ad 30 Mar 2000 03:25:58 -0000 1.3 >+++ audio/nas/files/patch-ad 15 Nov 2004 11:18:25 -0000 >@@ -1,11 +0,0 @@ >---- clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999 >-+++ clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000 >-@@ -28,7 +28,7 @@ >- */ >- >- #ifndef WIN32 >--# ifdef __NetBSD__ >-+# if defined(__NetBSD__) || defined(__FreeBSD__) >- # include <limits.h> >- # define MAXSHORT SHRT_MAX >- # define MINSHORT SHRT_MIN >Index: audio/nas/files/patch-ae >=================================================================== >RCS file: /home/ncvs/ports/audio/nas/files/patch-ae,v >retrieving revision 1.2 >diff -u -r1.2 patch-ae >--- audio/nas/files/patch-ae 30 Mar 2000 03:25:58 -0000 1.2 >+++ audio/nas/files/patch-ae 15 Nov 2004 11:46:42 -0000 >@@ -1,19 +1,11 @@ >---- lib/audio/Imakefile.orig Sat Jan 1 18:28:13 2000 >-+++ lib/audio/Imakefile Sat Mar 25 14:56:19 2000 >-@@ -64,10 +64,15 @@ >- COMPAT_OBJS = AuGetBest.o >- #endif /* ProjectX < 5 */ >+--- lib/audio/Imakefile.orig Sun Sep 12 06:23:33 2004 >++++ lib/audio/Imakefile Mon Nov 15 21:42:49 2004 >+@@ -60,7 +60,7 @@ > >-+#if HasBSD44Sockets >-+ SOCK_DEFINES = -DBSD44SOCKETS >-+#endif >-+ >-+ >- EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" >+ XCOMM JET - hmmm. >+ #if (defined(FreeBSDArchitecture) || defined(BSDArchitecture)) && defined(HasBSD44Sockets) >+- EXTRA_DEFINES = -DBSD44SOCKETS >++ EXTRA_DEFINES = -DBSD44SOCKETS >+ #endif > >- DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) >-- CONN_DEFINES = ConnectionFlags >-+ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES) >- >- HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \ >- voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \ >+ XCOMM JET - see if we should avoid streams
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 73967
: 48321