diff options
31 files changed, 1 insertions, 897 deletions
diff --git a/audio/Makefile b/audio/Makefile index 6d50f82a5c0..3009ce64cec 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.264 2004/11/28 17:09:13 ben Exp $ +# $NetBSD: Makefile,v 1.265 2004/11/28 17:12:28 ben Exp $ # COMMENT= Audio tools @@ -25,7 +25,6 @@ SUBDIR+= cddbd SUBDIR+= cdparanoia SUBDIR+= cmp3 SUBDIR+= cs4235 -SUBDIR+= csound-dev SUBDIR+= csound-manual SUBDIR+= daapd SUBDIR+= dap diff --git a/audio/csound-dev/DESCR b/audio/csound-dev/DESCR deleted file mode 100644 index 909beaee389..00000000000 --- a/audio/csound-dev/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -Csound is a software synthesis package in the tradition of so-called -music-N languages, among which the best-known is Music V. It consists -of an orchestra- and score-driven executable, written in C for -portability. Since Csound is a computational language, it is highly -flexible and efficient; complexity is gained only at the expense of -computation time. Basically Csound reads some files and creates the -result as a file on disk or, on faster machines, through a DAC in real -time. diff --git a/audio/csound-dev/MESSAGE b/audio/csound-dev/MESSAGE deleted file mode 100644 index 48de4510b47..00000000000 --- a/audio/csound-dev/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2003/12/13 20:30:53 ben Exp $ - -This version of csound implements localization and realtime audio as -plugins. As a result you need to set the OPCDIR environment variable to -${PREFIX}/lib/Csound. The csound executable is named "csound32". To -play realtime audio, specify "-o devaudio" instead of "-o /dev/audio". - -=========================================================================== diff --git a/audio/csound-dev/Makefile b/audio/csound-dev/Makefile deleted file mode 100644 index 398cb72d21d..00000000000 --- a/audio/csound-dev/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:05 tv Exp $ -# - -DISTNAME= Csound-4.24.1 -PKGNAME= csound-dev-4.24.1 -PKGREVISION= 2 -CATEGORIES= audio -MASTER_SITES= http://www.csounds.com/istvan/archive/misc/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= ben@NetBSD.org -HOMEPAGE= http://www.csounds.com/ -COMMENT= Software synthesizer and sequencer - -LICENSE= csound-license -RESTRICTED= "no for-fee-redistribution" -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} -NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 # many LP64 problems - -DIST_SUBDIR= csound -USE_GNU_TOOLS+= make -USE_BUILDLINK3= yes -USE_X11= yes -CONFLICTS= csound-bath* -USE_LANGUAGES= c c++ - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -SUBST_CLASSES+= defbsd -SUBST_MESSAGE.defbsd= "Configuring to use NetBSD presets." -SUBST_STAGE.defbsd= post-patch -SUBST_FILES.defbsd= Makefile.defs -SUBST_SED.defbsd= -e 's,^\(DEFINES =\),\1 -DBSD,' -.endif - -pre-install: - ${RM} -f ${WRKSRC}/include/Csound/sysdep.h.orig - -.include "../../x11/fltk/buildlink3.mk" -.include "../../mk/ossaudio.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/audio/csound-dev/PLIST b/audio/csound-dev/PLIST deleted file mode 100644 index bf124175722..00000000000 --- a/audio/csound-dev/PLIST +++ /dev/null @@ -1,36 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2003/12/13 20:26:03 ben Exp $ -bin/cs -bin/csb64enc -bin/csound32 -bin/cvanal -bin/dnoise -bin/envext -bin/extract -bin/extractor -bin/het_export -bin/het_import -bin/hetro -bin/lpanal -bin/lpc_export -bin/lpc_import -bin/makecsd -bin/mixer -bin/pv_export -bin/pv_import -bin/pvanal -bin/pvlook -bin/scale -bin/scot -bin/scsort -bin/sdif2ad -bin/sndinfo -bin/srconv -include/Csound/csdl.h -include/Csound/csound.h -include/Csound/csstruct.h -include/Csound/sysdep.h -lib/Csound/rtlinux.so -lib/Csound/stdopcod.so -lib/libcsound32.so -@dirrm include/Csound -@dirrm lib/Csound diff --git a/audio/csound-dev/distinfo b/audio/csound-dev/distinfo deleted file mode 100644 index 8a8976d30b3..00000000000 --- a/audio/csound-dev/distinfo +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: distinfo,v 1.7 2004/09/11 02:05:01 minskim Exp $ - -SHA1 (csound/Csound-4.24.1.tar.bz2) = a14903e23b72c78a870b0d38df7bbdb5e1a56c9e -Size (csound/Csound-4.24.1.tar.bz2) = 1116589 bytes -SHA1 (patch-aa) = 128348a54bc5df73feb2cbd45fd07e4246565f89 -SHA1 (patch-ab) = 64a0cf6a5b720d05d625613117c26f5669553d79 -SHA1 (patch-ac) = 4c59bab1d38ae65fba96cab5b8718f8d41646ccd -SHA1 (patch-ad) = 8e001b34e1e0a2a1beba5d50667b1b402143c532 -SHA1 (patch-ae) = 75b35e8161390aef418055a1d834120f16c7c99c -SHA1 (patch-af) = 6641f5fce8e919dbe39c0132fd35f6799b54d24d -SHA1 (patch-ag) = 1cbc8e5070efa0416fd771a77c181f859a3ae4e7 -SHA1 (patch-ah) = 12845b415f1dee76527df4bb60159cda3ffe78e9 -SHA1 (patch-ai) = 652ba4a0dce449605004347e6eb6f6344f559ea3 -SHA1 (patch-aj) = e0c135effca0d33814d4644979dc0be53d62d8a0 -SHA1 (patch-ak) = d62442d9248f48e70e97dfdb7a772d9f5586faaa -SHA1 (patch-al) = 59f0cc70bfa0a69a00c7926264e9ca1ae17d64e7 -SHA1 (patch-am) = 60dcef719e82f063ae87d23ce0410508bab76b93 -SHA1 (patch-an) = 292b472661a67fd79c6fc9f91b9366e267b4d19f -SHA1 (patch-ao) = 9aad1dcf08550ddd1ecb5be6b6145bca3a8ca84b -SHA1 (patch-ap) = 4860816fc5dbc26b24ff030d451798e75c8e5a26 -SHA1 (patch-aq) = 4f43102124e7b7fc86abb87a4c46eb8eaf2c449c -SHA1 (patch-ar) = eadee2e5c324b7b899a032bc782d74867c1add72 -SHA1 (patch-as) = 45a18ea81022a722c489aee4013589172490c60f -SHA1 (patch-at) = fd424477994e026526ed14d9d64a951abcfbb6fb -SHA1 (patch-au) = 5c002177662b6f9b4eacccba023e88ba8c0699af -SHA1 (patch-av) = 17b6e08cff26c6bbea18f30649b2dfeff7a7dab9 -SHA1 (patch-aw) = a3b52e7a40bba5ca7e2a422d4718b4c11b0f7b95 -SHA1 (patch-ax) = 2dda0346134d115d2299e210e4689fd788104efb -SHA1 (patch-ay) = 9a654dc2c269c8e8a6486f42b4ec9a1533cac065 diff --git a/audio/csound-dev/patches/patch-aa b/audio/csound-dev/patches/patch-aa deleted file mode 100644 index d0b1412f812..00000000000 --- a/audio/csound-dev/patches/patch-aa +++ /dev/null @@ -1,116 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2004/04/17 23:10:19 ben Exp $ - ---- Makefile.defs.orig 2003-02-25 19:24:01.000000000 -0800 -+++ Makefile.defs -@@ -10,7 +10,7 @@ TARGET_OS = unix - # ----------------------------------------------------------------------------- - # installation directories - --INSTDIR = /usr/local -+INSTDIR = $(PREFIX) - - BINDIR = $(INSTDIR)/bin - LIBDIR = $(INSTDIR)/lib -@@ -62,7 +62,7 @@ CC = gcc - CXX = g++ - LD = gcc - AR = ar rc --MAKEDLL_L = ld -E -s -shared -O1 -+MAKEDLL_L = $(CXX) -Wl,-E -Wl,-shared - MAKEDLL_P = ld -E -s -shared -O1 - RANLIB = ranlib - -@@ -72,7 +72,7 @@ RANLIB = ranlib - - DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DLINUX -DHAVE_TERMIOS_H \ - -DIV_VERSION -DPIPES -DMACROS -DHAVE_FLTK -D_REENTRANT \ -- -DHAVE_SSTREAM -DMYFLT=float -+ -DHAVE_SSTREAM -DMYFLT=float -DDEVOSSSOUND="\"$(DEVOSSSOUND)\"" - # choose any of - - # -DSYS5 invoke System V headers, e.g. 'string.h' for 'strings.h' - # -DHAVE_SSTREAM include <sstream> header from C++ sources, instead of -@@ -112,9 +112,7 @@ DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DL - # of your compiler for the list of available settings. $(DEFINES) must always - # be included. - --CFLAGS = -pipe -Wall -O2 -ffast-math -fomit-frame-pointer \ -- -finline-functions -funroll-loops -fno-strict-aliasing \ -- $(PIC_FLAG) \ -+CFLAGS+= -Wall -O2 $(PIC_FLAG) \ - -I. -I$(TOPDIR) -I$(TOPDIR)/include -I$(TOPDIR)/opcodes $(DEFINES) - # -O Simple optimisation - # -O2 to be more specific about the optimization level -@@ -142,15 +140,12 @@ CFLAGS = -pipe -Wall -O2 -ffast-math -fo - # ----------------------------------------------------------------------------- - # Additional flags for the C compiler only - --C_FLAGS = -march=pentium3 -falign-functions=16 -falign-loops=16 \ -- -falign-jumps=16 -frename-registers -mfpmath=387 -mno-ieee-fp \ -- -mno-sse - - # ----------------------------------------------------------------------------- - # C++ compiler flags - --CXXFLAGS = $(CFLAGS) $(C_FLAGS) -fno-exceptions -fno-rtti \ -- -fno-unroll-loops -I/usr/local/FLTK-1.1.0/Linux/include -+CXXFLAGS+= $(CFLAGS) $(C_FLAGS) -fno-exceptions -fno-rtti \ -+ -fno-unroll-loops - # `fltk-config --cxxflags` try adding this if the compilation of - # FLTK widgets stops with error messages - # related to not finding include files -@@ -165,8 +160,7 @@ FLTKOBJ = buttonsched.o widgets.o - - # FLTKLIB = -lfltk -lpthread -lstdc++ - # FLTKLIB = `fltk-config --libs` --FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a \ -- /usr/local/gcc-3.2.2/lib/libstdc++.a -+FLTKLIB = -lfltk -lstdc++ - # libraries required by widgets.cpp - # -lfltk -lpthread -lstdc++ use dynamic libraries - # -@@ -188,7 +182,7 @@ FLTKLIB = /usr/local/FLTK-1.1.0/Linux/li - LIBS = -lpthread -lm - # used for linking all executables - --MISC_LIB = -ldl -+MISC_LIB = - # these are used by the main Csound executable only - - # -lefence for debugging only -@@ -211,7 +205,7 @@ WINOBJ = sysdep/winX11.o - # winFLTK.o and FL_graph.o for `improved' X graphics - # otherwise leave empty - --WINLIBS = -L/usr/X11R6/lib -lX11 -+WINLIBS = -lX11 - # ;window system libraries - # -lX11 for X window calls - # -L/usr/lib/X11R4 for HP X11 library, v.4 -@@ -224,7 +218,7 @@ WINLIBS = -L/usr/X11R6/lib -lX11 - # ----------------------------------------------------------------------------- - # real-time audio support - --RTAUDIO_PLUGINS = rtlinux.so rtalsa.so -+RTAUDIO_PLUGINS = rtlinux.so - # rtlinux.so for Linux (OSS interface) - # rtalsa.so for Linux (ALSA interface) - # rtwin32.dll Windows 32bit MM library -@@ -232,7 +226,7 @@ RTAUDIO_PLUGINS = rtlinux.so rtalsa.so - # ----------------------------------------------------------------------------- - # libraries and headers for real-time audio - --AUDLIBS = -lasound -+AUDLIBS = $(LIBOSSAUDIO) - # -laudio on SUN, for SFSUN41 - # -laudio on SGI, to include rt devaudio library - # -lAlib on HP, to include rt devaudio library -@@ -248,8 +242,7 @@ AUDLIBS = -lasound - # Access permissions for main Csound executable. It is recommended to set it - # to 4551 under Linux to enable --sched. Other systems should use 0755. - --#CSOUND_PERM = 0755 --CSOUND_PERM = 4551 -+CSOUND_PERM = 0755 - - # ----------------------------------------------------------------------------- - # The Csound MAKE can be run in separate stages, or as a single command. diff --git a/audio/csound-dev/patches/patch-ab b/audio/csound-dev/patches/patch-ab deleted file mode 100644 index 7e525cdfc9a..00000000000 --- a/audio/csound-dev/patches/patch-ab +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- opcodes/midisend.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ opcodes/midisend.c -@@ -1,6 +1,8 @@ - #include "cs.h" /* MIDISEND.C */ - #include "midioops.h" - -+#undef USE_DLP_MIDI_OUT_CODE -+ - #ifdef LINUX - /* - This is very provisional code for Linux Csound MIDI output. Data -@@ -16,8 +18,20 @@ - #include <ctype.h> - #include <sys/ioctl.h> - #include <fcntl.h> --#ifdef __FreeBSD__ --# include <sys/soundcard.h> -+#ifdef BSD -+#ifdef USE_DLP_MIDI_OUT_CODE -+#include <sys/midiio.h> -+#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);} -+#endif - #else - # include <linux/soundcard.h> - #endif -@@ -38,6 +52,7 @@ void pitch_bend(int /*chan*/, int /*lsb* - void poly_after_touch(int /*chan*/, int /*note_num*/, int /*value*/); - void openMIDIout(void); - -+#ifdef USE_DLP_MIDI_OUT_CODE - #ifdef LINUX - #define _gotMIDIout - void seqbuf_dump(void); -@@ -127,6 +142,7 @@ void openMIDIout() - } - - #endif -+#endif - - /* ********************************* */ - /* This section for Windows95 and NT */ diff --git a/audio/csound-dev/patches/patch-ac b/audio/csound-dev/patches/patch-ac deleted file mode 100644 index 55f264d9c2a..00000000000 --- a/audio/csound-dev/patches/patch-ac +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- extract.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ extract.c -@@ -5,7 +5,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 SRTBLK *frstout, *prvout; /* links for building new outlist */ - -@@ -63,7 +63,7 @@ void readxfil(FILE *xfp) /* read - 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 */ -@@ -108,7 +108,7 @@ void extract(void) /* extract instr - if (sectno == onsect && warped) - ontime = a0.newp3 = realt(onbeat); - if (sectno == offsect && warped) -- offtime = f0.newp2 = realt(offbeat); -+ cs_offtime = f0.newp2 = realt(offbeat); - include(bp); - break; - case 't': -@@ -117,7 +117,7 @@ void extract(void) /* extract instr - case 'f': - casef: if (sectno == onsect && bp->newp2 < ontime) - bp->newp2 = ontime; -- else if (sectno == offsect && bp->newp2 > offtime) -+ else if (sectno == offsect && bp->newp2 > cs_offtime) - break; - if (sectno == onsect && !a0done) { - if (onbeat > 0) -@@ -144,10 +144,10 @@ void extract(void) /* extract instr - } - } - if (sectno == offsect) { -- if (bp->newp2 >= offtime) -+ if (bp->newp2 >= cs_offtime) - break; -- if (turnoff > offtime) { -- bp->newp3 = offtime - bp->newp2; -+ if (turnoff > cs_offtime) { -+ bp->newp3 = cs_offtime - bp->newp2; - bp->p3val = offbeat - bp->p2val; - } - } diff --git a/audio/csound-dev/patches/patch-ad b/audio/csound-dev/patches/patch-ad deleted file mode 100644 index 875997fca2e..00000000000 --- a/audio/csound-dev/patches/patch-ad +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2004/02/19 04:49:40 ben Exp $ - ---- Makefile.orig 2003-02-25 19:24:01.000000000 -0800 -+++ Makefile -@@ -133,7 +133,7 @@ else - $(LIBCSND_D): $(CSOBJS) $(OPOBJS) - rm -f $@ - $(MAKEDLL_L) -o $@ $(CSOBJS) $(OPOBJS) $(FLTKLIB) $(WINLIBS) \ -- $(AUDLIBS) $(MISC_LIB) $(LIBS) -+ $(AUDLIBS) $(MISC_LIB) $(LIBS) $(LDFLAGS) - endif - - # ---- main Csound executable ---- -@@ -170,7 +170,7 @@ $(INSTALL_DIRS): - - install_libs: $(INSTALL_DIRS) - ifeq ($(strip $(BUILD_TYPE)),dynamic) -- install -p -m 0755 $(LIBCSND_D) $(LIBDIR) -+ $(BSD_INSTALL_DATA) $(LIBCSND_D) $(LIBDIR) - ifeq ($(strip $(TARGET_OS)),unix) - @echo " *** The Csound shared library ($(LIBCSND_D)) has been" - @echo " *** installed to $(LIBDIR). Please add $(LIBDIR) to" -@@ -179,18 +179,18 @@ ifeq ($(strip $(TARGET_OS)),unix) - endif - else - ifneq ($(strip $(INSTALL_LIBS)),) -- install -p -m 0644 $(LIBCSND) $(LIBDIR) -+ $(BSD_INSTALL_DATA) $(LIBCSND) $(LIBDIR) - endif - endif - ifneq ($(strip $(INSTALL_LIBS)),) -- install -p -m 0644 include/Csound/* $(INCLDIR)/Csound -+ $(BSD_INSTALL_DATA) include/Csound/* $(INCLDIR)/Csound - ifeq ($(strip $(TARGET_OS)),win32) -- install -p -m 0644 csound32.def csound64.def $(LIBDIR) -+ $(BSD_INSTALL_DATA) csound32.def csound64.def $(LIBDIR) - endif - endif - - install: all $(INSTALL_DIRS) install_libs -- install -p -m $(CSOUND_PERM) $(PROGRAM) $(BINDIR)/$(CSOUND_NAME) -+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(BINDIR)/$(CSOUND_NAME) - ifneq ($(strip $(BUILD_UTILS)),) - cd utils ; make $@ - endif -@@ -199,7 +199,7 @@ ifneq ($(strip $(BUILD_PLUGINS)),) - endif - - install-strip: all $(INSTALL_DIRS) install_libs -- install -p -m $(CSOUND_PERM) -s $(PROGRAM) $(BINDIR)/$(CSOUND_NAME) -+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(BINDIR)/$(CSOUND_NAME) - ifneq ($(strip $(BUILD_UTILS)),) - cd utils ; make $@ - endif diff --git a/audio/csound-dev/patches/patch-ae b/audio/csound-dev/patches/patch-ae deleted file mode 100644 index c6146a9a920..00000000000 --- a/audio/csound-dev/patches/patch-ae +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- csmain.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ csmain.c -@@ -51,18 +51,26 @@ extern void init_pvsys(void); - - #include <signal.h> - --#if defined(LINUX) -+#if defined(LINUX) || defined(__NetBSD__) - - #include <unistd.h> /* Linux real-time by Istvan Varga, Jan 2002 */ - #include <sys/types.h> - #include <errno.h> -+#ifdef BSD -+#include <sys/time.h> -+#include <sys/resource.h> -+#define HIGH_PRIORITY -20 -+#else - #include <sched.h> -+#endif - #include <sys/mman.h> - - void set_rt_priority(int argc, char **argv) - { - int rtmode; -+#ifndef __NetBSD__ - struct sched_param p; -+#endif - int i; - - if (geteuid() != 0) return; /* not root, nothing to do */ -@@ -95,7 +103,7 @@ void set_rt_priority(int argc, char **ar - return; - } - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - /* lock all pages into physical memory */ - if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0) { - fprintf(stderr, "csound: cannot lock memory pages: %s\n", -@@ -104,6 +112,14 @@ void set_rt_priority(int argc, char **ar - } - #endif - -+#ifdef __NetBSD__ -+ if (setpriority(PRIO_PROCESS, 0, HIGH_PRIORITY) == 0) -+ fprintf(stderr, "csound: scheduler priority %i...\n", HIGH_PRIORITY); -+ else -+ fprintf(stderr, "csound: scheduler priority %i failed: %s\n", -+ HIGH_PRIORITY, strerror(errno)); -+ fflush(stderr); -+#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) { -@@ -111,13 +127,14 @@ void set_rt_priority(int argc, char **ar - strerror(errno)); - exit(-1); - } -+#endif - /* give up root permissions */ - setuid(getuid()); - } - - #endif - --#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(MACOSX) -+#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__NetBSD__) - static char *signal_to_string(int sig) - { - switch(sig) { diff --git a/audio/csound-dev/patches/patch-af b/audio/csound-dev/patches/patch-af deleted file mode 100644 index 18afe587f3e..00000000000 --- a/audio/csound-dev/patches/patch-af +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-af,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- include/cs.h.orig 2003-02-25 19:24:01.000000000 -0800 -+++ include/cs.h -@@ -21,6 +21,24 @@ extern "C" { - - #include "Csound/csound.h" - -+/*__BIG_ENDIAN__ is used various places in csound -+ BIG_ENDIAN is used by the sdif code -+ in NetBSD, (BIG|LITTLE)_ENDIAN is defined by sys/endian.h -+ included in sys/types included in stdlib.h -+ */ -+#ifdef __NetBSD__ -+#undef BIG_ENDIAN -+#undef LITTLE_ENDIAN -+#endif -+ -+#if _BYTE_ORDER == _BIG_ENDIAN -+#define __BIG_ENDIAN__ -+#define BIG_ENDIAN -+#else -+#define __LITTLE_ENDIAN__ -+#define LITTLE_ENDIAN -+#endif -+ - #define VMSGS 1 - #if VMSGS - #define VMSG(x) if ((cglob.oparms)->odebug) x diff --git a/audio/csound-dev/patches/patch-ag b/audio/csound-dev/patches/patch-ag deleted file mode 100644 index efb95474a31..00000000000 --- a/audio/csound-dev/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- sdif.h.orig 2003-02-02 19:24:00.000000000 -0800 -+++ sdif.h -@@ -336,6 +336,7 @@ void SDIF_Copy4Bytes(char *target, const - #define LITTLE_ENDIAN 1 - #else - /* Insert other checks for your architecture here if it's little endian. */ -+#include "cs.h" - #endif - - SDIFresult SDIF_Write1(const void *block, size_t n, FILE *f); diff --git a/audio/csound-dev/patches/patch-ah b/audio/csound-dev/patches/patch-ah deleted file mode 100644 index ad634348802..00000000000 --- a/audio/csound-dev/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- opcodes/sftype.h.orig 2002-12-15 19:23:01.000000000 -0800 -+++ opcodes/sftype.h -@@ -1,3 +1,4 @@ -+#include "cs.h" - - #if !defined(_SFTYPE_H) - #ifdef __GNUC__ -@@ -27,7 +28,7 @@ typedef unsigned short SFTransform; - - typedef struct - { --#if defined(mac_classic) || defined(SGI) || defined(MACOSX) -+#if defined(mac_classic) || defined(SGI) || defined(MACOSX) || defined(__BIG_ENDIAN__) - /* and any such bigendian m/c */ - BYTE byHi PACKED; - BYTE byLo PACKED; diff --git a/audio/csound-dev/patches/patch-ai b/audio/csound-dev/patches/patch-ai deleted file mode 100644 index 4db271a2fb6..00000000000 --- a/audio/csound-dev/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- linevent.c.orig 2003-02-02 19:24:00.000000000 -0800 -+++ linevent.c -@@ -13,7 +13,7 @@ void RTclose(void); - # include <unistd.h> - #else - extern int close(int); --#if !defined(mac_classic) && !defined(SYMANTEC) && !defined(LINUX) -+#if !defined(mac_classic) && !defined(SYMANTEC) && !defined(LINUX) && !defined(__NetBSD__) - extern int read(int, void*, unsigned); - #endif - #endif diff --git a/audio/csound-dev/patches/patch-aj b/audio/csound-dev/patches/patch-aj deleted file mode 100644 index 2b50bda4a12..00000000000 --- a/audio/csound-dev/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- aiff.c.orig 2003-02-02 19:24:00.000000000 -0800 -+++ aiff.c -@@ -13,7 +13,7 @@ float benfloat(float x); - #if defined(__BEOS__) || defined(LINUX) - #include <unistd.h> - #else --#if !defined(mac_classic) && !defined( SYMANTEC ) && !defined( LINUX ) -+#if !defined(mac_classic) && !defined( SYMANTEC ) && !defined( LINUX ) && !defined(__NetBSD__) - extern int write(int, const void*, unsigned int); - #endif - extern off_t lseek(int, off_t, int); diff --git a/audio/csound-dev/patches/patch-ak b/audio/csound-dev/patches/patch-ak deleted file mode 100644 index d67c018187d..00000000000 --- a/audio/csound-dev/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- soundio.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ soundio.c -@@ -1400,7 +1404,7 @@ static void int24ptran(void) - - if (osfopen) { - /* this is for direct 24bit packed output */ --#if defined(_macintosh)||defined(SGI)||defined(LINUX_BE)||defined(LINUX_PPC) -+#if defined(_macintosh)||defined(SGI)||defined(LINUX_BE)||defined(LINUX_PPC)||defined(__BIG_ENDIAN__) - /* and all similar byte order machines */ - *int24outbufp++ = s24.bytes[0]; - *int24outbufp++ = s24.bytes[1]; diff --git a/audio/csound-dev/patches/patch-al b/audio/csound-dev/patches/patch-al deleted file mode 100644 index 1cb2258c2e7..00000000000 --- a/audio/csound-dev/patches/patch-al +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-al,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- plugins/rtaudio/rtlinux.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ plugins/rtaudio/rtlinux.c -@@ -123,7 +123,7 @@ static void setsndparms(void *csound, - ENGINE->Message(csound, msg); - } - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - /* set DMA buffer fragment size to Csound's output buffer size */ - parm = 0; frag_size = 1; - /* find least power of 2 >= bufsiz */ -@@ -178,7 +178,7 @@ static void setvolume(void *csound, unsi - } - } - --#define DSP_NAME "/dev/dsp" -+#define DSP_NAME DEVOSSSOUND - - static void* - recopen(void *csound, AUDIOPARMS *devParms) /* open for audio input */ -@@ -262,7 +262,8 @@ rtplay(void *audioOutData, char *outbuf, - { - /* J. Mohr 1995 Oct 17 */ /* IV - Nov 10 2002 */ - if (write((int) audioOutData, outbuf, nbytes) < nbytes) -- fprintf(stderr, "/dev/dsp: could not write all bytes requested\n"); -+ fprintf(stderr, "%s: could not write all bytes requested\n", -+ DSP_NAME); - } - - static void rtclose(void *audioInData, void *audioOutData) diff --git a/audio/csound-dev/patches/patch-am b/audio/csound-dev/patches/patch-am deleted file mode 100644 index b68cb1088ce..00000000000 --- a/audio/csound-dev/patches/patch-am +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-am,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- Makefile.libnames.orig 2003-02-25 19:24:01.000000000 -0800 -+++ Makefile.libnames -@@ -11,14 +11,14 @@ LIBCSND_S = libcsound.a - # dynamic library - - ifneq ($(findstring -DMYFLT=double,$(DEFINES)),) --CSLIB = -lcsound64 -+CSLIB = -Wl,-R${LIBDIR} -lcsound64 - ifneq ($(findstring .so,$(DLLSUFFIX)),) - LIBCSND_D = libcsound64$(DLLSUFFIX) - else - LIBCSND_D = csound64$(DLLSUFFIX) - endif - else --CSLIB = -lcsound32 -+CSLIB = -Wl,-R${LIBDIR} -lcsound32 - ifneq ($(findstring .so,$(DLLSUFFIX)),) - LIBCSND_D = libcsound32$(DLLSUFFIX) - else diff --git a/audio/csound-dev/patches/patch-an b/audio/csound-dev/patches/patch-an deleted file mode 100644 index 0b642083ea0..00000000000 --- a/audio/csound-dev/patches/patch-an +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-an,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- timers.c.orig 2003-02-02 19:24:00.000000000 -0800 -+++ timers.c -@@ -25,7 +25,9 @@ - /* could in fact work under any x86/GCC system, but do not */ - /* know how to query the actual CPU frequency ... */ - -+#ifndef __NetBSD__ - #define HAVE_RDTSC 1 -+#endif - - /* ------------------------------------------------------------------------- */ - diff --git a/audio/csound-dev/patches/patch-ao b/audio/csound-dev/patches/patch-ao deleted file mode 100644 index ab96608581f..00000000000 --- a/audio/csound-dev/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- globals.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ globals.c -@@ -253,7 +253,7 @@ void globalsRESET(void *csound) - cs_globals->O.sfwrite = 1; - cs_globals->O.sfheader = 1; - cs_globals->O.displays = 1; --#ifdef LINUX -+#if defined(LINUX) && !defined(__NetBSD__) - cs_globals->O.msglevel = 231; - #elif defined(WIN32) - cs_globals->O.msglevel = 135; diff --git a/audio/csound-dev/patches/patch-ap b/audio/csound-dev/patches/patch-ap deleted file mode 100644 index cf340cf6592..00000000000 --- a/audio/csound-dev/patches/patch-ap +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2004/03/15 20:52:07 ben Exp $ - ---- plugins/Makefile.orig Tue Feb 25 19:24:01 2003 -+++ plugins/Makefile -@@ -23,16 +23,18 @@ main.o: main.c - $(CC) $(CFLAGS) $(C_FLAGS) -c $< -o $@ - - %-32.o: %.c -- $(CC) $(CFLAGS) $(C_FLAGS) -UMYFLT -DMYFLT=float -c $< -o $@ -+ $(CC) `echo $(CFLAGS) $(C_FLAGS) | sed s/MYFLT=double/MYFLT=float/g` \ -+ -c $< -o $@ - - %-64.o: %.c -- $(CC) $(CFLAGS) $(C_FLAGS) -UMYFLT -DMYFLT=double -c $< -o $@ -+ $(CC) `echo $(CFLAGS) $(C_FLAGS) | sed s/MYFLT=float/MYFLT=double/g` \ -+ -c $< -o $@ - - $(PLGNDIR): - mkdir -p -m 0755 $@ - - install: $(PLUGIN) $(PLGNDIR) -- install -p -m 0755 $(PLUGIN) $(PLGNDIR) -+ $(BSD_INSTALL_DATA) $(PLUGIN) $(PLGNDIR) - ifneq ($(strip $(RTAUDIO_PLUGINS)),) - cd rtaudio ; make $@ - endif diff --git a/audio/csound-dev/patches/patch-aq b/audio/csound-dev/patches/patch-aq deleted file mode 100644 index 2b832a10e2c..00000000000 --- a/audio/csound-dev/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- plugins/rtaudio/Makefile.orig 2003-02-25 19:24:01.000000000 -0800 -+++ plugins/rtaudio/Makefile -@@ -19,7 +19,7 @@ $(PLGNDIR): - mkdir -p -m 0755 $@ - - install: $(RTAUDIO_PLUGINS) $(PLGNDIR) -- install -p -m 0755 $(RTAUDIO_PLUGINS) $(PLGNDIR) -+ $(BSD_INSTALL_DATA) $(RTAUDIO_PLUGINS) $(PLGNDIR) - - install-strip: install - diff --git a/audio/csound-dev/patches/patch-ar b/audio/csound-dev/patches/patch-ar deleted file mode 100644 index 01fcdda63f5..00000000000 --- a/audio/csound-dev/patches/patch-ar +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2004/03/08 23:40:18 wiz Exp $ - ---- utils/util1/cs/Makefile.orig Wed Feb 26 04:24:01 2003 -+++ utils/util1/cs/Makefile -@@ -10,7 +10,7 @@ OBJ1 = cs.o - all: $(PGM1) - - $(PGM1): $(OBJ1) -- $(LD) $(CFLAGS) -o $@ $(OBJ1) $(LIBS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ1) $(LIBS) - - %.o: %.c - $(CC) $(CFLAGS) $(C_FLAGS) -c $< -o $@ -@@ -19,10 +19,10 @@ $(BINDIR): - mkdir -p -m 0755 $@ - - install: $(PGM1) $(PGM2) $(BINDIR) -- install -p -m 0755 $(PGM1) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM1) $(BINDIR) - - install-strip: $(PGM1) $(PGM2) $(BINDIR) -- install -p -m 0755 -s $(PGM1) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM1) $(BINDIR) - - uninstall: - rm -f $(BINDIR)/$(PGM1) diff --git a/audio/csound-dev/patches/patch-as b/audio/csound-dev/patches/patch-as deleted file mode 100644 index 7c497706d17..00000000000 --- a/audio/csound-dev/patches/patch-as +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-as,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- utils/util1/csdutils/Makefile.orig 2003-02-25 19:24:01.000000000 -0800 -+++ utils/util1/csdutils/Makefile -@@ -23,12 +23,12 @@ $(BINDIR): - mkdir -p -m 0755 $@ - - install: $(PGM1) $(PGM2) $(BINDIR) -- install -p -m 0755 $(PGM1) $(BINDIR) -- install -p -m 0755 $(PGM2) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM1) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM2) $(BINDIR) - - install-strip: $(PGM1) $(PGM2) $(BINDIR) -- install -p -m 0755 -s $(PGM1) $(BINDIR) -- install -p -m 0755 -s $(PGM2) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM1) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM2) $(BINDIR) - - uninstall: - rm -f $(BINDIR)/$(PGM1) diff --git a/audio/csound-dev/patches/patch-at b/audio/csound-dev/patches/patch-at deleted file mode 100644 index 1d3e55e3ed6..00000000000 --- a/audio/csound-dev/patches/patch-at +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-at,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- utils/util1/utilwrap/Makefile.orig 2003-02-25 19:24:01.000000000 -0800 -+++ utils/util1/utilwrap/Makefile -@@ -25,22 +25,22 @@ $(BINDIR): - mkdir -p -m 0755 $@ - - install: $(PGM1) $(PGM2) $(PGM3) $(PGM4) $(PGM5) $(PGM6) $(PGM7) $(BINDIR) -- install -p -m 0755 $(PGM1) $(BINDIR) -- install -p -m 0755 $(PGM2) $(BINDIR) -- install -p -m 0755 $(PGM3) $(BINDIR) -- install -p -m 0755 $(PGM4) $(BINDIR) -- install -p -m 0755 $(PGM5) $(BINDIR) -- install -p -m 0755 $(PGM6) $(BINDIR) -- install -p -m 0755 $(PGM7) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM1) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM2) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM3) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM4) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM5) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM6) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM7) $(BINDIR) - - install-strip: $(PGM1) $(PGM2) $(PGM3) $(PGM4) $(PGM5) $(PGM6) $(PGM7) $(BINDIR) -- install -p -m 0755 -s $(PGM1) $(BINDIR) -- install -p -m 0755 -s $(PGM2) $(BINDIR) -- install -p -m 0755 -s $(PGM3) $(BINDIR) -- install -p -m 0755 -s $(PGM4) $(BINDIR) -- install -p -m 0755 -s $(PGM5) $(BINDIR) -- install -p -m 0755 -s $(PGM6) $(BINDIR) -- install -p -m 0755 -s $(PGM7) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM1) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM2) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM3) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM4) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM5) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM6) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) $(PGM7) $(BINDIR) - - uninstall: - rm -f $(BINDIR)/$(PGM1) diff --git a/audio/csound-dev/patches/patch-au b/audio/csound-dev/patches/patch-au deleted file mode 100644 index 5efc856b1a1..00000000000 --- a/audio/csound-dev/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.1 2003/12/13 20:26:03 ben Exp $ - ---- pvoc.c.orig 2003-02-25 19:24:01.000000000 -0800 -+++ pvoc.c -@@ -8,7 +8,7 @@ - #include "Csound/sysdep.h" - - #include <stdio.h> --#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__) -+#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__) || defined(__NetBSD__) - # include <stdlib.h> /* for malloc() */ - # define READMODE "rb" - # define WRITEMODE "wb+" diff --git a/audio/csound-dev/patches/patch-av b/audio/csound-dev/patches/patch-av deleted file mode 100644 index b09eb6247af..00000000000 --- a/audio/csound-dev/patches/patch-av +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-av,v 1.2 2004/09/11 02:05:01 minskim Exp $ - ---- csound.c.orig 2003-02-25 21:24:01.000000000 -0600 -+++ csound.c -@@ -45,6 +45,9 @@ extern "C" { - #define WIN32_LEAN_AND_MEAN - #include <windows.h> - #endif -+#ifdef __linux__ -+#include <stdint.h> -+#endif - - #ifdef __CYGWIN__ - #undef __unix -@@ -696,10 +699,12 @@ char csoundGetChar(void) - if (!tty_attr_set) - inchar_tty_init(); /* initialise terminal if not done yet */ - /* otherwise poll stdin for input (currently UNIX only) */ -+ { - unsigned char ch; - /* IV - Jan 30 2003 */ - if ((int) read(0, &ch, 1) > 0 && (int) ch != '\0') - c = (char) ch; -+ } - #endif - } - /* return whatever was read */ diff --git a/audio/csound-dev/patches/patch-aw b/audio/csound-dev/patches/patch-aw deleted file mode 100644 index f4e894e5404..00000000000 --- a/audio/csound-dev/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2004/02/19 04:49:40 ben Exp $ - ---- widgets.cpp.orig 2003-02-25 19:24:01.000000000 -0800 -+++ widgets.cpp -@@ -1631,7 +1631,7 @@ extern "C" void FL_run(FLRUN *p) - pthread_t thread1; - // IV - Aug 27 2002: widget thread is always run with normal priority - pthread_attr_init(&a); --#ifdef LINUX -+#if defined(LINUX) && !defined(BSD) - pthread_attr_setschedpolicy(&a, SCHED_OTHER); - pthread_attr_setinheritsched(&a, PTHREAD_EXPLICIT_SCHED); - #endif diff --git a/audio/csound-dev/patches/patch-ax b/audio/csound-dev/patches/patch-ax deleted file mode 100644 index f4bdfa9f761..00000000000 --- a/audio/csound-dev/patches/patch-ax +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2004/03/15 20:52:07 ben Exp $ - ---- include/Csound/sysdep.h.orig Mon Mar 15 12:00:29 2004 -+++ include/Csound/sysdep.h -@@ -162,24 +162,44 @@ extern "C" { - # include <stdint.h> - #elif !defined(__int8_t_defined) - /* these should be fairly portable, */ -+#ifndef int8_t - typedef signed char int8_t; -+#endif -+#ifndef uint8_t - typedef unsigned char uint8_t; -+#endif -+#ifndef int16_t - typedef short int16_t; -+#endif -+#ifndef uint16_t - typedef unsigned short uint16_t; -+#endif -+#ifndef int32_t - typedef int int32_t; -+#endif -+#ifndef uint32_t - typedef unsigned int uint32_t; -+#endif - # ifdef __GNUC__ - /* unlike the following ones */ -+#ifndef int64_t - typedef long long int64_t; -+#endif -+#ifndef uint64_t - typedef unsigned long long uint64_t; -+#endif - # elif defined(MSVC) || defined(_MSC_VER) - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; - # endif - /* these do not work on Win64, but are OK on 64 bit UNIX */ - /* systems and all 32 bit platforms */ -+#ifndef intptr_t - typedef long intptr_t; -+#endif -+#ifndef uintptr_t - typedef unsigned long uintptr_t; -+#endif - #endif - - #ifndef PI diff --git a/audio/csound-dev/patches/patch-ay b/audio/csound-dev/patches/patch-ay deleted file mode 100644 index fd6a060eca8..00000000000 --- a/audio/csound-dev/patches/patch-ay +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2004/09/11 02:05:01 minskim Exp $ - ---- memalloc.c.orig 2003-02-25 21:24:01.000000000 -0600 -+++ memalloc.c -@@ -4,6 +4,9 @@ - #define CS_H_NO_MACROS_FOR_GLOBALS 1 - - #include <cs.h> -+#ifdef __linux__ -+#include <stdint.h> -+#endif - #include "memalloc.h" - - #define CS_MEMINFO_BLOCK_SIZE 256 |