From 871e10400b588f87c6fe2c24c9fd2c2186019905 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Aug 29 2014 18:14:38 +0000 Subject: * Fri Aug 29 2014 Peter Robinson 6.03.1-1 - Update to 6.03.1 - Spec file fixups * Mon Jul 28 2014 Jerry James - 6.03.0-1 - Update to 6.03.0 (bz 1094866; fixes bzs 1057580, 1067182, and 1106095) - Change project URL to github page - Update BRs and reorganize for readability - Bring back the manual sources; the manual subpackage has the GFDL license - Obsolete the -gui and -tk subpackages (no longer supported upstream) - Add -csoundac, -lua, -portaudio, and -stk subpackages --- diff --git a/.gitignore b/.gitignore index 6888314..a97d5a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /Csound.*.tar.gz /Csound.*.zip +/Csound6*.tar.gz +/manual_src.tar.gz diff --git a/csound-5.13.0-fix-locale-install.patch b/csound-5.13.0-fix-locale-install.patch deleted file mode 100644 index 4573379..0000000 --- a/csound-5.13.0-fix-locale-install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.19.0-64-bit-plugin-path.patch b/csound-5.19.0-64-bit-plugin-path.patch deleted file mode 100644 index fe8662c..0000000 --- a/csound-5.19.0-64-bit-plugin-path.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- Csound5.19.01/SConstruct.orig 2013-08-07 14:40:05.284820226 +0100 -+++ Csound5.19.01/SConstruct 2013-08-07 14:40:14.125033594 +0100 -@@ -873,9 +873,7 @@ - # library version is CS_VERSION.CS_APIVERSION - csoundLibraryVersion = '5.2' - csoundLibraryName = 'csound' --if commonEnvironment['useDouble'] != '0': -- csoundLibraryName += '64' --elif getPlatform() == 'win32': -+if getPlatform() == 'win32': - csoundLibraryName += '32' - # flags for linking with the Csound library - libCsoundLinkFlags = commonEnvironment['LINKFLAGS'] -@@ -931,8 +929,6 @@ - tmp = '%s/lib/csound/plugins' % commonEnvironment['prefix'] - else: - tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix'] -- if commonEnvironment['useDouble'] != '0': -- tmp += '64' - s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp - csoundLibraryEnvironment.Append(CPPFLAGS = [s]) - elif buildOSXFramework != 0: -@@ -2901,10 +2897,7 @@ - if i[:sys.prefix.__len__()] == sys.prefix and i[-13:] == 'site-packages': - PYTHON_DIR = i - --if commonEnvironment['useDouble'] == '0': -- PLUGIN_DIR = LIB_DIR + "/csound/plugins" --else: -- PLUGIN_DIR = LIB_DIR + "/csound/plugins64" -+PLUGIN_DIR = LIB_DIR + "/csound/plugins" - - if commonEnvironment['install'] == '1': - installExecutables = Alias('install-executables', diff --git a/csound-5.19.0-default-opcodedir.patch b/csound-5.19.0-default-opcodedir.patch deleted file mode 100644 index 5bfdc19..0000000 --- a/csound-5.19.0-default-opcodedir.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Csound5.19.01/Top/csmodule.c.orig 2013-08-07 15:25:36.964759575 +0100 -+++ Csound5.19.01/Top/csmodule.c 2013-08-07 15:29:48.653836472 +0100 -@@ -145,17 +145,19 @@ - # endif - #elif !(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 - #else - # define ENABLE_OPCODEDIR_WARNINGS 0 - # ifndef CS_DEFAULT_PLUGINDIR - # ifndef USE_DOUBLE --# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins" -+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" - # else --# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64" -+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" - # endif - # endif - #endif diff --git a/csound-5.19.0-default-pulse.patch b/csound-5.19.0-default-pulse.patch deleted file mode 100644 index 794a627..0000000 --- a/csound-5.19.0-default-pulse.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Csound5.19.01/Top/csound.c.orig 2013-08-07 15:42:25.156102769 +0100 -+++ Csound5.19.01/Top/csound.c 2013-08-07 15:43:43.659998379 +0100 -@@ -1060,7 +1060,7 @@ - #ifdef __HAIKU__ - strcpy(s, "haiku"); - #else -- strcpy(s, "PortAudio"); -+ strcpy(s, "pulse"); - #endif - csoundCreateConfigurationVariable(p, "rtaudio", s, CSOUNDCFG_STRING, - 0, NULL, &max_len, diff --git a/csound-5.19.0-fix-conflicts.patch b/csound-5.19.0-fix-conflicts.patch deleted file mode 100644 index c933f21..0000000 --- a/csound-5.19.0-fix-conflicts.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- Csound5.19.01/SConstruct.orig 2013-08-07 14:45:04.436039677 +0100 -+++ Csound5.19.01/SConstruct 2013-08-07 14:49:24.617319061 +0100 -@@ -2253,37 +2253,41 @@ - ['atsa', 'util/atsa_main.c' ], - ['cvanal', 'util/cvl_main.c' ], - ['dnoise', 'util/dnoise_main.c' ], -- ['envext', 'util/env_main.c' ], -- ['extractor', 'util/xtrc_main.c' ], -+ ['cs-envext', 'util/env_main.c' ], -+ ['cs-extractor', 'util/xtrc_main.c' ], - ['het_export', 'util/hetx_main.c' ], - ['het_import', 'util/heti_main.c' ], - ['hetro', 'util/het_main.c' ], - ['lpanal', 'util/lpc_main.c' ], - ['lpc_export', 'util/lpcx_main.c' ], - ['lpc_import', 'util/lpci_main.c' ], -- ['mixer', 'util/mixer_main.c' ], -+ ['cs-mixer', 'util/mixer_main.c' ], - ['pvanal', 'util/pvc_main.c' ], - ['pvlook', 'util/pvl_main.c' ], - ['pv_export', 'util/pvx_main.c' ], - ['pv_import', 'util/pvi_main.c' ], -- ['scale', 'util/scale_main.c' ], -- ['sndinfo', 'util/sndinfo_main.c' ], -- ['srconv', 'util/srconv_main.c' ]] -+ ['cs-scale', 'util/scale_main.c' ], -+ ['cs-sndinfo', 'util/sndinfo_main.c' ], -+ ['cs-srconv', 'util/srconv_main.c' ]] - for i in utils: -- executables.append(csoundProgramEnvironment.Program(i[0], i[1])) -+ a = csoundProgramEnvironment.Program(i[0], i[1]) -+ executables.append(a) -+ if i[0].startswith("cs-"): -+ Depends(a, csoundLibrary) - - executables.append(csoundProgramEnvironment.Program('scsort', - ['util1/sortex/smain.c'])) - executables.append(csoundProgramEnvironment.Program('extract', - ['util1/sortex/xmain.c'])) - if compilerGNU(): -- executables.append(commonEnvironment.Program('cs', -- ['util1/csd_util/cs.c'])) -+ a = commonEnvironment.Program('cs-launcher', ['util1/csd_util/cs.c']) -+ executables.append(a) -+ Depends(a, csoundLibrary) - executables.append(commonEnvironment.Program('csb64enc', - ['util1/csd_util/base64.c', 'util1/csd_util/csb64enc.c'])) - executables.append(commonEnvironment.Program('makecsd', - ['util1/csd_util/base64.c', 'util1/csd_util/makecsd.c'])) -- executables.append(commonEnvironment.Program('scot', -+ executables.append(commonEnvironment.Program('cs-scot', - ['util1/scot/scot_main.c', 'util1/scot/scot.c'])) - #executables.append(csoundProgramEnvironment.Program('cscore', - # ['util1/cscore/cscore_main.c'])) ---- Csound5.19.01/install.py.orig 2013-08-07 14:49:34.152549197 +0100 -+++ Csound5.19.01/install.py 2013-08-07 14:51:17.127034567 +0100 -@@ -20,12 +20,12 @@ - - exeFiles1 = ['csound', 'csound5gui', 'CsoundVST', 'winsound', - 'cstclsh', 'cswish', 'cseditor', -- 'cvanal', 'dnoise', 'envext', 'extractor', -+ 'cvanal', 'dnoise', 'cs-envext', 'cs-extractor', - 'het_export', 'het_import', 'hetro', 'lpanal', -- 'lpc_export', 'lpc_import', 'mixer', 'pvanal', -+ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal', - 'pv_export', 'pv_import', 'atsa', -- 'pvlook', 'scale', 'sndinfo', 'srconv', 'csbeats', -- 'scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot'] -+ 'pvlook', 'cs-scale', 'cs-sndinfo', 'cs-srconv', 'csbeats', -+ 'scsort', 'cs-extract', 'cs', 'csb64enc', 'makecsd', 'cs-scot'] - - exeFiles2 = ['brkpt', 'linseg', 'tabdes'] - diff --git a/csound-5.19.0-fixpython.patch b/csound-5.19.0-fixpython.patch deleted file mode 100644 index f8461ef..0000000 --- a/csound-5.19.0-fixpython.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Csound5.19.01/install.py.orig 2013-08-07 15:17:29.838998821 +0100 -+++ Csound5.19.01/install.py 2013-08-07 15:18:40.184697145 +0100 -@@ -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], - ['CsoundVSTCsoundAC\\.py', '0', pythonDir], diff --git a/csound-5.19.0-rtalsa-fix.patch b/csound-5.19.0-rtalsa-fix.patch deleted file mode 100644 index b799237..0000000 --- a/csound-5.19.0-rtalsa-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Csound5.19.01/InOut/rtalsa.c.orig 2013-01-07 12:49:34.000000000 +0000 -+++ Csound5.19.01/InOut/rtalsa.c 2013-08-07 15:33:14.170798690 +0100 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#define _POSIX_C_SOURCE 1 - #include - #include - #include diff --git a/csound-5.19.01-xdg-open.patch b/csound-5.19.01-xdg-open.patch deleted file mode 100644 index 1e33444..0000000 --- a/csound-5.19.01-xdg-open.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Csound5.19.01/frontends/fltk_gui/CsoundGlobalSettings.cpp~ Csound5.19.01/frontends/fltk_gui/CsoundGlobalSettings.cpp ---- Csound5.19.01/frontends/fltk_gui/CsoundGlobalSettings.cpp~ 2013-01-07 14:49:35.000000000 +0200 -+++ Csound5.19.01/frontends/fltk_gui/CsoundGlobalSettings.cpp 2014-01-25 11:24:54.363214530 +0200 -@@ -25,7 +25,7 @@ CsoundGlobalSettings::CsoundGlobalSettin - textEditorProgram = "cseditor"; - soundEditorProgram = "audacity"; - soundPlayerProgram = "aplay"; -- helpBrowserProgram = "firefox"; -+ helpBrowserProgram = "xdg-open"; - #elif defined(WIN32) - textEditorProgram = "cseditor"; - soundEditorProgram = "audacity"; diff --git a/csound-6.03-64-bit-plugin-path.patch b/csound-6.03-64-bit-plugin-path.patch new file mode 100644 index 0000000..8102787 --- /dev/null +++ b/csound-6.03-64-bit-plugin-path.patch @@ -0,0 +1,40 @@ +--- CMakeLists.txt.orig 2014-05-04 05:49:41.159716977 -0600 ++++ CMakeLists.txt 2014-05-05 20:00:00.000000000 -0600 +@@ -27,11 +27,7 @@ else() + endif() + message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}") + +-if(USE_DOUBLE) +- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}") +-else() +- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") +-endif() ++set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") + set(PYTHON_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) + set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) + set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) +--- installer/misc/mkpackage.py.orig 2014-05-04 05:49:43.313737080 -0600 ++++ installer/misc/mkpackage.py 2014-05-05 20:00:00.000000000 -0600 +@@ -27,7 +27,7 @@ libDir2 = libDir + '/csound/lib' + # single precision plugin libraries + pluginDir32 = libDir + '/csound/plugins' + # double precision plugin libraries +-pluginDir64 = libDir + '/csound/plugins64' ++pluginDir64 = libDir + '/csound/plugins' + # documentation + docDir = instPrefix + '/share/doc/csound' + # tclcsound.so +--- Top/csmodule.c.orig 2014-05-04 05:49:41.341718675 -0600 ++++ Top/csmodule.c 2014-05-05 20:00:00.000000000 -0600 +@@ -142,9 +142,9 @@ static const char *plugindir64_env + # define ENABLE_OPCODEDIR_WARNINGS 0 + # ifndef CS_DEFAULT_PLUGINDIR + # ifndef USE_DOUBLE +-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins" ++# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" + # else +-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64" ++# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" + # endif + # endif + #endif diff --git a/csound-6.03-default-pulse.patch b/csound-6.03-default-pulse.patch new file mode 100644 index 0000000..160402e --- /dev/null +++ b/csound-6.03-default-pulse.patch @@ -0,0 +1,11 @@ +--- Top/csound.c.orig 2014-05-04 10:25:40.373359897 -0600 ++++ Top/csound.c 2014-05-05 20:30:00.000000000 -0600 +@@ -3127,7 +3127,7 @@ PUBLIC void csoundReset(CSOUND *csound) + csoundCreateGlobalVariable(csound, "_RTAUDIO", (size_t) max_len); + s = csoundQueryGlobalVariable(csound, "_RTAUDIO"); + #ifndef LINUX +- strcpy(s, "PortAudio"); ++ strcpy(s, "pulse"); + #else + strcpy(s, "alsa"); + #endif diff --git a/csound-6.03-fix-conflicts.patch b/csound-6.03-fix-conflicts.patch new file mode 100644 index 0000000..e4fc858 --- /dev/null +++ b/csound-6.03-fix-conflicts.patch @@ -0,0 +1,115 @@ +--- installer/linux/d32.sh.orig 2014-05-04 05:49:43.213736146 -0600 ++++ installer/linux/d32.sh 2014-05-05 20:15:00.000000000 -0600 +@@ -13,7 +13,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo + + rm ../../../CSDIST/$DIR/bin/* + +-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin ++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin + + strip ../../../CSDIST/$DIR/bin/* + +--- installer/linux/d64.sh.orig 2014-05-04 05:49:43.213736146 -0600 ++++ installer/linux/d64.sh 2014-05-05 20:15:00.000000000 -0600 +@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo + + rm ../../../CSDIST/$DIR/bin/* + +-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin ++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin + + strip ../../../CSDIST/$DIR/bin/* + +--- installer/linux/f32.sh.orig 2014-05-04 05:49:43.213736146 -0600 ++++ installer/linux/f32.sh 2014-05-05 20:15:00.000000000 -0600 +@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo + + rm ../../../CSDIST/$DIR/bin/* + +-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin ++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin + + strip ../../../CSDIST/$DIR/bin/* + +--- installer/linux/f64.sh.orig 2014-05-04 05:49:43.213736146 -0600 ++++ installer/linux/f64.sh 2014-05-05 20:15:00.000000000 -0600 +@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo + + rm ../../../CSDIST/$DIR/bin/* + +-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin ++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin + + strip ../../../CSDIST/$DIR/bin/* + +--- installer/misc/mkpackage.py.orig 2014-05-05 17:00:10.347460267 -0600 ++++ installer/misc/mkpackage.py 2014-05-05 20:15:00.000000000 -0600 +@@ -71,13 +71,13 @@ headerFiles += ['interfaces/CppSound.hpp + headerFiles += ['interfaces/CsoundFile.hpp'] + + utils1 = ['csound', 'winsound', 'cstclsh', 'cswish', +- 'atsa', 'cvanal', 'dnoise', 'envext', 'extractor', ++ 'atsa', 'cvanal', 'dnoise', 'cs-envext', 'cs-extractor', + 'het_export', 'het_import', 'hetro', 'lpanal', +- 'lpc_export', 'lpc_import', 'mixer', 'pvanal', +- 'pvlook', 'pv_export', 'pv_import', 'scale', 'sndinfo', +- 'srconv', 'cseditor'] ++ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal', ++ 'pvlook', 'pv_export', 'pv_import', 'cs-scale', 'cs-sndinfo', ++ 'cs-srconv', 'cseditor'] + +-utils2 = ['scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot'] ++utils2 = ['scsort', 'cs-extract', 'cs', 'csb64enc', 'makecsd', 'cs-scot'] + + docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound6.txt'] + +--- util1/CMakeLists.txt.orig 2014-05-04 05:49:44.284746142 -0600 ++++ util1/CMakeLists.txt 2014-05-05 20:15:00.000000000 -0600 +@@ -1,7 +1,7 @@ + #extra utilities + + make_utility(scsort sortex/smain.c) +-make_utility(extract sortex/xmain.c) ++make_utility(cs-extract sortex/xmain.c) + + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + if(HAVE_UNISTD_H) +@@ -19,6 +19,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP + + set(scot_SRCS + scot/scot_main.c scot/scot.c) +- make_utility(scot "${scot_SRCS}") ++ make_utility(cs-scot "${scot_SRCS}") + endif() + +--- util/CMakeLists.txt.orig 2014-05-04 05:49:44.239745722 -0600 ++++ util/CMakeLists.txt 2014-05-05 20:15:00.000000000 -0600 +@@ -17,8 +17,8 @@ if(BUILD_UTILITIES) + make_utility(csanalyze csanalyze.c) + make_utility(cvanal cvl_main.c) + make_utility(dnoise dnoise_main.c) +- make_utility(envext env_main.c) +- make_utility(extractor xtrc_main.c) ++ make_utility(cs-envext env_main.c) ++ make_utility(cs-extractor xtrc_main.c) + make_utility(het_export hetx_main.c) + make_utility(het_import heti_main.c) + make_utility(hetro het_main.c) +@@ -26,13 +26,13 @@ if(BUILD_UTILITIES) + make_utility(lpc_export lpcx_main.c) + target_link_libraries(lpc_export m) + make_utility(lpc_import lpci_main.c) +- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) ++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" cs-mixer) + make_utility(pvanal pvc_main.c) + make_utility(pvlook pvl_main.c) + make_utility(pv_export pvx_main.c) + make_utility(pv_import pvi_main.c) +- make_utility(scale scale_main.c) +- make_utility(sndinfo sndinfo_main.c) +- make_utility(srconv srconv_main.c) ++ make_utility(cs-scale scale_main.c) ++ make_utility(cs-sndinfo sndinfo_main.c) ++ make_utility(cs-srconv srconv_main.c) + make_utility(scope scope_main.c) + endif() diff --git a/csound-6.03-porttime.patch b/csound-6.03-porttime.patch new file mode 100644 index 0000000..a060b66 --- /dev/null +++ b/csound-6.03-porttime.patch @@ -0,0 +1,13 @@ +--- InOut/CMakeLists.txt.orig 2014-05-04 05:49:41.223717574 -0600 ++++ InOut/CMakeLists.txt 2014-05-05 21:00:00.000000000 -0600 +@@ -45,10 +45,6 @@ if(USE_PORTMIDI) + find_library(PORTMIDI_LIBRARY portmidi) + # include_directories(${PORTMIDI_INCLUDE_PATH}) + # include_directories(${PORTTIME_INCLUDE_PATH}) +- if(WIN32) +- else() +- find_library(PORTTIME_LIBRARY porttime) +- endif() + endif() + if(USE_JACK) + find_library(JACK_LIBRARY jack) diff --git a/csound-6.03-sse2.patch b/csound-6.03-sse2.patch new file mode 100644 index 0000000..4d02911 --- /dev/null +++ b/csound-6.03-sse2.patch @@ -0,0 +1,33 @@ +--- cmake/CompilerOptimizations.cmake.orig 2014-05-04 05:49:42.169726403 -0600 ++++ cmake/CompilerOptimizations.cmake 2014-05-05 20:45:00.000000000 -0600 +@@ -19,30 +19,6 @@ if (HAS_CXX_FAST_MATH) + endif() + + +-if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +- +-check_c_compiler_flag(-mfpmath=sse HAS_FPMATH_SSE) +-check_cxx_compiler_flag(-mfpmath=sse HAS_CXX_FPMATH_SSE) +- if (HAS_FPMATH_SSE) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse") +-endif() +-if (HAS_CXX_FPMATH_SSE) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse") +-endif() +- +-endif() +- +- +-check_c_compiler_flag(-msse2 HAS_SSE2) +-check_cxx_compiler_flag(-msse2 HAS_CXX_SSE2) +- if (HAS_SSE2) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") +-endif() +-if (HAS_CXX_SSE2) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2") +-endif() +- +- + check_c_compiler_flag(-fomit-frame-pointer HAS_OMIT_FRAME_POINTER) + check_cxx_compiler_flag(-fomit-frame-pointer HAS_CXX_OMIT_FRAME_POINTER) + if (HAS_OMIT_FRAME_POINTER) diff --git a/csound-6.03-xdg-open.patch b/csound-6.03-xdg-open.patch new file mode 100644 index 0000000..5c4b99b --- /dev/null +++ b/csound-6.03-xdg-open.patch @@ -0,0 +1,20 @@ +--- installer/misc/vim/cshelp.orig 2014-05-04 05:49:43.318737126 -0600 ++++ installer/misc/vim/cshelp 2014-05-05 21:15:00.000000000 -0600 +@@ -3,7 +3,9 @@ + BROWSER_CMD="" + + if [ "${DISPLAY}" != "" ] ; then +- if ( which links | grep -q -G -e "^/usr" ) ; then ++ if ( which xdg-open | grep -E -e "^(/usr)?/bin" ); then ++ BROWSER_CMD="xdg-open" ; ++ elif ( which links | grep -q -G -e "^/usr" ) ; then + BROWSER_CMD="links -g" ; + elif ( which konqueror | grep -q -G -e "^/opt" ) ; then + BROWSER_CMD="konqueror" ; +@@ -38,5 +40,5 @@ else + OPNAME="${1}" ; + fi + +-exec ${BROWSER_CMD} "/usr/local/share/doc/csound/manual/${OPNAME}.html" ++exec ${BROWSER_CMD} "/usr/share/doc/csound-manual/${OPNAME}.html" + diff --git a/csound.spec b/csound.spec index 5039b1f..040671a 100644 --- a/csound.spec +++ b/csound.spec @@ -1,51 +1,64 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?python_version: %global python_version %(%{__python} -c "import sys; print '%s.%s' % sys.version_info[:2]")} - -# Csound is really dumb about 64-bit -%if %{__isa_bits} == 64 -%define build64bit 1 -%define install64bit --word64 -%define useDouble 1 -%else -%define build64bit 0 -%define install64bit %{nil} -%define useDouble 0 -%endif - Summary: A sound synthesis language and library Name: csound -Version: 5.19.01 -Release: 8%{?dist} -URL: http://csound.sourceforge.net/ +Version: 6.03.1 +Release: 1%{?dist} +URL: http://csound.github.io/ License: LGPLv2+ -Group: Applications/Multimedia - -BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-turbo-devel -BuildRequires: python python-devel -BuildRequires: flex bison -BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel pulseaudio-libs-devel -BuildRequires: fluidsynth-devel liblo-devel dssi-devel -BuildRequires: compat-lua-devel -BuildRequires: fltk-devel fltk-fluid + +Source0: http://downloads.sourceforge.net/csound/Csound%{version}.tar.gz +Source1: http://downloads.sourceforge.net/csound/manual_src.tar.gz +# Put plugins in _libdir/csound/plugins on all platforms +Patch0: %{name}-6.03-64-bit-plugin-path.patch +# Rename some binaries to avoid name conflicts +Patch1: %{name}-6.03-fix-conflicts.patch +# Default to using pulseaudio instead of portaudio +Patch2: %{name}-6.03-default-pulse.patch +# Do not use SSE2 on non-x86_64 platforms +Patch3: %{name}-6.03-sse2.patch +# Adapt to the way portmidi/porttime is packaged in Fedora +Patch4: %{name}-6.03-porttime.patch +# Use xdg-open to open a browser to view the manual +Patch5: %{name}-6.03-xdg-open.patch + +BuildRequires: bison +BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: CUnit-devel +BuildRequires: docbook-style-xsl +BuildRequires: dssi-devel +BuildRequires: eigen3-static +BuildRequires: flex +BuildRequires: fltk-fluid +BuildRequires: fluidsynth-devel +BuildRequires: gettext-devel +BuildRequires: gmm-devel +BuildRequires: jack-audio-connection-kit-devel BuildRequires: java-devel BuildRequires: jpackage-utils -BuildRequires: tk-devel tcl-devel +BuildRequires: libcurl-devel +BuildRequires: liblo-devel +BuildRequires: libpng-devel +BuildRequires: libsndfile-devel +BuildRequires: libvorbis-devel BuildRequires: libxslt -BuildRequires: libvorbis-devel libogg-devel -BuildRequires: gettext -BuildRequires: gcc-c++ boost-devel - -Source0: http://downloads.sourceforge.net/csound/Csound%{version}.tar.gz -Source2: http://downloads.sourceforge.net/csound/Csound5.19_manual_html.zip - -Patch0: csound-5.19.0-64-bit-plugin-path.patch -Patch1: csound-5.19.0-fix-conflicts.patch -Patch2: csound-5.19.0-fixpython.patch -Patch3: csound-5.19.0-default-opcodedir.patch -Patch4: csound-5.19.0-rtalsa-fix.patch -Patch5: csound-5.13.0-fix-locale-install.patch -Patch6: csound-5.19.0-default-pulse.patch -Patch7: csound-5.19.01-xdg-open.patch +BuildRequires: lua-devel +BuildRequires: luajit-devel +BuildRequires: portaudio-devel +BuildRequires: portmidi-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: python2-devel +BuildRequires: stk-devel +BuildRequires: swig +BuildRequires: tkinter + +# The fltk and tcl/tk frontends were removed in version 6. These obsoletes +# can be removed once Fedora 20 reaches EOL. +Obsoletes: %{name}-gui < 6.0-1%{?dist} +Provides: %{name}-gui = 6.0-1%{?dist} +Obsoletes: %{name}-tk < 6.0-1%{?dist} +Provides: %{name}-tk = 6.0-1%{?dist} + +%global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') %description Csound is a sound and music synthesis system, providing facilities for @@ -55,16 +68,14 @@ at least classical, pop, techno, ambient... %package devel Summary: Csound development files and libraries -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Contains headers and libraries for developing applications that use Csound. %package python Summary: Python Csound development files and libraries -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python %description python @@ -73,20 +84,16 @@ use Csound. %package python-devel Summary: Csound python development files and libraries -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-python%{?_isa} = %{version}-%{release} %description python-devel Contains libraries for developing against csound-python. %package java Summary: Java Csound support -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Requires: java-headless -Requires: jpackage-utils -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: java-headless +Requires: jpackage-utils %description java Contains Java language bindings for developing and running Java @@ -94,33 +101,30 @@ applications that use Csound. %package javadoc Summary: API documentation for Java Csound support -Group: Documentation +BuildArch: noarch %description javadoc API documentation for the %{name}-java package. -%package tk -Summary: Tcl/Tk related Csound utilities -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: tcl tk +%package lua +Summary: Lua Csound support +Requires: %{name}%{?_isa} = %{version}-%{release} -%description tk -Contains Tcl/Tk related Csound utilities +%description lua +Contains Lua language bindings for developing and running Lua +applications that use Csound. -%package gui -Summary: A FLTK-based GUI for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: fltk xdg-utils +%package csoundac +Summary: An FLTK and python frontend for Csound +Requires: %{name}-python%{?_isa} = %{version}-%{release} +Requires: xdg-utils -%description gui -Contains a FLTK-based GUI for Csound +%description csoundac +Contains an FLTK and python frontend for Csound %package fltk Summary: FLTK plugins for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: fltk %description fltk @@ -128,8 +132,7 @@ Contains FLTK plugins for csound %package jack Summary: Jack Audio plugins for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: jack-audio-connection-kit %description jack @@ -137,16 +140,14 @@ Contains Jack Audio plugins for Csound %package fluidsynth Summary: Fluidsyth soundfont plugin for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description fluidsynth Contains Fluidsynth soundfont plugin for Csound. %package dssi Summary: Disposable Soft Synth Interface (DSSI) plugin for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: dssi %description dssi @@ -154,16 +155,28 @@ Disposable Soft Synth Interface (DSSI) plugin for Csound %package osc Summary: Open Sound Control (OSC) plugin for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description osc Open Sound Control (OSC) plugin for Csound +%package portaudio +Summary: PortAudio plugin for Csound +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description portaudio +PortAudio plugin for Csound + +%package stk +Summary: STK (Synthesis ToolKit in C++) plugin for Csound +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description stk +STK (Synthesis ToolKit in C++) plugin for Csound + %package virtual-keyboard Summary: Virtual MIDI keyboard plugin for Csound -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: fltk %description virtual-keyboard @@ -171,7 +184,7 @@ A virtual MIDI keyboard plugin for Csound %package manual Summary: Csound manual -Group: Documentation +License: GFDL Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -181,88 +194,111 @@ Canonical Reference Manual for Csound. %prep %setup -q -n Csound%{version} -%patch0 -p1 -b .64-bit-plugin-path -%patch1 -p1 -b .fix-conflicts -%patch2 -p1 -b .fixpython -#%patch3 -p1 -b .default-opcodedir -%patch4 -p1 -b .rtalsa -%patch5 -p1 -b .fix-locale-install -%patch6 -p1 -b .default-pulse -%patch7 -p1 -b .xdg-open - -mkdir manual -(cd manual; unzip -q %{SOURCE2}) +%setup -q -n Csound%{version} -T -D -a 1 + +%patch0 -b .64-bit-plugin-path +%patch1 -b .fix-conflicts +%patch2 -b .default-pulse +%ifnarch x86_64 +%patch3 -b .sse2 +%endif +%patch4 -b .porttime +%patch5 -b .xdg-open + +# Fix python, lua, and java install paths +sed -e 's,\(set(PYTHON_MODULE_INSTALL_DIR \).*,\1"%{python_sitearch}"),' \ + -e 's,\(set(JAVA_MODULE_INSTALL_DIR.*\)),\1/csound/java),' \ + -e 's,\(set(LUA_MODULE_INSTALL_DIR.*\)),\1/lua/%{luaver}),' \ + -i CMakeLists.txt + +# Fix end of line encodings +%define fix_line_encoding() \ + sed -i.orig 's/\\r\\n/\\n/;s/\\r/\\n/g' %1; \ + touch -r %1.orig %1; \ + rm -f %1.orig; + +for csd in $(find manual6/examples -name \*.csd); do + %fix_line_encoding $csd +done +%fix_line_encoding examples/c/pvsbus.csd +%fix_line_encoding examples/cplusplus/fl_controller.dev +%fix_line_encoding examples/csoundapi_tilde/csoundapi-osx.pd +%fix_line_encoding examples/lua/csound_ffi.lua +%fix_line_encoding examples/opcode_demos/band.csd +%fix_line_encoding examples/opcode_demos/sdft.csd +%fix_line_encoding manual6/examples/128,8-torus +%fix_line_encoding manual6/examples/128-spiral-8,16,128,2,1over2 +%fix_line_encoding manual6/examples/128-stringcircular +%fix_line_encoding manual6/examples/string-128.matrix + +# Fix spurious executable bits +chmod a-x examples/csoundapi_tilde/csoundapi-osx.pd \ + examples/csoundapi_tilde/csoundapi.pd \ + examples/lua/lua_example.lua \ + manual6/examples/128* %build +%if %{__isa_bits} == 64 + %cmake -DUSE_LIB64:BOOL=ON -DUSE_DOUBLE:BOOL=ON +%else + %cmake -DUSE_LIB64:BOOL=OFF -DUSE_DOUBLE:BOOL=OFF +%endif -cp custom-linux-mkg.py custom.py -scons dynamicCsoundLibrary=1 \ - buildRelease=1 \ - noDebug=0 \ - disableGStabs=1 \ - buildInterfaces=1 \ - useGettext=1 \ - useALSA=1 \ - usePortAudio=0 \ - usePortMIDI=0 \ - useOGG=1 \ - useOSC=1 \ - useJack=1 \ - useFLTK=1 \ - buildVirtual=1 \ - useFluidsynth=1 \ - generatePdf=0 \ - buildCsound5GUI=1 \ - buildLuaWrapper=1 \ - pythonVersion=%{python_version} \ - buildPythonOpcodes=1 \ - buildPythonWrapper=1 \ - buildTclcsound=1 \ - buildJavaWrapper=1 \ - buildDSSI=1 \ - buildUtilities=1 \ - prefix=%{_prefix} \ - customCCFLAGS="%{optflags}" \ - customCXXFLAGS="%{optflags} -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" \ - Word64=%{build64bit} \ - Lib64=%{build64bit} \ - useDouble=%{useDouble} -# disabled +make %{?_smp_mflags} V=1 # Generate javadoc -(cd interfaces; javadoc *.java) +(cd interfaces; mkdir apidocs; javadoc -d apidocs *.java) + +# Make the manual +make -C manual6 html-dist \ + XSL_BASE_PATH=%{_datadir}/sgml/docbook/xsl-stylesheets %install -python install.py --prefix=%{_prefix} --instdir=%{buildroot} %{install64bit} -rm -f %{buildroot}%{_docdir}/%{name}/COPYING -rm -f %{buildroot}%{_docdir}/%{name}/ChangeLog -rm -f %{buildroot}%{_docdir}/%{name}/INSTALL -rm -f %{buildroot}%{_docdir}/%{name}/readme-csound5.txt -rm -f %{buildroot}%{_bindir}/uninstall-csound5 -rm -f %{buildroot}%{_prefix}/csound5-*.md5sums +make install +# Fix the Java installation install -dm 755 %{buildroot}%{_javadir} (cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .) +mv %{buildroot}%{_libdir}/%{name}/java/lib_jcsound6.so %{buildroot}%{_libdir} + +# Install Javadocs +install -dm 755 %{buildroot}%{_javadocdir} +cp -a interfaces/apidocs %{buildroot}%{_javadocdir}/%{name}-java -install -dm 755 %{buildroot}%{_javadocdir}/%{name}-java -(cd interfaces; tar cf - *.html csnd/*.html) | (cd %{buildroot}%{_javadocdir}/%{name}-java; tar xvf -) +# Help the debuginfo generator +ln -s ../csound_orclex.c Engine/csound_orclex.c +ln -s ../csound_prelex.c Engine/csound_prelex.c -%find_lang %{name}5 +%find_lang %{name}6 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %{name}5.lang -%doc COPYING ChangeLog readme-csound5.txt +%post python -p /sbin/ldconfig + +%postun python -p /sbin/ldconfig + +%post csoundac -p /sbin/ldconfig + +%postun csoundac -p /sbin/ldconfig + +%check +make csdtests + +%files -f %{name}6.lang +%doc COPYING ChangeLog README.md Release_Notes %{_bindir}/atsa +%{_bindir}/cs +%{_bindir}/csanalyze %{_bindir}/csb64enc -%{_bindir}/csound %{_bindir}/csbeats +%{_bindir}/csdebugger +%{_bindir}/csound %{_bindir}/cvanal %{_bindir}/dnoise %{_bindir}/cs-envext -#%{_bindir}/cs-extract +%{_bindir}/cs-extract %{_bindir}/cs-extractor %{_bindir}/het_export %{_bindir}/het_import @@ -273,96 +309,59 @@ install -dm 755 %{buildroot}%{_javadocdir}/%{name}-java %{_bindir}/makecsd %{_bindir}/cs-mixer %{_bindir}/pvanal +%{_bindir}/pv_export +%{_bindir}/pv_import %{_bindir}/pvlook %{_bindir}/cs-scale +%{_bindir}/scope %{_bindir}/cs-scot %{_bindir}/scsort +%{_bindir}/sdif2ad %{_bindir}/cs-sndinfo %{_bindir}/cs-srconv -%{_bindir}/pv_export -%{_bindir}/pv_import -%{_libdir}/lib%{name}.so.5.2 -%dir %{_libdir}/%{name}/plugins -#%{_libdir}/%{name}/plugins/libambicode1.so -%{_libdir}/%{name}/plugins/libampmidid.so -#%{_libdir}/%{name}/plugins/libbabo.so -#%{_libdir}/%{name}/plugins/libbarmodel.so -%{_libdir}/%{name}/plugins/libcellular.so -%{_libdir}/%{name}/plugins/libchua.so -#%{_libdir}/%{name}/plugins/libcompress.so -%{_libdir}/%{name}/plugins/libcontrol.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/libcsladspa.so -%{_libdir}/%{name}/plugins/libdoppler.so -#%{_libdir}/%{name}/plugins/libeqfil.so -%{_libdir}/%{name}/plugins/libfareygen.so -%{_libdir}/%{name}/plugins/libfractalnoise.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 -%{_libdir}/%{name}/plugins/libipmidi.so -%{_libdir}/%{name}/plugins/libjacko.so -%{_libdir}/%{name}/plugins/libjoystik.so -#%{_libdir}/%{name}/plugins/libloscilx.so -#%{_libdir}/%{name}/plugins/libminmax.so -%{_libdir}/%{name}/plugins/libmixer.so -#%{_libdir}/%{name}/plugins/libmodal4.so -#%{_libdir}/%{name}/plugins/libmodmatrix.so -#%{_libdir}/%{name}/plugins/libmutexops.so -#%{_libdir}/%{name}/plugins/liboggplay.so -#%{_libdir}/%{name}/plugins/libpartikkel.so -#%{_libdir}/%{name}/plugins/libphisem.so -#%{_libdir}/%{name}/plugins/libphysmod.so -#%{_libdir}/%{name}/plugins/libpitch.so -%{_libdir}/%{name}/plugins/libplaterev.so -#%{_libdir}/%{name}/plugins/libptrack.so -#%{_libdir}/%{name}/plugins/libpvlock.so -#%{_libdir}/%{name}/plugins/libpvoc.so -#%{_libdir}/%{name}/plugins/libpvsbuffer.so -%{_libdir}/%{name}/plugins/librtalsa.so -%{_libdir}/%{name}/plugins/librtpulse.so -%{_libdir}/%{name}/plugins/libscansyn.so -#%{_libdir}/%{name}/plugins/libscoreline.so -%{_libdir}/%{name}/plugins/libserial.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/libugakbari.so -%{_libdir}/%{name}/plugins/liburandom.so -#%{_libdir}/%{name}/plugins/libvaops.so -#%{_libdir}/%{name}/plugins/libvbap.so -#%{_libdir}/%{name}/plugins/libvosim.so +%{_libdir}/lib%{name}64.so.6.0 +%dir %{_libdir}/%{name}/plugins-6.0 +%{_libdir}/%{name}/plugins-6.0/csladspa.so +%{_libdir}/%{name}/plugins-6.0/libampmidid.so +%{_libdir}/%{name}/plugins-6.0/libcellular.so +%{_libdir}/%{name}/plugins-6.0/libchua.so +%{_libdir}/%{name}/plugins-6.0/libcontrol.so +%{_libdir}/%{name}/plugins-6.0/libcs_date.so +%{_libdir}/%{name}/plugins-6.0/libdoppler.so +%{_libdir}/%{name}/plugins-6.0/libfareygen.so +%{_libdir}/%{name}/plugins-6.0/libfractalnoise.so +%{_libdir}/%{name}/plugins-6.0/libimage.so +%{_libdir}/%{name}/plugins-6.0/libipmidi.so +%{_libdir}/%{name}/plugins-6.0/libjacko.so +%{_libdir}/%{name}/plugins-6.0/libjoystick.so +%{_libdir}/%{name}/plugins-6.0/liblinear_algebra.so +%{_libdir}/%{name}/plugins-6.0/libmixer.so +%{_libdir}/%{name}/plugins-6.0/libplaterev.so +%{_libdir}/%{name}/plugins-6.0/librtalsa.so +%{_libdir}/%{name}/plugins-6.0/librtpulse.so +%{_libdir}/%{name}/plugins-6.0/libscansyn.so +%{_libdir}/%{name}/plugins-6.0/libserial.so +%{_libdir}/%{name}/plugins-6.0/libsignalflowgraph.so +%{_libdir}/%{name}/plugins-6.0/libstdutil.so +%{_libdir}/%{name}/plugins-6.0/libsystem_call.so +%{_libdir}/%{name}/plugins-6.0/liburandom.so %files devel %{_includedir}/%{name}/ -%{_libdir}/lib%{name}.so -%{_libdir}/libcsnd.so +%{_libdir}/lib%{name}64.so +%{_libdir}/libcsnd6.so %files python -%{_libdir}/libcsnd.so.5.2 -%{_libdir}/%{name}/plugins/libpy.so +%{_libdir}/libcsnd6.so.6.0 +%{_libdir}/%{name}/plugins-6.0/libpy.so %{python_sitearch}/_csnd* %{python_sitearch}/csnd* %files python-devel -# %{_libdir}/libcsnd.so +%{_libdir}/libCsoundAC.so %files java -%{_libdir}/lib_jcsound.so +%{_libdir}/lib_jcsound6.so %{_libdir}/%{name}/java/ %{_javadir}/csnd.jar @@ -370,45 +369,55 @@ install -dm 755 %{buildroot}%{_javadocdir}/%{name}-java %doc COPYING %{_javadocdir}/%{name}-java -%files tk -%{_libdir}/%{name}/tcl/ -%{_bindir}/matrix.tk -%{_bindir}/brkpt -%{_bindir}/linseg -%{_bindir}/tabdes -%{_bindir}/cstclsh -%{_bindir}/cswish +%files lua +%{_libdir}/%{name}/plugins-6.0/libLuaCsound.so +%{_libdir}/lua/%{luaver}/* -%files gui -%{_bindir}/csound5gui +%files csoundac +%{python_sitearch}/CsoundAC.* +%{python_sitearch}/_CsoundAC.* +%{_libdir}/libCsoundAC.so.* %files fltk -%{_libdir}/%{name}/plugins/libwidgets.so +%{_libdir}/%{name}/plugins-6.0/libwidgets.so %files jack -%{_libdir}/%{name}/plugins/librtjack.so -%{_libdir}/%{name}/plugins/libjackTransport.so +%{_libdir}/%{name}/plugins-6.0/librtjack.so +%{_libdir}/%{name}/plugins-6.0/libjackTransport.so %files fluidsynth -%{_libdir}/%{name}/plugins/libfluidOpcodes.so +%{_libdir}/%{name}/plugins-6.0/libfluidOpcodes.so %files dssi -%{_libdir}/%{name}/plugins/libdssi4cs.so +%{_libdir}/%{name}/plugins-6.0/libdssi4cs.so %files osc -%{_libdir}/%{name}/plugins/libosc.so +%{_libdir}/%{name}/plugins-6.0/libosc.so + +%files portaudio +%{_libdir}/%{name}/plugins-6.0/librtpa.so + +%files stk +%{_libdir}/%{name}/plugins-6.0/libstk.so %files virtual-keyboard -%{_libdir}/%{name}/plugins/libvirtual.so +%{_libdir}/%{name}/plugins-6.0/libvirtual.so %files manual -%doc Loadable_Opcodes.txt readme-csound5-complete.txt -%doc manual/html/* -%doc examples/* +%doc examples manual6/copying.txt manual6/html %changelog -* Sat Aug 16 2014 Fedora Release Engineering - 5.19.01-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +* Fri Aug 29 2014 Peter Robinson 6.03.1-1 +- Update to 6.03.1 +- Spec file fixups + +* Mon Jul 28 2014 Jerry James - 6.03.0-1 +- Update to 6.03.0 (bz 1094866; fixes bzs 1057580, 1067182, and 1106095) +- Change project URL to github page +- Update BRs and reorganize for readability +- Bring back the manual sources; the manual subpackage has the GFDL license +- Obsolete the -gui and -tk subpackages (no longer supported upstream) +- Add -csoundac, -lua, -portaudio, and -stk subpackages * Tue Jul 8 2014 Peter Robinson 5.19.01-7 - Minor cleanups diff --git a/sources b/sources index 6313ece..c7ca76d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c9a1c92865ef0af61dcb3fd7d92d24ee Csound5.19.01.tar.gz -92d130a67b41cbf3702e62f38ec8a958 Csound5.19_manual_html.zip +9635b92a4a6d7c8882fb00b89f51e75d Csound6.03.1.tar.gz +6bbd6cd442c9822a9f52ad9cc53d6e2d manual_src.tar.gz