From 2c311f5a8ba0bdde914684db316dbedef46e3c0b Mon Sep 17 00:00:00 2001 From: hubertf Date: Sun, 19 Jan 2003 21:31:06 +0000 Subject: Update csound-path to 4.23. No useful list of changes, feel free to look at the ChangeLog. Update submitted by collver1@attbi.com in PR 19905 --- audio/csound-bath/Makefile | 7 ++- audio/csound-bath/PLIST | 5 +- audio/csound-bath/distinfo | 34 +++++----- audio/csound-bath/files/rtNetBSD.c | 123 +++++++++++++++++++++---------------- audio/csound-bath/files/rtNetBSD.h | 5 -- audio/csound-bath/patches/patch-aa | 91 +++++++++++++-------------- audio/csound-bath/patches/patch-ac | 12 ++-- audio/csound-bath/patches/patch-ad | 12 ++-- audio/csound-bath/patches/patch-ae | 28 +++++---- audio/csound-bath/patches/patch-af | 12 ++-- audio/csound-bath/patches/patch-ag | 34 +++++----- audio/csound-bath/patches/patch-ai | 10 +-- audio/csound-bath/patches/patch-ak | 25 -------- audio/csound-bath/patches/patch-ap | 22 +++++-- audio/csound-bath/patches/patch-ar | 6 +- audio/csound-bath/patches/patch-at | 12 ++-- audio/csound-bath/patches/patch-au | 56 +++++++++++++++++ audio/csound-bath/patches/patch-av | 13 ++++ audio/csound-bath/patches/patch-aw | 13 ++++ audio/csound-bath/patches/patch-ax | 13 ++++ audio/csound-bath/patches/patch-ay | 14 +++++ audio/csound-bath/patches/patch-az | 14 +++++ audio/csound-bath/patches/patch-ba | 14 +++++ 23 files changed, 363 insertions(+), 212 deletions(-) delete mode 100644 audio/csound-bath/patches/patch-ak create mode 100644 audio/csound-bath/patches/patch-au create mode 100644 audio/csound-bath/patches/patch-av create mode 100644 audio/csound-bath/patches/patch-aw create mode 100644 audio/csound-bath/patches/patch-ax create mode 100644 audio/csound-bath/patches/patch-ay create mode 100644 audio/csound-bath/patches/patch-az create mode 100644 audio/csound-bath/patches/patch-ba (limited to 'audio/csound-bath') diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile index 926deb0e370..6572e47cff5 100644 --- a/audio/csound-bath/Makefile +++ b/audio/csound-bath/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 18:55:33 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/19 21:31:07 hubertf Exp $ # -DISTNAME= Csound4.18 -PKGNAME= csound-bath-4.18 +DISTNAME= Csound4.23 +PKGNAME= csound-bath-4.23 CATEGORIES= audio MASTER_SITES= ftp://ftp.cs.bath.ac.uk/pub/dream/newest/ @@ -18,6 +18,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR} DIST_SUBDIR= csound CONFLICTS= csound-4* +USE_GMAKE= yes pre-patch: ${CP} ${FILESDIR}/rtNetBSD.c ${FILESDIR}/rtNetBSD.h ${WRKSRC} diff --git a/audio/csound-bath/PLIST b/audio/csound-bath/PLIST index 4e085fed820..11c4c3040d9 100644 --- a/audio/csound-bath/PLIST +++ b/audio/csound-bath/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2002/03/23 02:22:59 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/19 21:31:08 hubertf Exp $ bin/csound bin/hetro bin/lpanal bin/pvanal +bin/cvanal bin/scot bin/extract bin/scsort @@ -15,8 +16,6 @@ bin/pvlook bin/srconv bin/dnoise bin/sdif2ad -share/csound/csound.xmg include/cscore.h lib/libcsound.a lib/libcscore.a -@dirrm share/csound diff --git a/audio/csound-bath/distinfo b/audio/csound-bath/distinfo index 86e0f51ff39..b1473c6f51f 100644 --- a/audio/csound-bath/distinfo +++ b/audio/csound-bath/distinfo @@ -1,20 +1,26 @@ -$NetBSD: distinfo,v 1.4 2002/04/28 14:44:13 tron Exp $ +$NetBSD: distinfo,v 1.5 2003/01/19 21:31:09 hubertf Exp $ -SHA1 (csound/Csound4.18.tar.gz) = 79c0f9c6bc47efe38290b6bf5f5b39f09b4c3db7 -Size (csound/Csound4.18.tar.gz) = 1024507 bytes -SHA1 (patch-aa) = e6d0bc9090c3683a01b793cd31893bf69eb971c6 +SHA1 (csound/Csound4.23.tar.gz) = 15b18ee60b4690aa48593dc3b5d44a9473d0cb16 +Size (csound/Csound4.23.tar.gz) = 1172388 bytes +SHA1 (patch-aa) = de2db03ecabf8d392eafaeb022d1122af264f23d SHA1 (patch-ab) = 3301b22ea79b0b87a4323835050f88eb3975c40e -SHA1 (patch-ac) = 183386b90a0aabb3d8f4d6c80b430e4db565c396 -SHA1 (patch-ad) = a09ad93b20b367d74e441736dfe267a9f4e30df5 -SHA1 (patch-ae) = c9806815a5a1599d9d0f173138a59d68c31d7a54 -SHA1 (patch-af) = fa3bb19ec3b47bbf8797323f89e593b2bdab0821 -SHA1 (patch-ag) = 08d3ab428b82927095de3611800724bd5f5c9649 -SHA1 (patch-ai) = 7766101a8943fd66bf5b50c2aebefc741feb0c45 -SHA1 (patch-ak) = fe5588a4157d6900f102678043df4bac7beab663 +SHA1 (patch-ac) = 7b4838120b3337277732075fa4253090c6a892a4 +SHA1 (patch-ad) = 8b3bbddf40a59ff2ee5165eb03cc13e8b8b7d71d +SHA1 (patch-ae) = 7a0840abf9bd6630205934fab8dd4a7b42d04e1a +SHA1 (patch-af) = 59c0726958844315255f360f3ab6dfe2ed538d3d +SHA1 (patch-ag) = 613350099e4890efa79de07c820325423fa8e13b +SHA1 (patch-ai) = a66207be90ff96c975d906aa716b9ced63d021f2 SHA1 (patch-al) = b4e8ec2ba935e205bd28aa7ffdfe4d0def7dc4dc SHA1 (patch-am) = f925c70452402bf90f63b953fa1b6ef02480d912 -SHA1 (patch-ap) = 1d7bcb4313f6b89e69ff8f87df31ce4f35dbb5f1 +SHA1 (patch-ap) = da2f992df5be8a9eaf888aee70ba84bd82252965 SHA1 (patch-aq) = ba44c4a8fb1ccb3bde72d1a28a7943b08e418bc2 -SHA1 (patch-ar) = f57ecfcd3481c22f949c749e4f4b20f05b2f9c9b +SHA1 (patch-ar) = 3219f640f11654b1502a4a9aebfadd4661efbcac SHA1 (patch-as) = a3c0097b29188c82432a07de9e5ef8ca7492feaf -SHA1 (patch-at) = 18dfab013d17e29583bdf74c59383a56d67a1e86 +SHA1 (patch-at) = 1841be062be33ea5f1cdad561bb106e28d69ffab +SHA1 (patch-au) = 8779283f3c375ee036af442dc28168f69e71e86e +SHA1 (patch-av) = 8ab462bcd3ad550013d3b6e939f8fbe960b65b5c +SHA1 (patch-aw) = a23249d81ebea09fa2bead35f39041e0e643d9a7 +SHA1 (patch-ax) = 84479915449e6dfddcd0c31f38418238bacbd013 +SHA1 (patch-ay) = 510334f831598ea5d423f798faeb6b991cb4c880 +SHA1 (patch-az) = a7a90801511f5142e797537cf9d62ff4f322e273 +SHA1 (patch-ba) = 5fba504106a30258308ef01b6900854251087e4b diff --git a/audio/csound-bath/files/rtNetBSD.c b/audio/csound-bath/files/rtNetBSD.c index abc066f9d89..76834a44d41 100644 --- a/audio/csound-bath/files/rtNetBSD.c +++ b/audio/csound-bath/files/rtNetBSD.c @@ -17,15 +17,11 @@ #include "soundio.h" #include "rtNetBSD.h" -static int dspfd; +static int dspfd_in = -1, dspfd_out = -1; static int ishift = 0, oshift = 0, oMaxLag; -extern long nrecs; - long inrecs; extern OPARMS O; -extern int Linefd; #ifdef PIPES -extern FILE* Linepipe; # define _pclose pclose #endif @@ -43,7 +39,7 @@ static int getshift(int dsize) /* turn sample- or frame-size into shiftsize */ void display_audio_info( - int fd, + int dspfd, const char *message, audio_info_t *info) { @@ -51,7 +47,7 @@ void display_audio_info( char *encoding_name; encoding.index = info->play.encoding; - if (ioctl(fd, AUDIO_GETENC, &encoding) == -1) { + if (ioctl(dspfd, AUDIO_GETENC, &encoding) == -1) { asprintf(&encoding_name, "%d", info->play.encoding); } else { encoding_name = strdup(encoding.name); @@ -66,10 +62,10 @@ void display_audio_info( } void setsndparms( - int fd, + int dspfd, int format, - int nchnls, - MYFLT esr, + int nchanls, + float sr, unsigned bufsiz) { audio_info_t info; @@ -113,8 +109,8 @@ void setsndparms( die("unknown sample format"); } - info.play.channels = nchnls; - info.play.sample_rate = (unsigned int) esr; + info.play.channels = nchanls; + info.play.sample_rate = (unsigned int) sr; /* set DMA buffer fragment size to Csound's output buffer size */ /* @@ -137,15 +133,15 @@ void setsndparms( if (info.hiwat == 0) info.hiwat = 65536; - if (ioctl(fd, AUDIO_SETINFO, &info) == -1) { - display_audio_info(fd, "requested", &info); - if (ioctl(fd, AUDIO_GETINFO, &info) != -1) - display_audio_info(fd, "got", &info); + if (ioctl(dspfd, AUDIO_SETINFO, &info) == -1) { + display_audio_info(dspfd, "requested", &info); + if (ioctl(dspfd, AUDIO_GETINFO, &info) != -1) + display_audio_info(dspfd, "got", &info); die("unable to configure soundcard"); } } -int find_mixer_label(int fd, int class, const char *name) +int find_mixer_label(int dspfd, int class, const char *name) { int i; int mclass; @@ -154,7 +150,7 @@ int find_mixer_label(int fd, int class, const char *name) for (i = 0; ; i++) { info.index = i; - if (ioctl(fd, AUDIO_MIXER_DEVINFO, &info) < 0) + if (ioctl(dspfd, AUDIO_MIXER_DEVINFO, &info) < 0) break; mclass = info.mixer_class; if ((info.index == mclass || class == mclass) && @@ -168,8 +164,7 @@ int find_mixer_label(int fd, int class, const char *name) void setvolume(unsigned volume) { - int fd; - int i; + int mixfd; int output_class; int vol_output; mixer_devinfo_t info; @@ -177,39 +172,38 @@ void setvolume(unsigned volume) /* volume must be between 0 and 255 */ - if ((fd = open(NETBSD_MIXER, O_WRONLY)) == -1) + if ((mixfd = open(NETBSD_MIXER, O_WRONLY)) == -1) die("unable to open soundcard mixer for setting volume"); - output_class = find_mixer_label(fd, 0, "outputs"); - vol_output = find_mixer_label(fd, output_class, "master"); + output_class = find_mixer_label(mixfd, 0, "outputs"); + vol_output = find_mixer_label(mixfd, output_class, "master"); if (vol_output == -1) die("Could not find mixer control for audio output."); info.index = vol_output; - ioctl(fd, AUDIO_MIXER_DEVINFO, &info); + ioctl(mixfd, AUDIO_MIXER_DEVINFO, &info); value.dev = vol_output; value.type = info.type; value.un.value.num_channels = 2; - if (ioctl(fd, AUDIO_MIXER_READ, &value) < 0) { + if (ioctl(mixfd, AUDIO_MIXER_READ, &value) < 0) { value.un.value.num_channels = 1; - if (ioctl(fd, AUDIO_MIXER_READ, &value) < 0) + if (ioctl(mixfd, AUDIO_MIXER_READ, &value) < 0) die("unable to read mixer on soundcard"); } value.un.value.level[0] = 192; value.un.value.level[1] = 192; - if (ioctl(fd, AUDIO_MIXER_WRITE, &value) < 0) { + if (ioctl(mixfd, AUDIO_MIXER_WRITE, &value) < 0) { die("unable to set output volume on soundcard"); } } -void NetBSD_open(int nchnls, int dsize, MYFLT esr, int scale, int audio_mode) +void NetBSD_open(int nchanls, int dsize, float sr, int scale, int audio_mode) { - int dup; int wbufsiz; int audio_props; audio_device_t device_info; @@ -223,31 +217,31 @@ void NetBSD_open(int nchnls, int dsize, MYFLT esr, int scale, int audio_mode) wbufsiz = oMaxLag * O.insampsiz; switch (audio_mode) { case NETBSD_RECORD: - if ((dspfd = open(NETBSD_SAMPLER, O_RDONLY)) == -1) + if ((dspfd_in = open(NETBSD_SAMPLER, O_RDONLY)) == -1) die("error while opening soundcard for audio input"); - setsndparms(dspfd, O.informat, nchnls, esr, wbufsiz); + setsndparms(dspfd_in, O.informat, nchanls, sr, wbufsiz); ishift = getshift(dsize); break; case NETBSD_PLAY: - if ((dspfd = open(NETBSD_SAMPLER, O_WRONLY)) == -1) { + if ((dspfd_out = open(NETBSD_SAMPLER, O_WRONLY)) == -1) { perror("foo"); die("error while opening soundcard for audio output"); } - setsndparms(dspfd, O.outformat, nchnls, esr, wbufsiz); + setsndparms(dspfd_out, O.outformat, nchanls, sr, wbufsiz); /* 'oshift' is not currently used by the Linux driver, but... */ - oshift = getshift(nchnls * dsize); + oshift = getshift(nchanls * dsize); break; case NETBSD_DUPLEX: - if ((dspfd = open(NETBSD_SAMPLER, O_RDWR)) == -1) + if ((dspfd_out = dspfd_in = open(NETBSD_SAMPLER, O_RDWR)) == -1) die("error during soundcard duplex mode query:"); - ioctl(dspfd, AUDIO_GETPROPS, &audio_props); + ioctl(dspfd_in, AUDIO_GETPROPS, &audio_props); if (!(audio_props | AUDIO_PROP_FULLDUPLEX)) die("hardware does not support full duplex mode"); - setsndparms(dspfd, O.outformat, nchnls, esr, wbufsiz); - if (ioctl(dspfd, AUDIO_SETFD, audio_props) == -1) + setsndparms(dspfd_in, O.outformat, nchanls, sr, wbufsiz); + if (ioctl(dspfd_in, AUDIO_SETFD, audio_props) == -1) die("error setting hardware to full duplex mode"); /* are these functions both required? */ - oshift = getshift(nchnls * dsize); + oshift = getshift(nchanls * dsize); ishift = getshift(dsize); break; default: @@ -256,25 +250,36 @@ void NetBSD_open(int nchnls, int dsize, MYFLT esr, int scale, int audio_mode) exit(1); } - ioctl(dspfd, AUDIO_GETDEV, &device_info); - fprintf(stderr, "NetBSD audio info: %s, %s, %s\n", - device_info.name, - device_info.version, - device_info.config); + if (dspfd_in >= 0) { + ioctl(dspfd_in, AUDIO_GETDEV, &device_info); + fprintf(stderr, "NetBSD input audio info: %s, %s, %s\n", + device_info.name, + device_info.version, + device_info.config); + } + + if (dspfd_out >= 0) { + ioctl(dspfd_out, AUDIO_GETDEV, &device_info); + fprintf(stderr, "NetBSD output audio info: %s, %s, %s\n", + device_info.name, + device_info.version, + device_info.config); + } + #ifdef USE_SETSCHEDULER setscheduler(); #endif } -int rtrecord(char *inbuf, int nbytes) /* get samples from ADC */ +int rtrecord_(char *inbuf, int nbytes) /* get samples from ADC */ { /* J. Mohr 1995 Oct 17 */ - if ( (nbytes = read(dspfd, inbuf, nbytes)) == -1 ) + if ( (nbytes = read(dspfd_in, inbuf, nbytes)) == -1 ) die("error while reading DSP device for audio input"); return(nbytes); } -void rtplay(char *outbuf, int nbytes) /* put samples to DAC */ +void rtplay_(char *outbuf, int nbytes) /* put samples to DAC */ /* N.B. This routine serves as a THROTTLE in Csound Realtime Performance, */ /* delaying the actual writes and return until the hardware output buffer */ /* passes a sample-specific THRESHOLD. If the I/O BLOCKING functionality */ @@ -287,18 +292,22 @@ void rtplay(char *outbuf, int nbytes) /* put samples to DAC */ /* eliminate MIDI jitter by requesting that both be made synchronous with */ /* the above audio I/O blocks, i.e. by setting -b to some 1 or 2 K-prds. */ { - long sampframes = nbytes >> oshift; + /* long sampframes = nbytes >> oshift; */ /* J. Mohr 1995 Oct 17 */ - if (write(dspfd, outbuf, nbytes) < nbytes) + if (write(dspfd_out, outbuf, nbytes) < nbytes) printf("/dev/audio: couldn't write all bytes requested\n"); nrecs++; } -void rtclose(void) /* close the I/O device entirely */ +void rtclose_(void) /* close the I/O device entirely */ { /* called only when both complete */ /* J. Mohr 1995 Oct 17 */ - if (close(dspfd) == -1) - die("unable to close DSP device"); + if (dspfd_in >= 0 && close(dspfd_in) == -1) + die("unable to close DSP input device"); + + if (dspfd_out >= 0 && close(dspfd_out) == -1) + die("unable to close DSP output device"); + if (O.Linein) { #ifdef PIPES if (O.Linename[0]=='|') _pclose(Linepipe); @@ -307,3 +316,13 @@ void rtclose(void) /* close the I/O device entirely */ if (strcmp(O.Linename, "stdin")!=0) close(Linefd); } } + +void recopen_(int nchanls, int dsize, float sr, int scale) +{ + NetBSD_open(nchanls, dsize, sr, scale, NETBSD_DUPLEX); +} + +void playopen_(int nchanls, int dsize, float sr, int scale) +{ + NetBSD_open(nchanls, dsize, sr, scale, NETBSD_PLAY); +} diff --git a/audio/csound-bath/files/rtNetBSD.h b/audio/csound-bath/files/rtNetBSD.h index c57ac466386..56808affb1e 100644 --- a/audio/csound-bath/files/rtNetBSD.h +++ b/audio/csound-bath/files/rtNetBSD.h @@ -12,9 +12,4 @@ #define NETBSD_MIXER "/dev/mixer0" #define NETBSD_SAMPLER "/dev/sound0" -#define recopen(a,b,c,d) NetBSD_open(a,b,c,d,NETBSD_DUPLEX) -#define playopen(a,b,c,d) NetBSD_open(a,b,c,d,NETBSD_PLAY) - -extern void NetBSD_open(int, int, MYFLT, int, int); - #endif /* _RTNETBSD_INCLUDED */ diff --git a/audio/csound-bath/patches/patch-aa b/audio/csound-bath/patches/patch-aa index b404790345e..5c53249ecc6 100644 --- a/audio/csound-bath/patches/patch-aa +++ b/audio/csound-bath/patches/patch-aa @@ -1,90 +1,87 @@ -$NetBSD: patch-aa,v 1.2 2002/03/23 02:23:00 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $ ---- Makefile.orig Thu Jan 31 00:58:43 2002 +--- Makefile.orig Mon Dec 16 00:32:21 2002 +++ Makefile -@@ -1,11 +1,11 @@ +@@ -1,10 +1,10 @@ # Csound Makefile # edit the following definitions according to need: -INCLUDE = /usr/local/include -LIB = /usr/local/lib -DEST = /usr/local/bin --SHARE = /usr/share/csound -MAN = /usr/local/man +INCLUDE = $(PREFIX)/include +LIB = $(PREFIX)/lib +DEST = $(PREFIX)/bin -+SHARE = $(PREFIX)/share/csound +MAN = $(PREFIX)/man MAN1 = $(MAN)/man1 CAT1 = $(MAN)/cat1 # these directories must exist for stages beyond 'make csound' -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ # .c.o: # $(CC) $(CFLAGS) -c $*.c -o $@ --DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -+DEFINES = -DNETBSDRTAUDIO -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DBSD -DPREFIX=\"$(PREFIX)\" +-DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DHAVE_FLTK ++DEFINES = -DNETBSDRTAUDIO -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DPREFIX=\"$(PREFIX)\" # choose any of - # -DSYS5 invoke System 5 headers (e.g. 'string.h' for 'strings.h') # -DWINDOWS include window system calls (X11, SGI, or FG graphics) -@@ -52,7 +52,7 @@ - # Be sure to include 'LINUXaudio.o' under 'AUDOBJ' below as well. - # -- Jonathan Mohr 1995 Oct 17 +@@ -50,7 +50,7 @@ + # (e.g., Linux on SPARC [not tested]), you should also define - + # -DLINUX_BE Linux audio device handler for big-endian samples --CFLAGS = -O2 -march=i686 -malign-loops=4 -malign-jumps=4 -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) -+CFLAGS = $(RPM_OPT_FLAGS) $(DEFINES) +-CFLAGS = -Wall -O2 -malign-loops=4 -malign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) ++CFLAGS = -Wall $(RPM_OPT_FLAGS) $(DEFINES) # -O Simple optimisation # -O2 to be more specific about the optimization level # -f compile single-precision floats (4.3,VAX,DEC-RISC) -@@ -76,7 +76,7 @@ - # -I/usr/openwin/include Solaris openwin interface - # -I/usr/demo/SOUND/include Solaris sound interface +@@ -90,12 +90,12 @@ + # + CXX = g++ + CXXFLAGS = -fno-exceptions -fno-rtti +-FLTKSRC = widgets.cpp +-FLTKOBJ = widgets.o ++FLTKSRC = ++FLTKOBJ = + # source and object files for FLTK widgets + #FLTKLIB = -lfltk -lpthread -lg++ +-FLTKLIB = /usr/local/lib/libfltk.a /usr/lib/libpthread.a \ +- /usr/lib/libstdc++-libc6.2-2.a.3 ++FLTKLIB = ++ + # libraries required by widgets.cpp + # -lfltk -lpthread -lg++ use dynamic libraries + # +@@ -105,7 +105,7 @@ + # directiories and version + # numbers are system-dependent) --LIBS = -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm +-LIBS = $(FLTKLIB) -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm -ldl +LIBS = $(LDFLAGS) -lm # -lefence # -lm required # -lX11 for X window calls -@@ -93,16 +93,16 @@ - # -L/usr/demo/SOUND/lib on Solaris 2.4 - # -L/usr/X11R6/li on LINUX +@@ -124,8 +124,8 @@ + # note: SuSE 7.3 users should use -ltcl8.3 -ltk8.3, but another + # (probably better) solution is to create symbolic links --WINSRC = winX11.c --WINOBJ = winX11.o +-WINSRC = winFLTK.c FL_graph.cpp +-WINOBJ = winFLTK.o FL_graph.o +WINSRC = +WINOBJ = # ;if WINDOWS enabled in DEFINES, choose one of - # winX11.o for X11 window graphics # winSGI.o for SGI window graphics - # winfg.o for PC Flash Graphics +@@ -135,8 +135,10 @@ - --AUDSRC = rtlinux.c LINUXaudio.c --AUDOBJ = rtlinux.o LINUXaudio.o + #AUDSRC = rtlinux.c LINUXaudio.c + #AUDOBJ = rtlinux.o LINUXaudio.o +-AUDSRC = rtalsa.c +-AUDOBJ = rtalsa.c ++#AUDSRC = rtalsa.c ++#AUDOBJ = rtalsa.c +AUDSRC = rtNetBSD.c +AUDOBJ = rtNetBSD.o # ;if RTAUDIO enabled in DEFINES, include one of # rtaudio.o general interface to audio handlers & libraries # rtDEC.c rtSGI.c rtHP.c rtSUN.c -@@ -342,13 +342,13 @@ - cd midifils; rm -f *.bak *~ - cd cscofils; rm -f *.bak *~ - --CSLinux.bin.tgz: /usr/local/bin/csound /usr/local/bin/hetro \ -- /usr/local/bin/lpanal /usr/local/bin/pvanal /usr/local/bin/scot \ -- /usr/local/bin/scsort /usr/local/bin/extract /usr/local/bin/sndinfo \ -- /usr/local/bin/scale /usr/local/bin/mixer /usr/local/bin/extractor \ -- /usr/local/bin/envext /usr/local/bin/pvlook /usr/local/bin/sdif2ad \ -- /usr/local/bin/dnoise /usr/local/bin/srconv -- (cd /usr/local/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \ -+CSNetBSD.bin.tgz: $(PREFIX)/bin/csound $(PREFIX)/bin/hetro \ -+ $(PREFIX)/bin/lpanal $(PREFIX)/bin/pvanal $(PREFIX)/bin/scot \ -+ $(PREFIX)/bin/scsort $(PREFIX)/bin/extract $(PREFIX)/bin/sndinfo \ -+ $(PREFIX)/bin/scale $(PREFIX)/bin/mixer $(PREFIX)/bin/extractor \ -+ $(PREFIX)/bin/envext $(PREFIX)/bin/pvlook $(PREFIX)/bin/sdif2ad \ -+ $(PREFIX)/bin/dnoise $(PREFIX)/bin/srconv -+ (cd $(PREFIX)/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \ - hetro lpanal pvanal scot scsort extract sndinfo scale mixer \ - extractor envext pvlook sdif2ad dnoise srconv) - diff --git a/audio/csound-bath/patches/patch-ac b/audio/csound-bath/patches/patch-ac index f0392aa9399..6ad8fbad422 100644 --- a/audio/csound-bath/patches/patch-ac +++ b/audio/csound-bath/patches/patch-ac @@ -1,13 +1,15 @@ -$NetBSD: patch-ac,v 1.1 2002/03/23 02:23:00 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2003/01/19 21:31:11 hubertf Exp $ ---- anal/lpc/makef.orig Sun May 16 20:04:06 1999 +--- anal/lpc/makef.orig Tue Oct 8 06:53:00 2002 +++ anal/lpc/makef -@@ -6,7 +6,7 @@ +@@ -6,8 +6,8 @@ OBJS = main.o $T/lpanal.o $T/lptrkfns.o $T/filopen.o $T/sfheader.o \ $T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o \ -- $T/memalloc.o $T/window.o $T/winX11.o $T/winascii.o $T/winEPS.o \ +- $T/memalloc.o $T/window.o $T/winFLTK.o $T/winascii.o $T/winEPS.o \ +- $T/aifc.o $T/getstring.o $T/FL_graph.o + $T/memalloc.o $T/window.o $T/winascii.o $T/winEPS.o \ - $T/aifc.o $T/getstring.o ++ $T/aifc.o $T/getstring.o lpcs: lpanal + diff --git a/audio/csound-bath/patches/patch-ad b/audio/csound-bath/patches/patch-ad index 3271495484c..19734a6f04a 100644 --- a/audio/csound-bath/patches/patch-ad +++ b/audio/csound-bath/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2003/01/19 21:31:11 hubertf Exp $ ---- midirecv.c.orig Sun Mar 25 05:42:24 2001 -+++ midirecv.c Thu Apr 5 13:39:35 2001 +--- midirecv.c.orig Fri Dec 13 01:28:50 2002 ++++ midirecv.c @@ -3,6 +3,8 @@ #include "midiops.h" #include "oload.h" +#include + - #ifdef SGI - /************************************/ - /* obsolete SGI code */ + #define MBUFSIZ 1024 + #define ON 1 + #define OFF 0 diff --git a/audio/csound-bath/patches/patch-ae b/audio/csound-bath/patches/patch-ae index 32d92e35b70..79f505723b0 100644 --- a/audio/csound-bath/patches/patch-ae +++ b/audio/csound-bath/patches/patch-ae @@ -1,25 +1,29 @@ -$NetBSD: patch-ae,v 1.2 2002/03/23 02:23:00 wiz Exp $ +$NetBSD: patch-ae,v 1.3 2003/01/19 21:31:11 hubertf Exp $ ---- midisend.c.orig Sun Nov 18 09:05:57 2001 +--- midisend.c.orig Mon Nov 11 01:01:15 2002 +++ midisend.c -@@ -16,8 +16,18 @@ +@@ -16,10 +16,24 @@ #include #include #include --#ifdef FREE_BSD --# include -+#ifdef BSD -+#include -+#define SEQ_MIDIPUTC SEQOLD_MIDIPUTC -+#define SEQ_DEFINEBUF(len) unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0 -+#define _SEQ_ADVBUF(len) _seqbufptr += len -+#define _SEQ_NEEDBUF(len) if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump() -+#define SEQ_MIDIOUT(device, byte) {_SEQ_NEEDBUF(4);\ ++#ifdef __NetBSD__ ++# include ++# define SEQ_MIDIPUTC SEQOLD_MIDIPUTC ++# define SEQ_DEFINEBUF(len) unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0 ++# define _SEQ_ADVBUF(len) _seqbufptr += len ++# define _SEQ_NEEDBUF(len) if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump() ++# define SEQ_MIDIOUT(device, byte) {_SEQ_NEEDBUF(4);\ + _seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\ + _seqbuf[_seqbufptr+1] = (byte);\ + _seqbuf[_seqbufptr+2] = (device);\ + _seqbuf[_seqbufptr+3] = 0;\ + _SEQ_ADVBUF(4);} ++#else + #ifdef __FreeBSD__ + # include #else # include ++#endif #endif + + #define MIDI_DEV "/dev/sequencer" diff --git a/audio/csound-bath/patches/patch-af b/audio/csound-bath/patches/patch-af index 28890967f8f..9a5b1f53b13 100644 --- a/audio/csound-bath/patches/patch-af +++ b/audio/csound-bath/patches/patch-af @@ -1,13 +1,15 @@ -$NetBSD: patch-af,v 1.2 2002/03/23 02:23:00 wiz Exp $ +$NetBSD: patch-af,v 1.3 2003/01/19 21:31:11 hubertf Exp $ ---- anal/pvoc/makef.orig Sun Aug 19 21:49:21 2001 +--- anal/pvoc/makef.orig Tue Oct 8 06:53:33 2002 +++ anal/pvoc/makef -@@ -7,7 +7,7 @@ +@@ -7,8 +7,8 @@ OBJS = main.o $T/pvanal.o $T/pvxanal.o $T/pvfileio.o $T/filopen.o \ $T/sfheader.o $T/mxfft.o \ $T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o $T/memalloc.o \ -- $T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winX11.o $T/winascii.o \ +- $T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winFLTK.o $T/winascii.o \ +- $T/winEPS.o $T/aifc.o $T/getstring.o $T/FL_graph.o + $T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winascii.o \ - $T/winEPS.o $T/aifc.o $T/getstring.o ++ $T/winEPS.o $T/aifc.o $T/getstring.o pvocs: pvanal + diff --git a/audio/csound-bath/patches/patch-ag b/audio/csound-bath/patches/patch-ag index 0461ec5d522..3234e5dc44e 100644 --- a/audio/csound-bath/patches/patch-ag +++ b/audio/csound-bath/patches/patch-ag @@ -1,26 +1,26 @@ -$NetBSD: patch-ag,v 1.2 2002/03/23 02:23:01 wiz Exp $ +$NetBSD: patch-ag,v 1.3 2003/01/19 21:31:11 hubertf Exp $ ---- extract.c.orig Tue Nov 6 13:23:36 2001 +--- extract.c.orig Sun Nov 10 06:54:08 2002 +++ extract.c @@ -6,7 +6,7 @@ - static char inslst[INSMAX]; /* values set by readxfil */ - static int onsect, offsect; /* " " " */ - static MYFLT onbeat, offbeat; /* " " " */ --static MYFLT ontime, offtime; /* set by readxfil, mod by w-stmnt */ -+static MYFLT ontime, cs_offtime; /* set by readxfil, mod by w-stmnt */ + static char inslst[INSMAX]; /* values set by readxfil */ + static int onsect, offsect; /* " " " */ + static MYFLT onbeat, offbeat; /* " " " */ +-static MYFLT ontime, offtime; /* set by readxfil, mod by w-stmnt */ ++static MYFLT ontime, cs_offtime; /* set by readxfil, mod by w-stmnt */ - static SRTBLK *frstout, *prvout; /* links for building new outlist */ + static SRTBLK *frstout, *prvout; /* links for building new outlist */ -@@ -56,7 +56,7 @@ - for(ip = &inslst[0]; ip < &inslst[INSMAX]; *ip++ = 1); - } - ontime = a0.newp3 = a0.p3val = onbeat; -- offtime = f0.newp2 = f0.p2val = offbeat; -+ cs_offtime = f0.newp2 = f0.p2val = offbeat; +@@ -59,7 +59,7 @@ + for(ip = &inslst[0]; ip < &inslst[INSMAX]; *ip++ = 1); + } + ontime = a0.newp3 = a0.p3val = onbeat; +- offtime = f0.newp2 = f0.p2val = offbeat; ++ cs_offtime = f0.newp2 = f0.p2val = offbeat; } void extract(void) /* extract instr events within the time period */ -@@ -101,7 +101,7 @@ +@@ -104,7 +104,7 @@ if (sectno == onsect && warped) ontime = a0.newp3 = realt(onbeat); if (sectno == offsect && warped) @@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/23 02:23:01 wiz Exp $ include(bp); break; case 't': -@@ -110,7 +110,7 @@ +@@ -113,7 +113,7 @@ case 'f': casef: if (sectno == onsect && bp->newp2 < ontime) bp->newp2 = ontime; @@ -38,7 +38,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/23 02:23:01 wiz Exp $ break; if (sectno == onsect && !a0done) { if (onbeat > 0) -@@ -137,10 +137,10 @@ +@@ -140,10 +140,10 @@ } } if (sectno == offsect) { diff --git a/audio/csound-bath/patches/patch-ai b/audio/csound-bath/patches/patch-ai index b9c536efdf0..83212a0709a 100644 --- a/audio/csound-bath/patches/patch-ai +++ b/audio/csound-bath/patches/patch-ai @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.3 2002/03/23 02:23:01 wiz Exp $ +$NetBSD: patch-ai,v 1.4 2003/01/19 21:31:11 hubertf Exp $ ---- anal/adsyn/makef.orig Tue Aug 15 12:28:17 2000 +--- anal/adsyn/makef.orig Tue Oct 8 06:49:08 2002 +++ anal/adsyn/makef @@ -6,7 +6,7 @@ OBJS = main.o $T/hetro.o $T/filopen.o $T/sfheader.o $T/soundin.o \ $T/ulaw.o $T/aiff.o $T/ieee80.o $T/memalloc.o $T/wave.o \ -- $T/window.o $T/winX11.o $T/winEPS.o $T/aifc.o $T/winascii.o \ -+ $T/window.o $T/winEPS.o $T/aifc.o $T/winascii.o \ - $T/sdif.o $T/sdif-mem.o $T/getstring.o +- $T/window.o $T/winFLTK.o $T/FL_graph.o $T/winEPS.o $T/aifc.o \ ++ $T/window.o $T/winEPS.o $T/aifc.o \ + $T/winascii.o $T/sdif.o $T/sdif-mem.o $T/getstring.o adsyns: hetro diff --git a/audio/csound-bath/patches/patch-ak b/audio/csound-bath/patches/patch-ak deleted file mode 100644 index d010d96e391..00000000000 --- a/audio/csound-bath/patches/patch-ak +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2002/03/23 02:23:01 wiz Exp $ - ---- aops.c.orig Wed Feb 13 13:25:18 2002 -+++ aops.c -@@ -3,6 +3,11 @@ - #include - #include - -+#ifdef LINUX -+#include -+#include -+#endif -+ - static double eipt3=8.3333333, oct; - #define logtwo (0.693147) - -@@ -433,8 +438,6 @@ - #ifdef LINUX - void rtclock(EVAL *p) - { --#include --#include - struct timeval tv; - struct timezone tz; - gettimeofday(&tv, &tz); diff --git a/audio/csound-bath/patches/patch-ap b/audio/csound-bath/patches/patch-ap index 2e798dba2c6..e8a04a3356e 100644 --- a/audio/csound-bath/patches/patch-ap +++ b/audio/csound-bath/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.2 2002/03/23 02:23:01 wiz Exp $ +$NetBSD: patch-ap,v 1.3 2003/01/19 21:31:12 hubertf Exp $ ---- cs.h.orig Sat Jan 26 05:29:36 2002 +--- cs.h.orig Mon Dec 16 04:28:30 2002 +++ cs.h -@@ -18,6 +18,24 @@ +@@ -15,6 +15,24 @@ #include "version.h" @@ -26,4 +26,18 @@ $NetBSD: patch-ap,v 1.2 2002/03/23 02:23:01 wiz Exp $ + #define VMSGS 1 #if VMSGS - #define VMSG(x) if (odebug) x + #define VMSG(x) if (O.odebug) x +@@ -782,10 +800,10 @@ + # define POLL_EVENTS() STasks() + # define __cdecl + #else +-#ifdef LINUX +- extern int POLL_EVENTS(void); +-#else ++#if !defined(LINUX) || defined(__NetBSD__) + # define POLL_EVENTS() (1) ++#else ++ extern int POLL_EVENTS(void); + #endif + # if !defined(__BEOS__) || defined(__MWERKS__) + # define __cdecl diff --git a/audio/csound-bath/patches/patch-ar b/audio/csound-bath/patches/patch-ar index 3657ec78527..2513026f778 100644 --- a/audio/csound-bath/patches/patch-ar +++ b/audio/csound-bath/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2002/01/21 11:28:17 wiz Exp $ +$NetBSD: patch-ar,v 1.2 2003/01/19 21:31:13 hubertf Exp $ ---- sread.c.orig Sat Feb 24 22:51:08 2001 +--- sread.c.orig Sun Dec 15 22:54:28 2002 +++ sread.c -@@ -1056,7 +1056,7 @@ +@@ -1150,7 +1150,7 @@ * On Alpha we need to round up to 8 bytes (64 bits). * heh 981101 */ diff --git a/audio/csound-bath/patches/patch-at b/audio/csound-bath/patches/patch-at index ddb40006b54..0029c92d78b 100644 --- a/audio/csound-bath/patches/patch-at +++ b/audio/csound-bath/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2002/03/23 02:23:02 wiz Exp $ +$NetBSD: patch-at,v 1.2 2003/01/19 21:31:13 hubertf Exp $ ---- soundio.c.orig Thu Jan 24 03:32:47 2002 +--- soundio.c.orig Sun Dec 8 03:53:08 2002 +++ soundio.c -@@ -82,6 +82,9 @@ +@@ -84,6 +84,9 @@ # define _pclose pclose # endif #endif @@ -12,14 +12,14 @@ $NetBSD: patch-at,v 1.1 2002/03/23 02:23:02 wiz Exp $ void (*spinrecv)(void), (*spoutran)(void), (*nzerotran)(long); static void byterecv(void), charrecv(void), alawrecv(void), ulawrecv(void), shortrecv(void),longrecv(void), floatrecv(void); -@@ -481,6 +484,10 @@ +@@ -499,6 +502,10 @@ || strncmp(O.outfilename,"dac", 3) ==0 # ifdef LINUX || strcmp(O.outfilename,"/dev/dsp") ==0 +# endif -+# ifdef BSD ++# ifdef __NetBSD__ + || strncmp(O.outfilename,"/dev/audio",10) ==0 + || strncmp(O.outfilename,"/dev/sound",10) ==0 # endif || strcmp(O.outfilename,"dac") == 0) { - #ifdef WIN32 + #if defined(WIN32) || defined(HAVE_ALSA) diff --git a/audio/csound-bath/patches/patch-au b/audio/csound-bath/patches/patch-au new file mode 100644 index 00000000000..71c616bb271 --- /dev/null +++ b/audio/csound-bath/patches/patch-au @@ -0,0 +1,56 @@ +$NetBSD: patch-au,v 1.1 2003/01/19 21:31:13 hubertf Exp $ + +--- main.c.orig Mon Dec 23 14:11:59 2002 ++++ main.c +@@ -51,13 +51,21 @@ + #include /* Linux real-time by Istvan Varga, Jan 2002 */ + #include + #include ++#if defined(__NetBSD__) ++#include ++#include ++#define HIGH_PRIORITY -20 ++#else + #include + #include ++#endif + + void set_rt_priority(int argc, char **argv) + { + int rtmode; ++#if !defined(__NetBSD__) + struct sched_param p; ++#endif + int i; + + if (geteuid() != 0) return; /* not root, nothing to do */ +@@ -88,7 +96,7 @@ + return; + } + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) + /* lock all pages into physical memory */ + if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0) { + err_printf( "csound: cannot lock memory pages: %s\n", +@@ -97,6 +105,12 @@ void set_rt_priority(int argc, char **ar + } + #endif + ++#if defined(__NetBSD__) ++ if (setpriority(PRIO_PROCESS, 0, HIGH_PRIORITY) != 0) { ++ err_printf( "csound: cannot set high priority: %s\n", strerror(errno)); ++ exit(-1); ++ } ++#else + /* set round robin mode with max. priority */ + p.sched_priority = sched_get_priority_max(SCHED_RR); + if (sched_setscheduler(0, SCHED_RR, &p) != 0) { +@@ -104,6 +118,7 @@ + strerror(errno)); + exit(-1); + } ++#endif + /* give up root permissions */ + setuid(getuid()); + } diff --git a/audio/csound-bath/patches/patch-av b/audio/csound-bath/patches/patch-av new file mode 100644 index 00000000000..a9169bfeeea --- /dev/null +++ b/audio/csound-bath/patches/patch-av @@ -0,0 +1,13 @@ +$NetBSD: patch-av,v 1.1 2003/01/19 21:31:14 hubertf Exp $ + +--- dpwelib.h.orig Fri Jul 12 03:48:14 2002 ++++ dpwelib.h +@@ -56,7 +56,7 @@ + #else /* ultrix, not NeXT */ + #ifdef clipper + #else +-# if defined(LATTICE) || defined(WIN32) || defined(SGI) || defined(__FreeBSD__) ++# if defined(LATTICE) || defined(WIN32) || defined(SGI) || defined(__FreeBSD__) || defined(__NetBSD__) + # include + # else + # include diff --git a/audio/csound-bath/patches/patch-aw b/audio/csound-bath/patches/patch-aw new file mode 100644 index 00000000000..af7408bc89e --- /dev/null +++ b/audio/csound-bath/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1 2003/01/19 21:31:14 hubertf Exp $ + +--- pvoc.c.orig Fri Jul 12 03:48:14 2002 ++++ pvoc.c +@@ -8,7 +8,7 @@ + #include "sysdep.h" + + #include +-#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__) ++#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__) || defined(__NetBSD__) + # include /* for malloc() */ + # define READMODE "rb" + # define WRITEMODE "wb+" diff --git a/audio/csound-bath/patches/patch-ax b/audio/csound-bath/patches/patch-ax new file mode 100644 index 00000000000..100790a48ba --- /dev/null +++ b/audio/csound-bath/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2003/01/19 21:31:15 hubertf Exp $ + +--- anal/convol/makef.orig Tue Oct 8 06:54:44 2002 ++++ anal/convol/makef +@@ -7,7 +7,7 @@ T = ../.. + OBJS = main.o $T/cvanal.o $T/fft.o $T/dsputil.o $T/filopen.o \ + $T/sfheader.o $T/soundin.o $T/ulaw.o $T/aiff.o $T/ieee80.o \ + $T/memalloc.o $T/wave.o $T/window.o $T/aifc.o $T/getstring.o \ +- $T/winFLTK.o $T/FL_graph.o $T/winEPS.o $T/winascii.o ++ $T/winEPS.o $T/winascii.o + + + cvl: cvanal diff --git a/audio/csound-bath/patches/patch-ay b/audio/csound-bath/patches/patch-ay new file mode 100644 index 00000000000..52a726d5f12 --- /dev/null +++ b/audio/csound-bath/patches/patch-ay @@ -0,0 +1,14 @@ +$NetBSD: patch-ay,v 1.1 2003/01/19 21:31:15 hubertf Exp $ + +--- util2/dnoise.dir/dnoise.c.orig Sat Dec 14 05:01:18 2002 ++++ util2/dnoise.dir/dnoise.c +@@ -109,6 +109,9 @@ + static long bytes = 0; + OPARMS O = {0,0, 0,1,1,0, 0,0, 0,0, 0,0, 1,0,0,7, 0,0,0, 0,0,0,0, 0,0 }; + ++#ifdef POLL_EVENTS ++#undef POLL_EVENTS ++#endif + int POLL_EVENTS(void) + { + return 1; diff --git a/audio/csound-bath/patches/patch-az b/audio/csound-bath/patches/patch-az new file mode 100644 index 00000000000..c0de09259fd --- /dev/null +++ b/audio/csound-bath/patches/patch-az @@ -0,0 +1,14 @@ +$NetBSD: patch-az,v 1.1 2003/01/19 21:31:16 hubertf Exp $ + +--- util2/dnoise.dir/srconv.c.orig Sat Dec 14 05:01:14 2002 ++++ util2/dnoise.dir/srconv.c +@@ -78,6 +78,9 @@ + OPARMS O = {0,0, 0,1,1,0, 0,0, 0,0, 0,0, 1,0,0,7, 0,0,0, 0,0,0,0, 0,0 }; + + ++#ifdef POLL_EVENTS ++#undef POLL_EVENTS ++#endif + int POLL_EVENTS(void) + { + return 1; diff --git a/audio/csound-bath/patches/patch-ba b/audio/csound-bath/patches/patch-ba new file mode 100644 index 00000000000..d9e559edacc --- /dev/null +++ b/audio/csound-bath/patches/patch-ba @@ -0,0 +1,14 @@ +$NetBSD: patch-ba,v 1.1 2003/01/19 21:31:17 hubertf Exp $ + +--- util2/envext/envext.c.orig Tue Oct 15 10:31:50 2002 ++++ util2/envext/envext.c +@@ -13,6 +13,9 @@ + + /* Constants */ + ++#ifdef POLL_EVENTS ++#undef POLL_EVENTS ++#endif + int POLL_EVENTS(void) + { + return 1; -- cgit v1.2.3