[csound] update patches for 5.13.0
Peter Robinson
pbrobinson at fedoraproject.org
Thu Apr 7 09:52:58 UTC 2011
commit 6a86dc998ad447fd3e18f6f35e008e960dc6b771
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Apr 7 10:52:32 2011 +0100
update patches for 5.13.0
csound-5.10.1-compile-flag.patch | 75 --------------------
csound-5.10.1-default-pulse.patch | 11 ---
csound-5.10.1-fix-locale-install.patch | 20 -----
csound-5.12.1-makebuild.patch | 31 --------
csound-5.12.1-no-usr-local.patch | 63 ----------------
csound-5.13.0-1.fc16.src.rpm | Bin 0 -> 24180751 bytes
csound-5.13.0-compile-flag.patch | 63 ++++++++++++++++
....patch => csound-5.13.0-default-opcodedir.patch | 26 +++++---
csound-5.13.0-default-pulse.patch | 15 ++++
...icts.patch => csound-5.13.0-fix-conflicts.patch | 16 ++--
csound-5.13.0-fix-locale-install.patch | 11 +++
csound-5.13.0-no-usr-local.patch | 71 ++++++++++++++++++
csound-5.13.0-tclversion.patch | 11 +++
csound.spec | 28 ++++----
14 files changed, 210 insertions(+), 231 deletions(-)
---
diff --git a/csound-5.13.0-1.fc16.src.rpm b/csound-5.13.0-1.fc16.src.rpm
new file mode 100644
index 0000000..1885c65
Binary files /dev/null and b/csound-5.13.0-1.fc16.src.rpm differ
diff --git a/csound-5.13.0-compile-flag.patch b/csound-5.13.0-compile-flag.patch
new file mode 100644
index 0000000..88e2751
--- /dev/null
+++ b/csound-5.13.0-compile-flag.patch
@@ -0,0 +1,63 @@
+--- Csound5.13.0/Top/csound.c.orig 2011-04-07 10:36:19.738489172 +0100
++++ Csound5.13.0/Top/csound.c 2011-04-07 10:41:09.834581223 +0100
+@@ -1382,6 +1382,10 @@
+ {
+ int done;
+ int returnValue;
++ /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
++ if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
++ return 1;
++ }
+ /* setup jmp for return after an exit() */
+ if ((returnValue = setjmp(csound->exitjmp))) {
+ #ifndef MACOSX
+@@ -1402,6 +1406,10 @@
+ {
+ int done = 0;
+ int returnValue;
++ /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
++ if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
++ return 1;
++ }
+ /* setup jmp for return after an exit() */
+ if ((returnValue = setjmp(csound->exitjmp))) {
+ #ifndef MACOSX
+@@ -1447,6 +1455,10 @@
+ int done;
+ int returnValue;
+ csound->performState = 0;
++ /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
++ if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
++ return 1;
++ }
+ /* setup jmp for return after an exit() */
+ if ((returnValue = setjmp(csound->exitjmp))) {
+ #ifndef MACOSX
+--- Csound5.13.0/Top/main.c.orig 2011-04-07 10:36:24.745611983 +0100
++++ Csound5.13.0/Top/main.c 2011-04-07 10:43:02.001313569 +0100
+@@ -89,7 +89,9 @@
+ dbfs_init(csound, DFLT_DBFS);
+ csound->csRtClock = (RTCLOCK*) csound->Calloc(csound, sizeof(RTCLOCK));
+ csoundInitTimerStruct(csound->csRtClock);
+- csound->engineState |= CS_STATE_COMP | CS_STATE_CLN;
++ /* WTB - Oct 15 2009: only set CS_STATE_CLN; CS_STATE_COMP set when retval=0. */
++ csound->engineState |= /*CS_STATE_COMP |*/ CS_STATE_CLN;
++
+
+ #ifndef USE_DOUBLE
+ #ifdef BETA
+@@ -409,6 +411,13 @@
+ if (O->Midioutname != NULL || O->FMidioutname != NULL)
+ openMIDIout(csound);
+
+- return musmon(csound);
++ n = musmon(csound);
++
++ /* WTB - Oct 15 2009: CS_STATE_COMP set when retval=0. */
++ if (n == 0) {
++ csound->engineState |= CS_STATE_COMP;
++ }
++
++ return n;
+ }
+
diff --git a/csound-5.10.1-default-opcodedir.patch b/csound-5.13.0-default-opcodedir.patch
similarity index 61%
rename from csound-5.10.1-default-opcodedir.patch
rename to csound-5.13.0-default-opcodedir.patch
index 18d03ff..15f80c0 100644
--- a/csound-5.10.1-default-opcodedir.patch
+++ b/csound-5.13.0-default-opcodedir.patch
@@ -1,29 +1,37 @@
---- Csound5.10.1/Top/csmodule.c.orig 2009-03-31 00:09:56.000000000 +0100
-+++ Csound5.10.1/Top/csmodule.c 2009-03-31 00:21:59.000000000 +0100
-@@ -126,17 +126,20 @@
- #else
+--- Csound5.13.0/Top/csmodule.c.orig 2011-04-07 07:17:32.760596618 +0100
++++ Csound5.13.0/Top/csmodule.c 2011-04-07 07:22:42.296003545 +0100
+@@ -130,26 +130,24 @@
+ static const char *plugindir64_envvar = "OPCODEDIR64";
+
+ /* default directory to load plugins from if environment variable is not set */
+-#ifdef OLPC
+-# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
+-#else
#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
# define ENABLE_OPCODEDIR_WARNINGS 1
-# ifdef CS_DEFAULT_PLUGINDIR
-# undef CS_DEFAULT_PLUGINDIR
+-# endif
+-# define CS_DEFAULT_PLUGINDIR "."
+# ifndef CS_DEFAULT_PLUGINDIR
+# ifndef USE_DOUBLE
+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
+# else
+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins"
+# endif
- # endif
--# define CS_DEFAULT_PLUGINDIR "."
#else
# define ENABLE_OPCODEDIR_WARNINGS 0
# ifndef CS_DEFAULT_PLUGINDIR
# ifndef USE_DOUBLE
-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins"
--# Else
--# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64"
+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
-+# else
+ # else
+-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64"
+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins"
# endif
# endif
#endif
+-#endif
+
+ typedef struct opcodeLibFunc_s {
+ long (*opcode_init)(CSOUND *, OENTRY **); /* list of opcode entries */
diff --git a/csound-5.13.0-default-pulse.patch b/csound-5.13.0-default-pulse.patch
new file mode 100644
index 0000000..b15758d
--- /dev/null
+++ b/csound-5.13.0-default-pulse.patch
@@ -0,0 +1,15 @@
+--- Csound5.13.0/Top/csound.c.orig 2010-12-27 17:56:15.000000000 +0000
++++ Csound5.13.0/Top/csound.c 2011-04-07 08:08:54.967713991 +0100
+@@ -1005,11 +1005,7 @@
+ max_len = 21;
+ csoundCreateGlobalVariable(p, "_RTAUDIO", (size_t) max_len);
+ s = csoundQueryGlobalVariable(p, "_RTAUDIO");
+-#ifdef OLPC
+- strcpy(s, "alsa");
+-#else
+- strcpy(s, "PortAudio");
+-#endif
++ strcpy(s, "pulse");
+ csoundCreateConfigurationVariable(p, "rtaudio", s, CSOUNDCFG_STRING,
+ 0, NULL, &max_len,
+ "Real time audio module name", NULL);
diff --git a/csound-5.10.1-fix-conflicts.patch b/csound-5.13.0-fix-conflicts.patch
similarity index 87%
rename from csound-5.10.1-fix-conflicts.patch
rename to csound-5.13.0-fix-conflicts.patch
index 96940c7..b47d03e 100644
--- a/csound-5.10.1-fix-conflicts.patch
+++ b/csound-5.13.0-fix-conflicts.patch
@@ -1,6 +1,6 @@
---- Csound5.10.1/SConstruct.orig 2009-03-31 10:03:57.000000000 +0100
-+++ Csound5.10.1/SConstruct 2009-03-31 10:15:37.000000000 +0100
-@@ -1975,38 +1975,43 @@
+--- Csound5.13.0/SConstruct.orig 2011-04-07 07:56:09.439110711 +0100
++++ Csound5.13.0/SConstruct 2011-04-07 07:56:27.059538112 +0100
+@@ -2218,38 +2218,43 @@
['atsa', 'util/atsa_main.c' ],
['cvanal', 'util/cvl_main.c' ],
['dnoise', 'util/dnoise_main.c' ],
@@ -56,8 +56,8 @@
['util1/scot/scot_main.c', 'util1/scot/scot.c']))
#executables.append(csoundProgramEnvironment.Program('cscore',
# ['util1/cscore/cscore_main.c']))
---- Csound5.10.1/install.py.orig 2009-03-31 10:19:04.000000000 +0100
-+++ Csound5.10.1/install.py 2009-03-31 10:20:37.000000000 +0100
+--- Csound5.13.0/install.py.orig 2011-04-07 07:56:43.608939511 +0100
++++ Csound5.13.0/install.py 2011-04-07 07:58:42.764835288 +0100
@@ -20,12 +20,12 @@
exeFiles1 = ['csound', 'csound5gui', 'CsoundVST', 'winsound',
@@ -67,10 +67,10 @@
'het_export', 'het_import', 'hetro', 'lpanal',
- 'lpc_export', 'lpc_import', 'mixer', 'pvanal',
+ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal',
- 'pv_export', 'pv_import',
-- 'pvlook', 'scale', 'sndinfo', 'srconv',
+ 'pv_export', 'pv_import', 'atsa',
+- 'pvlook', 'scale', 'sndinfo', 'srconv', 'beats',
- 'scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot']
-+ 'pvlook', 'cs-scale', 'cs-sndinfo', 'cs-srconv',
++ 'pvlook', 'cs-scale', 'cs-sndinfo', 'cs-srconv', 'beats',
+ 'scsort', 'cs-extract', 'cs-launcher', 'csb64enc', 'makecsd', 'cs-scot']
exeFiles2 = ['brkpt', 'linseg', 'tabdes']
diff --git a/csound-5.13.0-fix-locale-install.patch b/csound-5.13.0-fix-locale-install.patch
new file mode 100644
index 0000000..4573379
--- /dev/null
+++ b/csound-5.13.0-fix-locale-install.patch
@@ -0,0 +1,11 @@
+--- Csound5.13.0/install.py.orig 2011-04-07 08:02:28.460324321 +0100
++++ Csound5.13.0/install.py 2011-04-07 08:04:25.227162356 +0100
+@@ -154,7 +154,7 @@
+ fileList += [fileName]
+ fullName = concatPath([instDir, fileName])
+ err = runCmd(['install', '-p', '-m', perm, src, fullName])
+- if err == 0 and stripMode != '':
++ if err == 0 and stripMode == 'packman':
+ err = runCmd(['strip', stripMode, fullName])
+ if err == 0:
+ addMD5(fullName, fileName)
diff --git a/csound-5.13.0-no-usr-local.patch b/csound-5.13.0-no-usr-local.patch
new file mode 100644
index 0000000..8828958
--- /dev/null
+++ b/csound-5.13.0-no-usr-local.patch
@@ -0,0 +1,71 @@
+--- Csound5.13.0/SConstruct.orig 2011-04-07 07:12:40.477602580 +0100
++++ Csound5.13.0/SConstruct 2011-04-07 07:15:29.884656314 +0100
+@@ -503,9 +503,9 @@
+ if getPlatform() == 'sunos':
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64'])
+ else:
+- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
++ commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/lib64'])
+ else:
+- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
++ commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/lib'])
+
+ if commonEnvironment['Word64'] == '1':
+ if compilerSun():
+@@ -531,7 +531,7 @@
+ commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
+ elif getPlatform() == 'sunos':
+ commonEnvironment.Append(CCFLAGS = "-D_SOLARIS")
+- commonEnvironment.Append(CPPPATH = '/usr/local/include')
++ commonEnvironment.Append(CPPPATH = '/usr/include')
+ commonEnvironment.Append(CPPPATH = '/usr/include')
+ commonEnvironment.Append(CPPPATH = '/usr/jdk/instances/jdk1.5.0/include')
+ if compilerGNU():
+@@ -539,7 +539,7 @@
+ commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
+ elif getPlatform() == 'darwin':
+ commonEnvironment.Append(CCFLAGS = "-DMACOSX")
+- commonEnvironment.Append(CPPPATH = '/usr/local/include')
++ commonEnvironment.Append(CPPPATH = '/usr/include')
+ commonEnvironment.Append(CCFLAGS = "-DPIPES")
+ if commonEnvironment['useAltivec'] == '1':
+ print 'CONFIGURATION DECISION: Using Altivec optimisation'
+@@ -556,7 +556,7 @@
+ commonEnvironment.Append(CXXFLAGS = '-DFL_DLL')
+ if compilerGNU():
+ commonEnvironment.Prepend(CCFLAGS = "-Wall")
+- commonEnvironment.Append(CPPPATH = '/usr/local/include')
++ commonEnvironment.Append(CPPPATH = '/usr/include')
+ commonEnvironment.Append(CPPPATH = '/usr/include')
+ commonEnvironment.Append(SHLINKFLAGS = Split(' -mno-cygwin -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc'))
+ commonEnvironment.Append(LINKFLAGS = Split(' -mno-cygwin -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc'))
+@@ -602,13 +602,13 @@
+ pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
+ elif getPlatform() == 'sunos':
+ path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
+- path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
++ path2 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
+ pythonIncludePath = [path1, path2]
+ pythonLinkFlags = []
+ if commonEnvironment['Lib64'] == '1':
+- pythonLibraryPath = ['/usr/local/lib/64', '/usr/lib/64']
++ pythonLibraryPath = ['/usr/lib/64', '/usr/lib/64']
+ else:
+- pythonLibraryPath = ['/usr/local/lib', '/usr/lib']
++ pythonLibraryPath = ['/usr/lib', '/usr/lib']
+ pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
+ tclIncludePath = []
+ elif getPlatform() == 'darwin':
+@@ -1340,10 +1340,10 @@
+ PYDLL = r'%s\%s' % (os.environ['SystemRoot'], pythonLibs[0])
+ if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and compilerGNU():
+ pythonImportLibrary = csoundInterfacesEnvironment.Command(
+- '/usr/local/lib/lib%s.a' % (pythonLibs[0]),
++ '/usr/lib/lib%s.a' % (pythonLibs[0]),
+ PYDLL,
+ ['pexports %s > %s.def' % (PYDLL, pythonLibs[0]),
+- 'dlltool --input-def %s.def --dllname %s.dll --output-lib /usr/local/lib/lib%s.a' % (pythonLibs[0], PYDLL, pythonLibs[0])])
++ 'dlltool --input-def %s.def --dllname %s.dll --output-lib /usr/lib/lib%s.a' % (pythonLibs[0], PYDLL, pythonLibs[0])])
+
+ def fixCFlagsForSwig(env):
+ if '-pedantic' in env['CCFLAGS']:
diff --git a/csound-5.13.0-tclversion.patch b/csound-5.13.0-tclversion.patch
new file mode 100644
index 0000000..8289e72
--- /dev/null
+++ b/csound-5.13.0-tclversion.patch
@@ -0,0 +1,11 @@
+--- Csound5.13.0/SConstruct.orig 2011-04-07 07:29:45.323126316 +0100
++++ Csound5.13.0/SConstruct 2011-04-07 07:29:54.757352073 +0100
+@@ -262,7 +262,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.spec b/csound.spec
index be68ae5..558e726 100644
--- a/csound.spec
+++ b/csound.spec
@@ -39,16 +39,16 @@ Source1: http://downloads.sourceforge.net/csound/Csound5.13-manual-src.tar.gz
Source2: http://downloads.sourceforge.net/csound/Csound5.13_manual_html.zip
Patch0: csound-5.12.1-fixpython.patch
-Patch1: csound-5.12.1-no-usr-local.patch
-Patch2: csound-5.10.1-default-opcodedir.patch
+Patch1: csound-5.13.0-no-usr-local.patch
+Patch2: csound-5.13.0-default-opcodedir.patch
Patch3: csound-5.10.1-rtalsa-fix.patch
-Patch4: csound-5.12.1-makebuild.patch
+Patch4: csound-5.13.0-tclversion.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
+Patch6: csound-5.13.0-fix-conflicts.patch
+Patch7: csound-5.13.0-fix-locale-install.patch
Patch8: csound-5.10.1-enable-oggplay.patch
-Patch9: csound-5.10.1-default-pulse.patch
-Patch10: csound-5.10.1-compile-flag.patch
+Patch9: csound-5.13.0-default-pulse.patch
+Patch10: csound-5.13.0-compile-flag.patch
%description
Csound is a sound and music synthesis system, providing facilities for
@@ -189,16 +189,16 @@ Canonical Reference Manual for Csound.
%prep
%setup -q -n Csound%{version}
%patch0 -p1 -b .fixpython
-#%patch1 -p1 -b .no-usr-local
-#%patch2 -p1 -b .default-opcodedir
+%patch1 -p1 -b .no-usr-local
+%patch2 -p1 -b .default-opcodedir
%patch3 -p1 -b .rtalsa
-#%patch4 -p1 -b .makebuild
+%patch4 -p1 -b .makebuild
%patch5 -p1 -b .64-bit-plugin-path
-#%patch6 -p1 -b .fix-conflicts
-#%patch7 -p1 -b .fix-local-install
+%patch6 -p1 -b .fix-conflicts
+%patch7 -p1 -b .fix-local-install
%patch8 -p1 -b .enable-oggplay
-#%patch9 -p1 -b .default-pulse
-#%patch10 -p1 -b .compile-flag
+%patch9 -p1 -b .default-pulse
+%patch10 -p1 -b .compile-flag
tar xf %{SOURCE1}
(cd manual; unzip -q %{SOURCE2})
More information about the scm-commits
mailing list