diff --git a/.gitignore b/.gitignore index 7bc529f..174e4ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ Csound5.10.1.tar.gz Csound5.10_manual_html.zip Csound5.10_manual_src.tar.gz +/Csound5.12.1.tar.gz +/Csound5.12-manual-src.tar.gz +/Csound5.12_manual_html.zip diff --git a/csound-2817271-soname.patch b/csound-2817271-soname.patch deleted file mode 100644 index b054a91..0000000 --- a/csound-2817271-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Csound5.10.1/SConstruct.orig 2009-07-06 05:23:11.000000000 +0000 -+++ Csound5.10.1/SConstruct 2009-07-06 06:26:39.000000000 +0000 -@@ -1102,7 +1102,7 @@ - os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', libName]) - os.symlink(libName2, libName) - tmp = csoundDynamicLibraryEnvironment['SHLINKFLAGS'] -- tmp += ['-Wl,-soname=%s' % libName2] -+ tmp = tmp + ['-Wl,-soname=%s' % libName2] - cflags = csoundDynamicLibraryEnvironment['CCFLAGS'] - if configure.CheckGcc4(): - cflags += ['-fvisibility=hidden'] diff --git a/csound-5.10.1-all-midi.patch b/csound-5.10.1-all-midi.patch deleted file mode 100644 index abad494..0000000 --- a/csound-5.10.1-all-midi.patch +++ /dev/null @@ -1,251 +0,0 @@ -diff --git a/InOut/rtalsa.c b/InOut/rtalsa.c -index 94bd9fe..381ad97 100644 ---- a/InOut/rtalsa.c -+++ b/InOut/rtalsa.c -@@ -2,6 +2,7 @@ - rtalsa.c: - - Copyright (C) 2005 Istvan Varga -+ (C) 2009 Andrés Cabrera, Clemens Ladisch - - This file is part of Csound. - -@@ -82,8 +83,10 @@ typedef struct alsaMidiInputDevice_ { - snd_rawmidi_t *dev; - int bufpos, nbytes, datreq; - unsigned char prvStatus, dat1, dat2; -+ struct alsaMidiInputDevice_ *next; - } alsaMidiInputDevice; - -+ - typedef struct midiDevFile_ { - unsigned char buf[BUF_SIZE]; - int fd; -@@ -665,29 +668,89 @@ static void rtclose_(CSOUND *csound) - } - } - --static int midi_in_open(CSOUND *csound, void **userData, const char *devName) -+static alsaMidiInputDevice* open_midi_device(CSOUND *csound, const char *s) - { -- alsaMidiInputDevice *dev; -- const char *s = "hw:0,0"; - int err; -+ alsaMidiInputDevice *dev; - -- (*userData) = NULL; - dev = (alsaMidiInputDevice*) malloc(sizeof(alsaMidiInputDevice)); - if (dev == NULL) { - csound->ErrorMsg(csound, Str("ALSA MIDI: memory allocation failure")); -- return -1; -+ return dev; - } - memset(dev, 0, sizeof(alsaMidiInputDevice)); -- if (devName != NULL && devName[0] != '\0') -- s = devName; - err = snd_rawmidi_open(&(dev->dev), NULL, s, SND_RAWMIDI_NONBLOCK); - if (err != 0) { -- csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device")); -- free((void*) dev); -- return -1; -+ csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device: '%s'"), s); -+ free(dev); -+ return NULL; - } - csound->Message(csound, Str("ALSA: opened MIDI input device '%s'\n"), s); -- (*userData) = (void*) dev; -+ return dev; -+} -+ -+// This is the function which contains code from amidi -+static int midi_in_open(CSOUND *csound, void **userData, const char *devName) -+{ -+ alsaMidiInputDevice *dev, *newdev, *olddev; -+ const char *s = "hw:0,0"; -+ int card, err; -+ int device; -+ snd_ctl_t *ctl; -+ char* name; -+ name = (char *) calloc(32, sizeof(char)); -+ -+ (*userData) = NULL; -+ olddev = NULL; -+ if (devName[0] == 'a') { -+ csound->Message(csound, Str("ALSA midi: Using all devices.\n")); -+ card = -1; -+ if (snd_card_next(&card) >= 0 && card >= 0) { -+ do { -+ sprintf(name, "hw:%d", card); -+ if (snd_ctl_open(&ctl, name, 0) >= 0) { -+ device = -1; -+ for (;;) { -+ if (snd_ctl_rawmidi_next_device(ctl, &device) < 0) { -+ break; -+ } -+ if (device < 0) -+ break; -+ sprintf(name, "hw:%d,%d", card, device); -+ newdev = open_midi_device(csound, name); -+ if (newdev != NULL) { /* Device opened successfully */ -+ if (olddev != NULL) { -+ olddev->next = newdev; -+ } -+ else { /* First Device */ -+ dev = newdev; -+ } -+ olddev = newdev; -+ newdev = NULL; -+ } -+ else { /* Device couldn't be opened */ -+ csound->Message(csound, -+ Str("ALSA midi: Error opening device: %s\n"), -+ name); -+ } -+ } -+ } -+ if (snd_card_next(&card) < 0) -+ break; -+ } while (card >= 0); -+ -+ snd_ctl_close(ctl); -+ } -+ } -+ else if (devName != NULL && devName[0] != '\0') { -+ dev = open_midi_device(csound, devName); -+ if (dev == NULL) { -+ free(name); -+ return -1; -+ } -+ } -+ *userData = (void*) dev; -+ free(name); - return 0; - } - -@@ -698,58 +761,74 @@ static int midi_in_read(CSOUND *csound, - int bufpos = 0; - unsigned char c; - -- (void) csound; -- while ((nbytes - bufpos) >= 3) { -- if (dev->bufpos >= dev->nbytes) { /* read from device */ -- int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE); -- dev->bufpos = 0; -- if (n <= 0) { /* until there is no more data left */ -- dev->nbytes = 0; -- break; -+ if (!dev) { /* No devices */ -+ /* fprintf(stderr, "No devices!"); */ -+ return 0; -+ } -+ /* (void) csound; */ -+ dev->bufpos = 0; -+ while (dev && dev->dev) { -+ while ((nbytes - bufpos) >= 3) { -+ if (dev->bufpos >= dev->nbytes) { /* read from device */ -+ int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE); -+ dev->bufpos = 0; -+ if (n <= 0) { /* until there is no more data left */ -+ dev->nbytes = 0; -+ break; -+ } -+ dev->nbytes = n; - } -- dev->nbytes = n; -- } -- c = dev->buf[dev->bufpos++]; -- if (c >= (unsigned char) 0xF8) { /* real time message */ -- buf[bufpos++] = c; -- continue; -- } -- if (c == (unsigned char) 0xF7) /* end of system exclusive */ -- c = dev->prvStatus; -- if (c < (unsigned char) 0x80) { /* data byte */ -- if (dev->datreq <= 0) -+ c = dev->buf[dev->bufpos++]; -+ if (c >= (unsigned char) 0xF8) { /* real time message */ -+ buf[bufpos++] = c; - continue; -- if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4]) -- dev->dat1 = c; -- else -- dev->dat2 = c; -- if (--(dev->datreq) != 0) -+ } -+ if (c == (unsigned char) 0xF7) /* end of system exclusive */ -+ c = dev->prvStatus; -+ if (c < (unsigned char) 0x80) { /* data byte */ -+ if (dev->datreq <= 0) -+ continue; -+ if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4]) -+ dev->dat1 = c; -+ else -+ dev->dat2 = c; -+ if (--(dev->datreq) != 0) -+ continue; -+ dev->datreq = dataBytes[(int) dev->prvStatus >> 4]; -+ buf[bufpos] = dev->prvStatus; -+ buf[bufpos + 1] = dev->dat1; -+ buf[bufpos + 2] = dev->dat2; -+ bufpos += (dev->datreq + 1); - continue; -- dev->datreq = dataBytes[(int) dev->prvStatus >> 4]; -- buf[bufpos] = dev->prvStatus; -- buf[bufpos + 1] = dev->dat1; -- buf[bufpos + 2] = dev->dat2; -- bufpos += (dev->datreq + 1); -- continue; -- } -- else if (c < (unsigned char) 0xF0) { /* channel message */ -- dev->prvStatus = c; -- dev->datreq = dataBytes[(int) c >> 4]; -- continue; -+ } -+ else if (c < (unsigned char) 0xF0) { /* channel message */ -+ dev->prvStatus = c; -+ dev->datreq = dataBytes[(int) c >> 4]; -+ continue; -+ } -+ if (c < (unsigned char) 0xF4) /* ignore system messages */ -+ dev->datreq = -1; - } -- if (c < (unsigned char) 0xF4) /* ignore system messages */ -- dev->datreq = -1; -+ dev = dev->next; - } - return bufpos; - } - - static int midi_in_close(CSOUND *csound, void *userData) - { -- int retval = 0; -+ int ret, retval = 0; -+ alsaMidiInputDevice *olddev, *dev = NULL; - (void) csound; -- if (userData != NULL) { -- retval = snd_rawmidi_close(((alsaMidiInputDevice*) userData)->dev); -- free(userData); -+ dev = (alsaMidiInputDevice*) userData; -+ while (dev != NULL) { -+ if (dev->dev) { -+ ret = snd_rawmidi_close(dev->dev); -+ } -+ olddev = dev; -+ dev = dev->next; -+ free(olddev); -+ if (retval != -1) -+ retval = ret; - } - return retval; - } -@@ -765,8 +844,8 @@ static int midi_out_open(CSOUND *csound, void **userData, const char *devName) - s = devName; - err = snd_rawmidi_open(NULL, &dev, s, SND_RAWMIDI_NONBLOCK); - if (err != 0) { -- csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device")); -- return -1; -+ csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device '%s'")); -+ return 0; - } - csound->Message(csound, Str("ALSA: opened MIDI output device '%s'\n"), s); - (*userData) = (void*) dev; diff --git a/csound-5.10.1-default-pulse.patch b/csound-5.10.1-default-pulse.patch new file mode 100644 index 0000000..0b8edef --- /dev/null +++ b/csound-5.10.1-default-pulse.patch @@ -0,0 +1,11 @@ +--- Csound5.10.1/Top/csound.c.orig 2009-09-04 10:25:12.000000000 +0100 ++++ Csound5.10.1/Top/csound.c 2009-09-04 10:25:21.000000000 +0100 +@@ -929,7 +929,7 @@ + #ifdef OLPC + strcpy(s, "alsa"); + #else +- strcpy(s, "PortAudio"); ++ strcpy(s, "pulse"); + #endif + csoundCreateConfigurationVariable(p, "rtaudio", s, CSOUNDCFG_STRING, + 0, NULL, &max_len, diff --git a/csound-5.10.1-makebuild.patch b/csound-5.10.1-makebuild.patch deleted file mode 100644 index 6db1f79..0000000 --- a/csound-5.10.1-makebuild.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Csound5.10.1/InOut/widgets.cpp.orig 2009-03-30 15:27:44.000000000 +0100 -+++ Csound5.10.1/InOut/widgets.cpp 2009-03-30 15:28:47.000000000 +0100 -@@ -2946,7 +2946,7 @@ - return OK; - } - -- static int fl_box_(CSOUND *csound, FL_BOX *p) -+ static int fl_boxthing_(CSOUND *csound, FL_BOX *p) - { - char *text = GetString(csound, p->itext, p->XSTRCODE); - Fl_Box *o = new Fl_Box((int)*p->ix, (int)*p->iy, -@@ -5465,7 +5465,7 @@ - { (char*)"FLsetAlign", S(FL_TALIGN), 1, (char*)"", (char*)"ii", - (SUBR) fl_align, (SUBR) NULL, (SUBR) NULL }, - { (char*)"FLbox", S(FL_BOX), 1, (char*)"i", (char*)"Tiiiiiii", -- (SUBR) fl_box_, (SUBR) NULL, (SUBR) NULL }, -+ (SUBR) fl_boxthing_, (SUBR) NULL, (SUBR) NULL }, - { (char*)"FLvalue", S(FLVALUE), 1, (char*)"i", (char*)"Tjjjj", - (SUBR) fl_value, (SUBR) NULL, (SUBR) NULL }, - { (char*)"FLpanel", S(FLPANEL), 1, (char*)"", (char*)"Tjjjoooo", ---- Csound5.10.1/SConstruct.orig 2009-03-30 15:30:20.000000000 +0100 -+++ Csound5.10.1/SConstruct 2009-03-30 15:31:11.000000000 +0100 -@@ -243,7 +243,7 @@ - '0') - commandOptions.Add('tclversion', - 'Set to 8.4 or 8.5', -- '8.4') -+ '8.5') - - # Define the common part of the build environment. - # This section also sets up customized options for third-party libraries, which diff --git a/csound-5.10.1-no-usr-local.patch b/csound-5.10.1-no-usr-local.patch deleted file mode 100644 index ae6107d..0000000 --- a/csound-5.10.1-no-usr-local.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- Csound5.10.1/SConstruct.orig 2009-03-30 18:11:39.000000000 +0100 -+++ Csound5.10.1/SConstruct 2009-03-30 18:19:44.000000000 +0100 -@@ -136,8 +136,8 @@ - 'Set to 1 to build Python opcodes', - '0') - commandOptions.Add('prefix', -- 'Base directory for installs. Defaults to /usr/local.', -- '/usr/local') -+ 'Base directory for installs. Defaults to /usr.', -+ '/usr') - commandOptions.Add('instdir', - 'For the install target: puts instdir before the prefix', - '') -@@ -444,9 +444,9 @@ - commonEnvironment.Prepend(CPPFLAGS = ['-DBETA']) - - if commonEnvironment['Lib64'] == '1': -- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64']) -+ commonEnvironment.Prepend(LIBPATH = ['.', '#.']) - else: -- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib']) -+ commonEnvironment.Prepend(LIBPATH = ['.', '#.']) - - if commonEnvironment['Word64'] == '1': - commonEnvironment.Append(CCFLAGS = ['-fPIC']) -@@ -462,15 +462,12 @@ - if getPlatform() == 'linux': - commonEnvironment.Append(CCFLAGS = "-DLINUX") - commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS') -- commonEnvironment.Append(CPPPATH = '/usr/local/include') -- commonEnvironment.Append(CPPPATH = '/usr/include') - commonEnvironment.Append(CPPPATH = '/usr/include') - commonEnvironment.Append(CPPPATH = '/usr/X11R6/include') - commonEnvironment.Append(CCFLAGS = "-DPIPES") - commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic']) - elif getPlatform() == 'darwin': - commonEnvironment.Append(CCFLAGS = "-DMACOSX") -- commonEnvironment.Append(CPPPATH = '/usr/local/include') - commonEnvironment.Append(CCFLAGS = "-DPIPES") - if commonEnvironment['useAltivec'] == '1': - print 'CONFIGURATION DECISION: Using Altivec optimisation' -@@ -487,7 +484,6 @@ - commonEnvironment.Append(CXXFLAGS = '-DFL_DLL') - if compilerGNU(): - commonEnvironment.Prepend(CCFLAGS = "-Wall") -- commonEnvironment.Append(CPPPATH = '/usr/local/include') - commonEnvironment.Append(CPPPATH = '/usr/include') - commonEnvironment.Append(CCFLAGS = '-mthreads') - commonEnvironment.Append(SHLINKFLAGS = Split('-mwindows -mno-cygwin -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc')) -@@ -519,18 +515,17 @@ - - if getPlatform() == 'linux': - path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion'] -- path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion'] -- pythonIncludePath = [path1, path2] -+ pythonIncludePath = [path1] - path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion'] - path2 = '/usr/include/tk%s' % commonEnvironment['tclversion'] -- tclIncludePath = [path1, path2] -+ tclIncludePath = [path1] - pythonLinkFlags = [] - if commonEnvironment['Lib64'] == '1': - tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion'] -- pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp] -+ pythonLibraryPath = ['/usr/lib64', '/usr/lib64', tmp] - else: - tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion'] -- pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp] -+ pythonLibraryPath = ['/usr/lib', '/usr/lib', tmp] - pythonLibs = ['python%s' % commonEnvironment['pythonVersion']] - elif getPlatform() == 'darwin': - # find Mac OS X major version diff --git a/csound-5.10.1-version-libcsnd.patch3 b/csound-5.10.1-version-libcsnd.patch3 deleted file mode 100644 index c415bd4..0000000 --- a/csound-5.10.1-version-libcsnd.patch3 +++ /dev/null @@ -1,71 +0,0 @@ ---- SConstruct.orig 2009-03-31 15:40:41.000000000 +0100 -+++ SConstruct 2009-03-31 15:42:33.000000000 +0100 -@@ -1326,6 +1326,8 @@ - os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_csnd.so']) - # os.symlink('lib_csnd.so', '_csnd.so') - csoundInterfacesEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.']) -+ # Copy here to avoid poluting SHLINKFLAGS for python -+ csndPythonEnvironment = csoundInterfacesEnvironment.Clone() - if getPlatform() == 'darwin': - if commonEnvironment['dynamicCsoundLibrary'] == '1': - ilibName = "lib_csnd.dylib" -@@ -1344,22 +1346,20 @@ - os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', name]) - os.symlink(soname, name) - linkflags = csoundInterfacesEnvironment['SHLINKFLAGS'] -- soflag = [ '-Wl,-soname=%s' % soname ] -- extraflag = ['-L.'] -+ linkflags += [ '-Wl,-soname=%s' % soname ] - csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary( -- soname, csoundInterfacesSources, SHLINKFLAGS = linkflags+soflag+extraflag, -+ soname, csoundInterfacesSources, SHLINKFLAGS = linkflags, - SHLIBPREFIX = '', SHLIBSUFFIX = '') - else: - csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary('csnd', csoundInterfacesSources) - Depends(csoundInterfaces, csoundLibrary) - libs.append(csoundInterfaces) - if pythonFound: -- csoundInterfacesEnvironment.Append(LINKFLAGS = pythonLinkFlags) -+ csndPythonEnvironment.Append(LINKFLAGS = pythonLinkFlags) - if getPlatform() != 'darwin': -- csoundInterfacesEnvironment.Prepend(LIBPATH = pythonLibraryPath) -- csoundInterfacesEnvironment.Prepend(LIBS = pythonLibs) -- csoundInterfacesEnvironment.Append(CPPPATH = pythonIncludePath) -- csndPythonEnvironment = csoundInterfacesEnvironment.Clone() -+ csndPythonEnvironment.Prepend(LIBPATH = pythonLibraryPath) -+ csndPythonEnvironment.Prepend(LIBS = pythonLibs) -+ csndPythonEnvironment.Append(CPPPATH = pythonIncludePath) - fixCFlagsForSwig(csndPythonEnvironment) - if getPlatform() == 'darwin': - if commonEnvironment['dynamicCsoundLibrary'] == '1': -@@ -1372,7 +1372,8 @@ - csndPythonEnvironment.Append(LIBS = ['csnd']) - csoundPythonInterface = csndPythonEnvironment.SharedObject( - 'interfaces/python_interface.i', -- SWIGFLAGS = [swigflags, '-python', '-outdir', '.']) -+ SWIGFLAGS = [swigflags, '-python', '-outdir', '.'], -+ SHLINKFLAGS = '') - csndPythonEnvironment.Clean('.', 'interfaces/python_interface_wrap.h') - if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and compilerGNU(): - Depends(csoundPythonInterface, pythonImportLibrary) ---- install.py.orig 2009-03-31 15:53:19.000000000 +0100 -+++ install.py 2009-03-31 15:58:23.000000000 +0100 -@@ -270,8 +270,7 @@ - elif i[:15] == 'libcsound64.so.': - err = installLink(i, concatPath([libDir, 'libcsound64.so'])) - elif i == 'libcsnd.so': -- err = installLink(concatPath([libDir, i]), -- concatPath([pythonDir2, '_csnd.so'])) -+ err = installLink(i, concatPath([libDir, 'libcsnd.so'])) - elif i == 'lib_CsoundVST.so': - err = installLink(concatPath([libDir, i]), - concatPath([pythonDir2, '_CsoundVST.so'])) -@@ -287,7 +286,7 @@ - #err = installFile('opcodes.dir', pluginDir) - installErrors = installErrors or err - pluginList = findFiles('.', 'lib[A-Za-z].*\\.so') --for i in ['libcsound.so', 'libcsound64.so']: -+for i in ['libcsound.so', 'libcsound64.so', 'libcsnd.so']: - if i in pluginList: - pluginList.remove(i) - for i in pluginList: diff --git a/csound-5.12.1-fixpython.patch b/csound-5.12.1-fixpython.patch new file mode 100644 index 0000000..1e00f0d --- /dev/null +++ b/csound-5.12.1-fixpython.patch @@ -0,0 +1,19 @@ +--- Csound5.12.1/install.py.orig 2010-12-26 23:57:36.556893990 +0000 ++++ Csound5.12.1/install.py 2010-12-27 00:04:26.322205519 +0000 +@@ -288,7 +288,7 @@ + #err = installFile('opcodes.dir', pluginDir) + installErrors = installErrors or err + pluginList = findFiles('.', 'lib[A-Za-z].*\\.so') +-for i in ['libcsound.so', 'libcsound64.so']: ++for i in ['libcsound.so', 'libcsound64.so', 'libcsnd.so']: + if i in pluginList: + pluginList.remove(i) + for i in pluginList: +@@ -305,6 +305,7 @@ + + print ' === Installing language interfaces ===' + wrapperList = [['csnd\\.py', '0', pythonDir], ++ ['_csnd\\.so', '1', pythonDir], + ['loris\\.py', '0', pythonDir], + ['CsoundVST\\.py', '0', pythonDir], + ['scoregen\\.py', '0', pythonDir], diff --git a/csound-5.12.1-makebuild.patch b/csound-5.12.1-makebuild.patch new file mode 100644 index 0000000..d04278d --- /dev/null +++ b/csound-5.12.1-makebuild.patch @@ -0,0 +1,31 @@ +--- Csound5.12.1/InOut/widgets.cpp.orig 2010-12-27 00:26:43.887343302 +0000 ++++ Csound5.12.1/InOut/widgets.cpp 2010-12-27 00:27:40.589546414 +0000 +@@ -2999,7 +2999,7 @@ + return OK; + } + +- static int fl_box_(CSOUND *csound, FL_BOX *p) ++ static int fl_boxthing_(CSOUND *csound, FL_BOX *p) + { + char *text = GetString(csound, p->itext, p->XSTRCODE); + Fl_Box *o = new Fl_Box((int)*p->ix, (int)*p->iy, +@@ -5570,7 +5570,7 @@ + { (char*)"FLsetAlign", S(FL_TALIGN), 1, (char*)"", (char*)"ii", + (SUBR) fl_align, (SUBR) NULL, (SUBR) NULL }, + { (char*)"FLbox", S(FL_BOX), 1, (char*)"i", (char*)"Tiiiiiii", +- (SUBR) fl_box_, (SUBR) NULL, (SUBR) NULL }, ++ (SUBR) fl_boxthing_, (SUBR) NULL, (SUBR) NULL }, + { (char*)"FLvalue", S(FLVALUE), 1, (char*)"i", (char*)"Tjjjj", + (SUBR) fl_value, (SUBR) NULL, (SUBR) NULL }, + { (char*)"FLpanel", S(FLPANEL), 1, (char*)"", (char*)"Tjjjoooo", +--- Csound5.12.1/SConstruct.orig 2010-12-27 00:29:34.223885014 +0000 ++++ Csound5.12.1/SConstruct 2010-12-27 00:29:42.753607024 +0000 +@@ -259,7 +259,7 @@ + '0') + commandOptions.Add('tclversion', + 'Set to 8.4 or 8.5', +- '8.4') ++ '8.5') + commandOptions.Add('includeMP3', + 'Set to 1 if using mpadec', + '0') diff --git a/csound-5.12.1-no-usr-local.patch b/csound-5.12.1-no-usr-local.patch new file mode 100644 index 0000000..b06e5c8 --- /dev/null +++ b/csound-5.12.1-no-usr-local.patch @@ -0,0 +1,63 @@ +--- Csound5.12.1/SConstruct.orig 2010-12-27 00:07:56.497883757 +0000 ++++ Csound5.12.1/SConstruct 2010-12-27 00:18:35.582892597 +0000 +@@ -139,8 +139,8 @@ + 'Set to 1 to build Python opcodes', + '0') + commandOptions.Add('prefix', +- 'Base directory for installs. Defaults to /usr/local.', +- '/usr/local') ++ 'Base directory for installs. Defaults to /usr.', ++ '/usr') + commandOptions.Add('instdir', + 'For the install target: puts instdir before the prefix', + '') +@@ -484,9 +484,9 @@ + if getPlatform() == 'sunos': + commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64']) + else: +- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64']) ++ commonEnvironment.Prepend(LIBPATH = ['.', '#.']) + else: +- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib']) ++ commonEnvironment.Prepend(LIBPATH = ['.', '#.']) + + if commonEnvironment['Word64'] == '1': + if compilerSun(): +@@ -506,8 +506,6 @@ + if getPlatform() == 'linux': + commonEnvironment.Append(CCFLAGS = "-DLINUX") + commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS']) +- commonEnvironment.Append(CPPPATH = '/usr/local/include') +- commonEnvironment.Append(CPPPATH = '/usr/include') + commonEnvironment.Append(CPPPATH = '/usr/include') + commonEnvironment.Append(CPPPATH = '/usr/X11R6/include') + commonEnvironment.Append(CCFLAGS = "-DPIPES") +@@ -571,18 +569,17 @@ + + if getPlatform() == 'linux': + path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion'] +- path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion'] +- pythonIncludePath = [path1, path2] ++ pythonIncludePath = [path1] + path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion'] + path2 = '/usr/include/tk%s' % commonEnvironment['tclversion'] + tclIncludePath = [path1, path2] + pythonLinkFlags = [] + if commonEnvironment['Lib64'] == '1': + tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion'] +- pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp] ++ pythonLibraryPath = ['/usr/lib64', tmp] + else: + tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion'] +- pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp] ++ pythonLibraryPath = ['/usr/lib', tmp] + pythonLibs = ['python%s' % commonEnvironment['pythonVersion']] + elif getPlatform() == 'sunos': + path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion'] +@@ -2817,5 +2814,5 @@ + + ###Code to create pkconfig files + #env = Environment(tools=['default', 'scanreplace'], toolpath=['tools']) +-#env['prefix'] = '/usr/local' ++#env['prefix'] = '/usr' + #env.ScanReplace('csound5.pc.in') diff --git a/csound-default-pulse.patch b/csound-default-pulse.patch deleted file mode 100644 index 0b8edef..0000000 --- a/csound-default-pulse.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Csound5.10.1/Top/csound.c.orig 2009-09-04 10:25:12.000000000 +0100 -+++ Csound5.10.1/Top/csound.c 2009-09-04 10:25:21.000000000 +0100 -@@ -929,7 +929,7 @@ - #ifdef OLPC - strcpy(s, "alsa"); - #else -- strcpy(s, "PortAudio"); -+ strcpy(s, "pulse"); - #endif - csoundCreateConfigurationVariable(p, "rtaudio", s, CSOUNDCFG_STRING, - 0, NULL, &max_len, diff --git a/csound-fixpython.patch b/csound-fixpython.patch deleted file mode 100644 index a897ec6..0000000 --- a/csound-fixpython.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: Csound5.10.1/install.py -=================================================================== ---- Csound5.10.1.orig/install.py -+++ Csound5.10.1/install.py -@@ -256,7 +256,7 @@ libList = findFiles('.', 'libcsound\\.a' - libList += findFiles('.', 'libcsound64\\.a') - libList += findFiles('.', 'libcsound\\.so\\..+') - libList += findFiles('.', 'libcsound64\\.so\\..+') --libList += findFiles('.', 'libcsnd\\.so') -+libList += findFiles('.', 'libcsnd\\.so\\..+') - libList += findFiles('.', 'lib_jcsound\\.so') - libList += findFiles('.', 'lib_CsoundVST\\.so') - for i in libList: -@@ -269,9 +269,8 @@ for i in libList: - err = installLink(i, concatPath([libDir, 'libcsound.so'])) - elif i[:15] == 'libcsound64.so.': - err = installLink(i, concatPath([libDir, 'libcsound64.so'])) -- elif i == 'libcsnd.so': -- err = installLink(concatPath([libDir, i]), -- concatPath([pythonDir2, '_csnd.so'])) -+ elif i[:11] == 'libcsnd.so.': -+ err = installLink(i, concatPath([libDir, 'libcsnd.so'])) - elif i == 'lib_CsoundVST.so': - err = installLink(concatPath([libDir, i]), - concatPath([pythonDir2, '_CsoundVST.so'])) -@@ -287,7 +286,7 @@ else: - #err = installFile('opcodes.dir', pluginDir) - installErrors = installErrors or err - pluginList = findFiles('.', 'lib[A-Za-z].*\\.so') --for i in ['libcsound.so', 'libcsound64.so']: -+for i in ['libcsound.so', 'libcsound64.so', 'libcsnd.so']: - if i in pluginList: - pluginList.remove(i) - for i in pluginList: -@@ -304,6 +303,7 @@ installErrors = installErrors or err - - print ' === Installing language interfaces ===' - wrapperList = [['csnd\\.py', '0', pythonDir], -+ ['_csnd\\.so', '1', pythonDir], - ['loris\\.py', '0', pythonDir], - ['CsoundVST\\.py', '0', pythonDir], - ['scoregen\\.py', '0', pythonDir], diff --git a/csound.spec b/csound.spec index 5f0a9da..6eb01e6 100644 --- a/csound.spec +++ b/csound.spec @@ -14,13 +14,12 @@ Summary: A sound synthesis language and library Name: csound -Version: 5.10.1 -Release: 21%{?dist} +Version: 5.12.1 +Release: 1%{?dist} URL: http://csound.sourceforge.net/ License: LGPLv2+ Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-devel BuildRequires: python python-devel BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel pulseaudio-libs-devel @@ -35,26 +34,21 @@ BuildRequires: libvorbis-devel libogg-devel BuildRequires: gettext BuildRequires: gcc-c++ boost-devel -Obsoletes: csound-tutorial <= 5.08 -Obsoletes: olpcsound <= 5.08.92 +Source0: http://downloads.sourceforge.net/csound/Csound5.12.1.tar.gz +Source1: http://downloads.sourceforge.net/csound/Csound5.12-manual-src.tar.gz +Source2: http://downloads.sourceforge.net/csound/Csound5.12_manual_html.zip -Source0: http://downloads.sourceforge.net/csound/Csound5.10.1.tar.gz -Source1: http://downloads.sourceforge.net/csound/Csound5.10_manual_src.tar.gz -Source2: http://downloads.sourceforge.net/csound/Csound5.10_manual_html.zip - -Patch1: csound-5.10.1-no-usr-local.patch +Patch0: csound-5.12.1-fixpython.patch +Patch1: csound-5.12.1-no-usr-local.patch Patch2: csound-5.10.1-default-opcodedir.patch Patch3: csound-5.10.1-rtalsa-fix.patch -Patch4: csound-5.10.1-makebuild.patch +Patch4: csound-5.12.1-makebuild.patch Patch5: csound-5.10.1-64-bit-plugin-path.patch Patch6: csound-5.10.1-fix-conflicts.patch Patch7: csound-5.10.1-fix-locale-install.patch Patch8: csound-5.10.1-enable-oggplay.patch -Patch9: csound-2817271-soname.patch -Patch0: csound-fixpython.patch -Patch10: csound-default-pulse.patch -Patch11: csound-5.10.1-compile-flag.patch -Patch12: csound-5.10.1-all-midi.patch +Patch9: csound-5.10.1-default-pulse.patch +Patch10: csound-5.10.1-compile-flag.patch %description Csound is a sound and music synthesis system, providing facilities for @@ -62,12 +56,10 @@ composition and performance over a wide range of platforms. It is not restricted to any style of music, having been used for many years in at least classical, pop, techno, ambient... - %package devel Summary: Csound development files and libraries Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: olpcsound-devel <= 5.08.92 %description devel Contains headers and libraries for developing applications that use Csound. @@ -195,7 +187,7 @@ Canonical Reference Manual for Csound. %prep -%setup -q -n Csound5.10.1 +%setup -q -n Csound5.12.1 %patch0 -p1 -b .fixpython %patch1 -p1 -b .no-usr-local %patch2 -p1 -b .default-opcodedir @@ -205,10 +197,8 @@ Canonical Reference Manual for Csound. %patch6 -p1 -b .fix-conflicts %patch7 -p1 -b .fix-local-install %patch8 -p1 -b .enable-oggplay -%patch9 -p1 -b .2817271-soname -%patch10 -p1 -b .default-pulse -%patch11 -p1 -b .compile-flag -%patch12 -p1 -b .all-midi +%patch9 -p1 -b .default-pulse +%patch10 -p1 -b .compile-flag tar xf %{SOURCE1} (cd manual; unzip -q %{SOURCE2}) @@ -333,13 +323,16 @@ fi %{_libdir}/%{name}/plugins/libcompress.so %{_libdir}/%{name}/plugins/libcontrol.so %{_libdir}/%{name}/plugins/libchua.so +%{_libdir}/%{name}/plugins/libcrossfm.so %{_libdir}/%{name}/plugins/libcs_date.so %{_libdir}/%{name}/plugins/libcs_pan2.so %{_libdir}/%{name}/plugins/libcs_pvs_ops.so +%{_libdir}/%{name}/plugins/libdoppler.so %{_libdir}/%{name}/plugins/libeqfil.so %{_libdir}/%{name}/plugins/libftest.so %{_libdir}/%{name}/plugins/libgabnew.so %{_libdir}/%{name}/plugins/libgrain4.so +%{_libdir}/%{name}/plugins/libharmon.so %{_libdir}/%{name}/plugins/libhrtferX.so %{_libdir}/%{name}/plugins/libhrtfnew.so %{_libdir}/%{name}/plugins/libimage.so @@ -363,14 +356,15 @@ fi %{_libdir}/%{name}/plugins/libscoreline.so %{_libdir}/%{name}/plugins/libsfont.so %{_libdir}/%{name}/plugins/libshape.so +%{_libdir}/%{name}/plugins/libsignalflowgraph.so %{_libdir}/%{name}/plugins/libstackops.so %{_libdir}/%{name}/plugins/libstdopcod.so %{_libdir}/%{name}/plugins/libstdutil.so %{_libdir}/%{name}/plugins/libsystem_call.so +%{_libdir}/%{name}/plugins/libtabsum.so %{_libdir}/%{name}/plugins/libudprecv.so %{_libdir}/%{name}/plugins/libudpsend.so %{_libdir}/%{name}/plugins/libvbap.so -%{_libdir}/%{name}/plugins/libharmon.so %{_libdir}/%{name}/plugins/libugakbari.so %{_libdir}/%{name}/plugins/libvaops.so %{_libdir}/%{name}/plugins/libvosim.so @@ -388,7 +382,7 @@ fi %files python-devel %defattr(-,root,root,-) -%{_libdir}/libcsnd.so +# %{_libdir}/libcsnd.so %files java %defattr(-,root,root,-) @@ -448,6 +442,9 @@ fi %doc manual/examples %changelog +* Sun Dec 26 2010 Peter Robinson - 5.12.1-1 +- Update to 5.12.1. + * Sat Jul 31 2010 Toshio Kuratomi - 5.10.1-21 - Fix python location diff --git a/sources b/sources index 9f768a2..a260849 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7b2f4b4eb6ccab66e06625cb5377d4f7 Csound5.10.1.tar.gz -e1eba0da11cfc1d85ef2113a81af91eb Csound5.10_manual_html.zip -90d9a0e441e6473d7f42ca35fae86394 Csound5.10_manual_src.tar.gz +70b0c4a159c4960a09719674657949c9 Csound5.12.1.tar.gz +102a79d89e9a69c3c1abc070ce1a44e5 Csound5.12-manual-src.tar.gz +a806f73c95cf2d9f0d93c0d39e94cd6d Csound5.12_manual_html.zip