Date: Tue, 29 Oct 2002 15:35:06 +0100 (CET) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/44589: [patch] Unbreak audio/csound by updating to 4.22 Message-ID: <200210291435.g9TEZ6nT038592@bsd.localdomain>
next in thread | raw e-mail | index | archive | help
>Number: 44589
>Category: ports
>Synopsis: [patch] Unbreak audio/csound by updating to 4.22
>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: Tue Oct 29 06:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 4.6-STABLE i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD bsd.localdomain 4.6-STABLE FreeBSD 4.6-STABLE #3: Mon Oct 7 16:20:29 CEST 2002 root@bsd.localdomain:/opt/src/sys/compile/BSD i386
>Description:
Version 4.20 disappeared from FTP servers, so update to 4.22 and
remove BROKEN-tag.
>How-To-Repeat:
>Fix:
Removed files:
patch-LINUXaudio.c
patch-aops.c
patch-dpwelib.h
patch-main_c
patch-midisend.c
patch-pvoc.c
patch-soundin.c
New file:
patch-cs.h (Ignore POLL_EVENTS)
- No longer BROKEN
- Various obsole patches (mostly integrated into dist)
- Cleanup pre-build (no longer needed) & post-patch
- Add FLTK-infrastructure (WITHOUT_FLTK, forced to YES
in the Makefile because I still couldn't get both
ports to work together)
- Also closes PR ports/43722
- PERL -> REINPLACE_CMD
--- Makefile.orig Tue Oct 29 14:41:57 2002
+++ Makefile Tue Oct 29 15:29:05 2002
@@ -6,7 +6,7 @@
#
PORTNAME= csound
-PORTVERSION= 4.20
+PORTVERSION= 4.22
CATEGORIES= audio
MASTER_SITES= ftp://sunsite.univie.ac.at/pub/sound/csound/newest/ \
ftp://ftp.cs.bath.ac.uk/pub/dream/newest/
@@ -15,25 +15,28 @@
MAINTAINER= trevor@FreeBSD.org
-BROKEN= "Does not fetch"
-
LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
tk83:${PORTSDIR}/x11-toolkits/tk83
+WITHOUT_FLTK= YES # currently broken
+.if !defined(WITHOUT_FLTK)
+LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk
+.endif
RESTRICTED= "no redistribution; no commercial use except to make music (see http://mitpress.mit.edu/e-books/csound/fpage/FAQml/faq/faq.html)"
NO_CDROM= ${RESTRICTED}
NO_FTP= ${RESTRICTED}
-MAKE_ENV= CPPFLAGS="-I${PREFIX}/include" \
- LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
+USE_REINPLACE= YES
+MAKE_ENV= LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
+MAKE_ENV+= CPPFLAGS="-I${PREFIX}/include -I${X11BASE}/include"
+.if !defined(WITHOUT_FLTK)
+MAKE_ENV+= HAVE_FLTK="-DHAVE_FLTK"
+MAKE_ENV+= CXXFLAGS+="-I${X11BASE}/include"
+.endif
+
NO_WRKSUBDIR= yes
-PKGMESSAGE= ${WRKDIR}/pkg-message
-PLIST= ${WRKDIR}/pkg-plist
USE_X_PREFIX= yes
-pre-build:
- ${FIND} ${WRKDIR} -type f -exec ${CHMOD} 644 \{\} \;
-
post-build:
${RM} -f ${PLIST}
for i in `${FIND} ${WRKDIR} -type f -perm 755`; do \
@@ -46,9 +49,7 @@
${ECHO_CMD} "thoroughly reviewed by the FreeBSD maintainer." >> ${PKGMESSAGE}
post-patch:
- ${PERL} -pi -e "s:/usr/local/lib:${DATADIR}:g" ${WRKSRC}/getstring.c
- ${FIND} ${WRKSRC} -type f -exec \
- ${PERL} -pi -e "s:<malloc.h>:<stdlib.h>:g" {} \;
+ ${REINPLACE_CMD} -e 's:/usr/local/lib:${DATADIR}:g' ${WRKSRC}/getstring.c
do-install:
${MKDIR} ${PREFIX}/share/csound
--- distinfo.orig Tue Oct 29 13:02:22 2002
+++ distinfo Tue Oct 29 13:02:37 2002
@@ -1 +1 @@
-MD5 (csound/Csound4.20.tar.gz) = ee138e85b866fd87244df7e2d127ed3c
+MD5 (csound/Csound4.22.tar.gz) = f710bca8eefe80026024adc6280e8346
diff -ruN ofiles/patch-LINUXaudio.c files/patch-LINUXaudio.c
--- ofiles/patch-LINUXaudio.c Mon Jul 15 02:11:09 2002
+++ files/patch-LINUXaudio.c Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-LINUXaudio.c,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- LINUXaudio.c.orig Sun Jul 14 16:03:01 2002
-+++ LINUXaudio.c Sun Jul 14 16:02:48 2002
-@@ -89,6 +89,7 @@ void setsndparms( int dspfd, int format,
- warning(errmsg);
- }
-
-+#ifndef __FreeBSD__
- /* set DMA buffer fragment size to Csound's output buffer size */
- parm = 0; frag_size = 1;
- /* find least power of 2 >= bufsiz */
-@@ -101,7 +102,6 @@ void setsndparms( int dspfd, int format,
- if (ioctl(dspfd, SNDCTL_DSP_SETFRAGMENT, &parm) == -1)
- die(Str(X_755,"failed while trying to set soundcard DMA buffer size"));
-
--#ifndef FREE_BSD
- /* find out what buffer size the driver allocated */
- if (ioctl(dspfd, SNDCTL_DSP_GETBLKSIZE, &parm) == -1)
- die(Str(X_754,"failed while querying soundcard about buffer size"));
diff -ruN ofiles/patch-Makefile files/patch-Makefile
--- ofiles/patch-Makefile Wed Jul 31 09:50:31 2002
+++ files/patch-Makefile Tue Oct 29 14:28:20 2002
@@ -1,7 +1,5 @@
-$FreeBSD: ports/audio/csound/files/patch-Makefile,v 1.4 2002/07/15 00:11:09 trevor Exp $
-
---- Makefile.orig Sun Jul 14 16:03:01 2002
-+++ Makefile Sun Jul 14 16:49:45 2002
+--- Makefile.orig Wed Oct 9 17:39:50 2002
++++ Makefile Tue Oct 29 14:28:09 2002
@@ -1,17 +1,17 @@
# Csound Makefile
# edit the following definitions according to need:
@@ -29,30 +27,68 @@
# .c.o:
# $(CC) $(CFLAGS) -c $*.c -o $@
--DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DRWD_DBFS
-+DEFINES = -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DRWD_DBFS -DFREE_BSD
+-DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DRWD_DBFS -DHAVE_FLTK
++DEFINES = -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DRWD_DBFS $(HAVE_FLTK)
# 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)
-@@ -49,7 +49,7 @@
+@@ -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 -malign-loops=4 -malign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES)
-+CFLAGS = $(CPPFLAGS) $(LDFLAGS) $(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 += $(CPPFLAGS) $(LDFLAGS) $(DEFINES)
# -O Simple optimisation
# -O2 to be more specific about the optimization level
# -f compile single-precision floats (4.3,VAX,DEC-RISC)
-@@ -84,7 +84,7 @@
- # -I/usr/openwin/include Solaris openwin interface
- # -I/usr/demo/SOUND/include Solaris sound interface
- # -I/usr/X11R6/include non-RedHat distributions of Linux
--LIBS = -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm
-+LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lX11 -ltcl83 -ltk83 -lm
+@@ -88,14 +88,15 @@
+
+ # uncomment these if HAVE_FLTK was enabled in DEFINES
+ #
+-CXX = g++
+-CXXFLAGS = -fno-exceptions -fno-rtti
++.if defined(HAVE_FLTK)
++CXX ?= g++
++CXXFLAGS += -fno-exceptions -fno-rtti
+ FLTKSRC = widgets.cpp
+ FLTKOBJ = widgets.o
+ # 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 = -lfltk -lpthread
++#FLTKLIB = /usr/local/lib/libfltk.a /usr/lib/libpthread.a \
++# /usr/lib/libstdc++-libc6.2-2.a.3
+ # libraries required by widgets.cpp
+ # -lfltk -lpthread -lg++ use dynamic libraries
+ #
+@@ -104,8 +105,9 @@
+ # /usr/lib/libstdc++-libc6.2-2.a.3 but increases size; the
+ # directiories and version
+ # numbers are system-dependent)
++.endif
+
+-LIBS = $(FLTKLIB) -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm -ldl
++LIBS = $(FLTKLIB) -L$(X11BASE)/lib -L$(LOCALBASE) -lX11 -ltcl83 -ltk83 -lm
# -lefence
# -lm required
# -lX11 for X window calls
-@@ -255,7 +255,7 @@
+@@ -124,8 +126,14 @@
+ # note: SuSE 7.3 users should use -ltcl8.3 -ltk8.3, but another
+ # (probably better) solution is to create symbolic links
+
++.if defined(HAVE_FLTK)
+ WINSRC = winFLTK.c FL_graph.cpp
+ WINOBJ = winFLTK.o FL_graph.o
++.else
++WINSRC = winX11.c
++WINOBJ = winX11.o
++.endif
++
+ # ;if WINDOWS enabled in DEFINES, choose one of -
+ # winX11.o for X11 window graphics
+ # winSGI.o for SGI window graphics
+@@ -281,7 +289,7 @@
all: $(PROGS) $(SUBDIRS) #must be run in this order
csound: $(COBJS) $(CSUM) $(CDEP) csound.xmg
diff -ruN ofiles/patch-anal-adsyn-makef files/patch-anal-adsyn-makef
--- ofiles/patch-anal-adsyn-makef Thu Jan 1 01:00:00 1970
+++ files/patch-anal-adsyn-makef Tue Oct 29 14:32:40 2002
@@ -0,0 +1,21 @@
+--- anal/adsyn/makef.orig Tue Oct 8 15:49:08 2002
++++ anal/adsyn/makef Tue Oct 29 14:32:14 2002
+@@ -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/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
+@@ -23,7 +23,7 @@
+ cc $(CFLAGS) -c main.c
+
+ clean:
+- -rm -f hetro
++ -rm -f hetro *.o
+
+ rmbak:
+- -rm *.bak *~
++ -rm -f *.bak *~
diff -ruN ofiles/patch-anal-convol-makef files/patch-anal-convol-makef
--- ofiles/patch-anal-convol-makef Thu Jan 1 01:00:00 1970
+++ files/patch-anal-convol-makef Tue Oct 29 14:36:33 2002
@@ -0,0 +1,11 @@
+--- anal/convol/makef.orig Tue Oct 29 14:36:00 2002
++++ anal/convol/makef Tue Oct 29 14:36:09 2002
+@@ -7,7 +7,7 @@
+ 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 -ruN ofiles/patch-anal-lpc-makef files/patch-anal-lpc-makef
--- ofiles/patch-anal-lpc-makef Thu Jan 1 01:00:00 1970
+++ files/patch-anal-lpc-makef Tue Oct 29 14:34:26 2002
@@ -0,0 +1,13 @@
+--- anal/lpc/makef.orig Tue Oct 8 15:53:00 2002
++++ anal/lpc/makef Tue Oct 29 14:33:57 2002
+@@ -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/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
+
+ lpcs: lpanal
+
diff -ruN ofiles/patch-anal-pvoc.makef files/patch-anal-pvoc.makef
--- ofiles/patch-anal-pvoc.makef Thu Jan 1 01:00:00 1970
+++ files/patch-anal-pvoc.makef Tue Oct 29 14:35:45 2002
@@ -0,0 +1,13 @@
+--- anal/pvoc/makef.orig Tue Oct 8 15:53:33 2002
++++ anal/pvoc/makef Tue Oct 29 14:35:27 2002
+@@ -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/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
+
+ pvocs: pvanal
+
diff -ruN ofiles/patch-anal_adsyn_makef files/patch-anal_adsyn_makef
--- ofiles/patch-anal_adsyn_makef Mon Jul 15 02:11:09 2002
+++ files/patch-anal_adsyn_makef Thu Jan 1 01:00:00 1970
@@ -1,27 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-anal_adsyn_makef,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- anal/adsyn/makef.orig Sun Jul 14 16:02:48 2002
-+++ anal/adsyn/makef Sun Jul 14 16:02:48 2002
-@@ -6,9 +6,11 @@ T = ../..
-
- 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/winX11.o $T/winEPS.o $T/aifc.o $T/winascii.o \
-+
- adsyns: hetro
-
- hetro: $(OBJS)
-@@ -23,7 +25,7 @@ main.o: $T/ustub.h $T/cs.h main.c
- cc $(CFLAGS) -c main.c
-
- clean:
-- -rm -f hetro
-+ -rm -f hetro *.o
-
- rmbak:
-- -rm *.bak *~
-+ -rm -f *.bak *~
diff -ruN ofiles/patch-anal_lpc_makef files/patch-anal_lpc_makef
--- ofiles/patch-anal_lpc_makef Mon Jul 15 02:11:09 2002
+++ files/patch-anal_lpc_makef Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-anal_lpc_makef,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- anal/lpc/makef.orig Sun Jul 14 16:02:49 2002
-+++ anal/lpc/makef Sun Jul 14 16:02:48 2002
-@@ -6,8 +6,10 @@ T = ../..
-
- 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/winascii.o $T/winEPS.o \
- $T/aifc.o $T/getstring.o
-+
-+# $T/memalloc.o $T/window.o $T/winX11.o $T/winascii.o $T/winEPS.o \
-
- lpcs: lpanal
-
diff -ruN ofiles/patch-anal_pvoc_makef files/patch-anal_pvoc_makef
--- ofiles/patch-anal_pvoc_makef Mon Jul 15 02:11:09 2002
+++ files/patch-anal_pvoc_makef Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-anal_pvoc_makef,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- anal/pvoc/makef.orig Sun Jul 14 16:02:49 2002
-+++ anal/pvoc/makef Sun Jul 14 16:02:49 2002
-@@ -7,8 +7,10 @@ T = ../..
- 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/winascii.o \
- $T/winEPS.o $T/aifc.o $T/getstring.o
-+
-+# $T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winX11.o $T/winascii.o \
-
- pvocs: pvanal
-
diff -ruN ofiles/patch-aops.c files/patch-aops.c
--- ofiles/patch-aops.c Wed Jul 31 09:50:31 2002
+++ files/patch-aops.c Thu Jan 1 01:00:00 1970
@@ -1,18 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-aops.c,v 1.2 2002/07/15 00:11:09 trevor Exp $
-
---- aops.c.orig Sun Jul 14 16:03:01 2002
-+++ aops.c Sun Jul 14 16:02:49 2002
-@@ -1,3 +1,4 @@
-+#include <sys/time.h>
- #include "cs.h" /* AOPS.C */
- #include "aops.h"
- #include <math.h>
-@@ -442,8 +443,6 @@ void ftsr(EVAL *p) /**** ft
- #ifdef LINUX
- void rtclock(EVAL *p)
- {
--#include <sys/time.h>
--#include <unistd.h>
- struct timeval tv;
- struct timezone tz;
- gettimeofday(&tv, &tz);
diff -ruN ofiles/patch-cs.h files/patch-cs.h
--- ofiles/patch-cs.h Thu Jan 1 01:00:00 1970
+++ files/patch-cs.h Tue Oct 29 14:22:29 2002
@@ -0,0 +1,11 @@
+--- cs.h.orig Tue Oct 29 14:19:46 2002
++++ cs.h Tue Oct 29 14:22:09 2002
+@@ -748,7 +748,7 @@
+ # define POLL_EVENTS() STasks()
+ # define __cdecl
+ #else
+-#ifdef LINUX
++#if defined(LINUX) && !defined(__FreeBSD__)
+ extern int POLL_EVENTS(void);
+ #else
+ # define POLL_EVENTS() (1)
diff -ruN ofiles/patch-dpwelib.h files/patch-dpwelib.h
--- ofiles/patch-dpwelib.h Mon Jul 15 02:11:09 2002
+++ files/patch-dpwelib.h Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-dpwelib.h,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- dpwelib.h.orig Sun Jul 14 16:03:01 2002
-+++ dpwelib.h Sun Jul 14 16:02:51 2002
-@@ -56,7 +56,7 @@
- #else /* ultrix, not NeXT */
- #ifdef clipper
- #else
--# if defined(LATTICE) || defined(WIN32) || defined(SGI)
-+# if defined(LATTICE) || defined(WIN32) || defined(SGI) || defined(__FreeBSD__)
- # include <stdlib.h>
- # else
- # include <unistd.h>
diff -ruN ofiles/patch-main_c files/patch-main_c
--- ofiles/patch-main_c Wed Jul 31 09:50:31 2002
+++ files/patch-main_c Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-main_c,v 1.3 2002/07/15 00:11:09 trevor Exp $
-
---- main.c.orig Sat Jun 1 19:42:24 2002
-+++ main.c Thu Jul 4 19:32:12 2002
-@@ -92,12 +92,15 @@
- return;
- }
-
-+#ifndef __FreeBSD__
- /* lock all pages into physical memory */
- if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
- fprintf(stderr, "csound: cannot lock memory pages: %s\n",
- strerror(errno));
- exit(-1);
- }
-+#endif
-+
- /* set round robin mode with max. priority */
- p.sched_priority = sched_get_priority_max(SCHED_RR);
- if (sched_setscheduler(0, SCHED_RR, &p) != 0) {
diff -ruN ofiles/patch-midisend.c files/patch-midisend.c
--- ofiles/patch-midisend.c Mon Jul 15 02:11:09 2002
+++ files/patch-midisend.c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-midisend.c,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- midisend.c.orig Sun Jul 14 16:03:01 2002
-+++ midisend.c Sun Jul 14 16:02:53 2002
-@@ -16,7 +16,7 @@
- #include <ctype.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
--#ifdef FREE_BSD
-+#ifdef __FreeBSD__
- # include <sys/soundcard.h>
- #else
- # include <linux/soundcard.h>
diff -ruN ofiles/patch-pvoc.c files/patch-pvoc.c
--- ofiles/patch-pvoc.c Mon Jul 15 02:11:09 2002
+++ files/patch-pvoc.c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-pvoc.c,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- pvoc.c.orig Sun Jul 14 16:03:01 2002
-+++ pvoc.c Sun Jul 14 16:02:55 2002
-@@ -8,7 +8,7 @@
- #include "sysdep.h"
-
- #include <stdio.h>
--#if defined(mac_classic) || defined(SYMANTEC)
-+#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__)
- # include <stdlib.h> /* for malloc() */
- # define READMODE "rb"
- # define WRITEMODE "wb+"
diff -ruN ofiles/patch-soundin.c files/patch-soundin.c
--- ofiles/patch-soundin.c Mon Jul 15 02:11:09 2002
+++ files/patch-soundin.c Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$FreeBSD: ports/audio/csound/files/patch-soundin.c,v 1.1 2002/07/15 00:11:09 trevor Exp $
-
---- soundin.c.orig Sun Jul 14 16:03:01 2002
-+++ soundin.c Sun Jul 14 16:02:57 2002
-@@ -5,6 +5,7 @@
- /*RWD 3:2000*/
- #ifdef RWD_DBFS
- /* quick hack to save typing etc... */
-+#undef INLONGFAC
- #define INLONGFAC (double)long_to_dbfs
- #else
- #define INLONGFAC (1.0 / 65536.0) /* convert 32bit long to quasi 16 bit range */
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210291435.g9TEZ6nT038592>