From df8b44b1cae2f665c99ae9429c321732b097ed07023d3a6b60b83240f06159fe Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 6 Apr 2019 07:44:05 +0000 Subject: [PATCH 01/14] Accepting request 691977 from home:plater sync new csound OBS-URL: https://build.opensuse.org/request/show/691977 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=25 --- Csound5.18.02.tar.gz | 3 - csound-6.08-64-bit-plugin-path.patch | 40 ++ csound-6.08-default-pulse.patch | 13 + csound-6.08-fix-conflicts.patch | 118 ++++ csound-6.08-sse2.patch | 33 + csound-6.08-xdg-open.patch | 22 + csound-6.12.2.tar.gz | 3 + csound-scons-on-py3.patch | 962 --------------------------- csound-strncat-fix.patch | 28 - csound.spec | 128 +++- fluidsynth2.patch | 60 ++ 11 files changed, 389 insertions(+), 1021 deletions(-) delete mode 100644 Csound5.18.02.tar.gz create mode 100644 csound-6.08-64-bit-plugin-path.patch create mode 100644 csound-6.08-default-pulse.patch create mode 100644 csound-6.08-fix-conflicts.patch create mode 100644 csound-6.08-sse2.patch create mode 100644 csound-6.08-xdg-open.patch create mode 100644 csound-6.12.2.tar.gz delete mode 100644 csound-scons-on-py3.patch delete mode 100644 csound-strncat-fix.patch create mode 100644 fluidsynth2.patch diff --git a/Csound5.18.02.tar.gz b/Csound5.18.02.tar.gz deleted file mode 100644 index 8e2149d..0000000 --- a/Csound5.18.02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8 -size 9211491 diff --git a/csound-6.08-64-bit-plugin-path.patch b/csound-6.08-64-bit-plugin-path.patch new file mode 100644 index 0000000..e8db155 --- /dev/null +++ b/csound-6.08-64-bit-plugin-path.patch @@ -0,0 +1,40 @@ +--- CMakeLists.txt.orig 2017-02-04 22:30:16.670767865 +0200 ++++ CMakeLists.txt 2017-02-04 22:29:23.216953000 +0200 +@@ -35,11 +35,10 @@ message(STATUS "LIBRARY INSTALL DIR: ${L + + if(USE_DOUBLE) + message(STATUS "Building with 64-bit floats") +- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}") + else() + message(STATUS "Building with 32-bit floats") +- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") + endif() ++set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") + + + execute_process ( +--- installer/misc/mkpackage.py.orig 2017-02-04 20:49:47.206563224 +0200 ++++ installer/misc/mkpackage.py 2017-02-04 20:50:43.818304341 +0200 +@@ -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 2016-11-25 01:42:03.000000000 +0200 ++++ Top/csmodule.c 2017-02-04 20:52:48.869523561 +0200 +@@ -146,9 +146,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.08-default-pulse.patch b/csound-6.08-default-pulse.patch new file mode 100644 index 0000000..2a42e47 --- /dev/null +++ b/csound-6.08-default-pulse.patch @@ -0,0 +1,13 @@ +Index: csound-6.12.2/Top/csound.c +=================================================================== +--- csound-6.12.2.orig/Top/csound.c 2018-11-07 16:05:23.000000000 +0200 ++++ csound-6.12.2/Top/csound.c 2019-04-05 15:32:03.893551257 +0200 +@@ -3443,7 +3443,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.08-fix-conflicts.patch b/csound-6.08-fix-conflicts.patch new file mode 100644 index 0000000..6860b3f --- /dev/null +++ b/csound-6.08-fix-conflicts.patch @@ -0,0 +1,118 @@ +--- 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 2016-11-25 01:42:03.000000000 +0200 ++++ util/CMakeLists.txt 2017-02-04 21:13:26.135024754 +0200 +@@ -23,15 +23,15 @@ 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) + make_utility(lpanal lpc_main.c) + make_utility(lpc_export lpcx_main.c) + 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) + if(LINUX) + target_link_libraries(mixer-bin m) + endif() +@@ -39,9 +39,9 @@ if(BUILD_UTILITIES) + 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) + + + find_library(LIBSNDFILE_LIBRARY sndfile) diff --git a/csound-6.08-sse2.patch b/csound-6.08-sse2.patch new file mode 100644 index 0000000..eef2f8f --- /dev/null +++ b/csound-6.08-sse2.patch @@ -0,0 +1,33 @@ +--- cmake/CompilerOptimizations.cmake.orig 2017-02-04 21:33:49.238875410 +0200 ++++ cmake/CompilerOptimizations.cmake 2017-02-04 21:38:33.681564067 +0200 +@@ -19,30 +19,6 @@ if (HAS_CXX_FAST_MATH AND NOT MINGW) + 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 AND NOT IOS) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") +-endif() +-if (HAS_CXX_SSE2 AND NOT IOS) +- 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.08-xdg-open.patch b/csound-6.08-xdg-open.patch new file mode 100644 index 0000000..5acc505 --- /dev/null +++ b/csound-6.08-xdg-open.patch @@ -0,0 +1,22 @@ +Index: csound-6.12.2/installer/misc/vim/cshelp +=================================================================== +--- csound-6.12.2.orig/installer/misc/vim/cshelp 2018-11-07 16:05:23.000000000 +0200 ++++ csound-6.12.2/installer/misc/vim/cshelp 2019-04-05 15:32:23.670308342 +0200 +@@ -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-6.12.2.tar.gz b/csound-6.12.2.tar.gz new file mode 100644 index 0000000..1407081 --- /dev/null +++ b/csound-6.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39f4872b896eb1cbbf596fcacc0f2122fd3e5ebbb5cec14a81b4207d6b8630ff +size 26297850 diff --git a/csound-scons-on-py3.patch b/csound-scons-on-py3.patch deleted file mode 100644 index 776882b..0000000 --- a/csound-scons-on-py3.patch +++ /dev/null @@ -1,962 +0,0 @@ -Index: Csound5.18.02/SConstruct -=================================================================== ---- Csound5.18.02.orig/SConstruct -+++ Csound5.18.02/SConstruct -@@ -1,5 +1,5 @@ - #J vim:syntax=python --print ''' -+print (''' - C S O U N D 5 - - SCons build file for Csound 5: -@@ -16,7 +16,7 @@ For MinGW, run in the MSys shell - and use www.python.org WIN32 Python to run scons. - For Microsoft Visual C++, run in the Platform SDK - command shell, and use www.python.org WIN32 Python to run scons. --''' -+''') - - import time - import glob -@@ -67,7 +67,7 @@ def getPlatform(): - # - ############################################################################# - --print "System platform is '" + getPlatform() + "'." -+print ("System platform is '" + getPlatform() + "'.") - - - # Create options that can be set from the command line. -@@ -326,10 +326,10 @@ elif getPlatform() == 'win32': - optionsFilename = 'custom-mingw.py' - - if(not FindFile(optionsFilename, '.')): -- print "\n\n*************************************************" -- print "%s NOT FOUND, please copy one of the custom-***.py" % optionsFilename -- print "as %s and modify it to suit your system, if necessary" % optionsFilename -- print "*************************************************" -+ print ("\n\n*************************************************") -+ print ("%s NOT FOUND, please copy one of the custom-***.py" % optionsFilename) -+ print ("as %s and modify it to suit your system, if necessary" % optionsFilename) -+ print ("*************************************************") - Exit(-1) - - -@@ -341,7 +341,7 @@ if commonEnvironment['custom']: - Requires(optionsFilename, commonEnvironment) - - --print "Using options from '%s.'" % optionsFilename -+print ("Using options from '%s.'" % optionsFilename) - - fileOptions = Options(optionsFilename) - fileOptions.Add('customCPPPATH', 'List of custom CPPPATH variables') -@@ -370,21 +370,21 @@ commonEnvironment.Prepend(SWIGFLAGS = cu - - # Define options for different platforms. - if getPlatform() != 'win32' and getPlatform() != 'sunos': -- print "Build platform is '" + getPlatform() + "'." -+ print ("Build platform is '" + getPlatform() + "'.") - elif getPlatform() == 'sunos': - if compilerSun(): -- print "Build platform is Sun Studio." -+ print ("Build platform is Sun Studio.") - elif compilerGNU(): -- print "Build platform is '" + getPlatform() + "'." -+ print ("Build platform is '" + getPlatform() + "'.") - else: - if compilerMicrosoft(): -- print "Build platform is Microsoft Visual C++ (MSVC)." -+ print ("Build platform is Microsoft Visual C++ (MSVC).") - elif compilerIntel(): -- print "Build platform is the Intel C++ Compiler (ICL)." -+ print ("Build platform is the Intel C++ Compiler (ICL).") - elif compilerGNU(): -- print "Build platform is MinGW/MSYS" -+ print ("Build platform is MinGW/MSYS") - --print "SCons tools on this platform: ", commonEnvironment['TOOLS'] -+print ("SCons tools on this platform: ", commonEnvironment['TOOLS']) - - commonEnvironment.Prepend(CPPPATH = ['.', './H']) - if commonEnvironment['useLrint'] != '0': -@@ -393,7 +393,7 @@ if commonEnvironment['useLrint'] != '0': - cf = Configure(commonEnvironment) - if commonEnvironment['useGettext'] == '1': - if cf.CheckHeader("libintl.h"): -- print "CONFIGURATION DECISION: Using GNU gettext scheme" -+ print ("CONFIGURATION DECISION: Using GNU gettext scheme") - commonEnvironment.Prepend(CCFLAGS = ['-DGNU_GETTEXT']) - if getPlatform() == "win32": - commonEnvironment.Append(LIBS=['intl']) -@@ -402,7 +402,7 @@ if commonEnvironment['useGettext'] == '1 - if getPlatform() == "sunos": - commonEnvironment.Append(LIBS=['intl']) - else: -- print "CONFIGURATION DECISION: No localisation" -+ print ("CONFIGURATION DECISION: No localisation") - - commonEnvironment = cf.Finish() - -@@ -481,9 +481,9 @@ if commonEnvironment['Word64'] == '1': - commonEnvironment.Append(CCFLAGS = ['-fPIC']) - - if commonEnvironment['useDouble'] == '0': -- print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.' -+ print ('CONFIGURATION DECISION: Using single-precision floating point for audio samples.') - else: -- print 'CONFIGURATION DECISION: Using double-precision floating point for audio samples.' -+ print ('CONFIGURATION DECISION: Using double-precision floating point for audio samples.') - commonEnvironment.Append(CPPFLAGS = ['-DUSE_DOUBLE']) - - # Define different build environments for different types of targets. -@@ -510,7 +510,7 @@ elif getPlatform() == 'darwin': - commonEnvironment.Append(CPPPATH = '/usr/local/include') - commonEnvironment.Append(CCFLAGS = "-DPIPES") - if commonEnvironment['useAltivec'] == '1': -- print 'CONFIGURATION DECISION: Using Altivec optimisation' -+ print ('CONFIGURATION DECISION: Using Altivec optimisation') - commonEnvironment.Append(CCFLAGS = "-faltivec") - elif getPlatform() == 'win32': - commonEnvironment.Append(CCFLAGS = '-D_WIN32') -@@ -551,7 +551,7 @@ elif getPlatform() == 'win32': - if compilerMicrosoft(): - commonEnvironment.Append(CCFLAGS = '/arch:sse') - if compilerIntel(): -- print 'Generating code optimized for Intel Core 2 Duo and Pentium 4 that will run on other processors also.' -+ print ('Generating code optimized for Intel Core 2 Duo and Pentium 4 that will run on other processors also.') - commonEnvironment.Append(CCFLAGS = Split('/O3 /QaxTP')) - - if getPlatform() == 'linux': -@@ -586,7 +586,7 @@ elif getPlatform() == 'darwin': - kernelstr = fout.readline() - fout.close() - OSXvers = int(kernelstr[:kernelstr.find('.')]) - 4 -- print "Mac OS X version 10.%d" % OSXvers -+ print ("Mac OS X version 10.%d" % OSXvers) - # dictionary mapping OS X version to Apple Python version - # ex. 4:3 maps OS X 10.4 to Python 2.3 - # Note that OS X 10.2 did not ship with a Python framework -@@ -594,21 +594,21 @@ elif getPlatform() == 'darwin': - OSXSystemPythonVersions = { 0:0, 1:0, 2:2, 3:3, 4:3, 5:5, 6:6, 7:7 } - sysPyVers = OSXSystemPythonVersions[OSXvers] - if OSXvers >= 2: -- print "Apple Python version is 2.%d" % sysPyVers -+ print ("Apple Python version is 2.%d" % sysPyVers) - # vers = (int(sys.hexversion) >> 24, (int(sys.hexversion) >> 16) & 255) - vers = sys.version_info - pvers = "%s.%s" % (vers[0], vers[1]) - # This logic is not quite right on OS X 10.2 and earlier - # or if the MacPython version equals the expected Apple Python version - if vers[1] == sysPyVers: -- print "Current Python version is %s, using Apple Python Framework" % pvers -+ print ("Current Python version is %s, using Apple Python Framework" % pvers) - pyBasePath = '/System/Library/Frameworks' - else: -- print "Current Python version is %s, using MacPython Framework" % pvers -+ print ("Current Python version is %s, using MacPython Framework" % pvers) - pyBasePath = '/Library/Frameworks' - if commonEnvironment['pythonVersion'] != pvers: - commonEnvironment['pythonVersion'] = pvers -- print "WARNING python version used is " + pvers -+ print ("WARNING python version used is " + pvers) - pythonIncludePath = ['%s/Python.Framework/Headers' % pyBasePath] - pythonLinkFlags = [ '-F' + pyBasePath, '-framework', 'python'] - path1 = '%s/Python.framework/Versions/Current/lib' % pyBasePath -@@ -665,15 +665,15 @@ configure = commonEnvironment.Configure( - }) - - if not configure.CheckHeader("stdio.h", language = "C"): -- print " *** Failed to compile a simple test program. The compiler is" -- print " *** possibly not set up correctly, or is used with invalid flags." -- print " *** Check config.log to find out more about the error." -+ print (" *** Failed to compile a simple test program. The compiler is") -+ print (" *** possibly not set up correctly, or is used with invalid flags.") -+ print (" *** Check config.log to find out more about the error.") - Exit(-1) - if not configure.CheckLibWithHeader("sndfile", "sndfile.h", language = "C"): -- print "The sndfile library is required to build Csound 5." -+ print ("The sndfile library is required to build Csound 5.") - Exit(-1) - if not configure.CheckLibWithHeader("pthread", "pthread.h", language = "C"): -- print "The pthread library is required to build Csound 5." -+ print ("The pthread library is required to build Csound 5.") - Exit(-1) - - # Support for GEN49 (load MP3 file) -@@ -681,24 +681,24 @@ if not configure.CheckLibWithHeader("pth - if commonEnvironment['includeWii'] != '0' and configure.CheckHeader("wiiuse.h", language = "C"): - wiifound = 1 - wiiversion = commonEnvironment['includeWii'] -- print 'CONFIGURATION DECISION: Building with Wiimote support' -+ print ('CONFIGURATION DECISION: Building with Wiimote support') - else: - wiifound = 0 -- print 'CONFIGURATION DECISION: No Wiimote support' -+ print ('CONFIGURATION DECISION: No Wiimote support') - - if commonEnvironment['includeP5Glove'] == '1' : - p5gfound = 1 -- print 'CONFIGURATION DECISION: Building with P5 Glove support' -+ print ('CONFIGURATION DECISION: Building with P5 Glove support') - else: - p5gfound = 0 -- print 'CONFIGURATION DECISION: No P5 Glove support' -+ print ('CONFIGURATION DECISION: No P5 Glove support') - - if commonEnvironment['includeSerial'] == '1' : - serialfound = 1 -- print 'CONFIGURATION DECISION: Building with Serial code support' -+ print ('CONFIGURATION DECISION: Building with Serial code support') - else: - serialfound = 0 -- print 'CONFIGURATION DECISION: No Serial code support' -+ print ('CONFIGURATION DECISION: No Serial code support') - - - #pthreadSpinlockFound = configure.CheckLibWithHeader('pthread', 'pthread.h', 'C', 'pthread_spin_lock(0);') -@@ -706,13 +706,13 @@ if getPlatform() != 'darwin': # pthreadS - commonEnvironment.Append(CPPFLAGS = ['-DHAVE_PTHREAD_SPIN_LOCK']) - pthreadBarrierFound = configure.CheckLibWithHeader('pthread', 'pthread.h', 'C', 'pthread_barrier_init(0, NULL, 0);') - if pthreadBarrierFound: -- print 'CONFIGURATION DECISION: Using HAVE_PTHREAD_BARRIER_INIT' -+ print ('CONFIGURATION DECISION: Using HAVE_PTHREAD_BARRIER_INIT') - commonEnvironment.Append(CPPFLAGS = ['-DHAVE_PTHREAD_BARRIER_INIT']) - else: -- print 'CONFIGURATION DECISION: Not using HAVE_PTHREAD_BARRIER_INIT' -+ print ('CONFIGURATION DECISION: Not using HAVE_PTHREAD_BARRIER_INIT') - openMpFound = configure.CheckLibWithHeader('gomp', 'omp.h', 'C++', 'int n = omp_get_num_threads();') - if openMpFound and pthreadBarrierFound and commonEnvironment['useOpenMP'] == '1': -- print 'CONFIGURATION DECISION: Using OpenMP.' -+ print ('CONFIGURATION DECISION: Using OpenMP.') - commonEnvironment.Append(CFLAGS = ['-fopenmp']) - commonEnvironment.Append(CXXFLAGS = ['-fopenmp']) - commonEnvironment.Append(CPPFLAGS = ['-DUSE_OPENMP']) -@@ -725,7 +725,7 @@ else: - syncLockTestAndSetFound = configure.CheckLibWithHeader('m', 'stdint.h', 'C', '__sync_lock_test_and_set((int32_t *)0, 0);') - if syncLockTestAndSetFound: - commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SYNC_LOCK_TEST_AND_SET']) -- print 'found sync lock' -+ print ('found sync lock') - vstSdkFound = configure.CheckHeader("frontends/CsoundVST/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h", language = "C++") - portaudioFound = configure.CheckHeader("portaudio.h", language = "C") - #portmidiFound = configure.CheckHeader("portmidi.h", language = "C") -@@ -758,8 +758,8 @@ midiPluginSdkFound = configure.CheckHead - luaFound = configure.CheckHeader("lua.h", language = "C") - #print 'LUA: %s' % (['no', 'yes'][int(luaFound)]) - swigFound = 'swig' in commonEnvironment['TOOLS'] --print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)]) --print "Python Version: " + commonEnvironment['pythonVersion'] -+print ('Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])) -+print ("Python Version: " + commonEnvironment['pythonVersion']) - pythonFound = configure.CheckHeader("Python.h", language = "C") - if not pythonFound: - if getPlatform() == 'darwin': -@@ -827,7 +827,7 @@ elif configure.CheckHeader("dirent.h", l - commonEnvironment.Append(CPPFLAGS = ['-DHAVE_DIRENT_H']) - - if not configure.CheckSndFile(): -- print "The sndfile library >= 1.0.19 is required to build Csound 5." -+ print ("The sndfile library >= 1.0.19 is required to build Csound 5.") - Exit(-1) - - # Package contents. -@@ -881,9 +881,9 @@ lexBuild = csoundLibraryEnvironment.CFil - preBuild = csoundLibraryEnvironment.CFile(target = 'Engine/csound_prelex.c', - source = 'Engine/csound_pre.lex') - if commonEnvironment['NewParserDebug'] != '0': -- print 'CONFIGURATION DECISION: Building with new parser debugging' -+ print ('CONFIGURATION DECISION: Building with new parser debugging') - csoundLibraryEnvironment.Append(CPPFLAGS = ['-DPARSER_DEBUG=1']) --else: print 'CONFIGURATION DECISION: Not building with new parser debugging' -+else: print ('CONFIGURATION DECISION: Not building with new parser debugging') - - csoundLibraryEnvironment.Append(CPPFLAGS = ['-D__BUILDING_LIBCSOUND']) - if commonEnvironment['buildRelease'] != '0': -@@ -978,7 +978,7 @@ if buildOSXFramework: - tmp += ['%s/Resources/Opcodes64' % OSXFrameworkCurrentVersion] - for i in tmp: - try: -- os.mkdir(i, 0755) -+ os.mkdir(i, 0o755) - except: - pass - # set up symbolic links -@@ -1007,7 +1007,7 @@ def MacOSX_InstallHeader(headerName): - - def MacOSX_InstallPlugin(fileName): - if buildOSXFramework: -- print "COPYINNG plugin" -+ print ("COPYINNG plugin") - pluginDir = '%s/Resources/Opcodes' % OSXFrameworkCurrentVersion - if commonEnvironment['useDouble'] != '0': - pluginDir += '64' -@@ -1194,7 +1194,7 @@ libCsoundSources += newParserSources - - csoundLibraryEnvironment.Append(CCFLAGS='-fPIC') - if commonEnvironment['dynamicCsoundLibrary'] == '1': -- print 'CONFIGURATION DECISION: Building dynamic Csound library' -+ print ('CONFIGURATION DECISION: Building dynamic Csound library') - if getPlatform() == 'linux' or getPlatform() == 'sunos': - libName = 'lib' + csoundLibraryName + '.so' - libName2 = libName + '.' + csoundLibraryVersion -@@ -1246,7 +1246,7 @@ if commonEnvironment['dynamicCsoundLibra - csoundLibrary = csoundDynamicLibraryEnvironment.SharedLibrary( - csoundLibraryName, libCsoundSources) - else: -- print 'CONFIGURATION DECISION: Building static Csound library' -+ print ('CONFIGURATION DECISION: Building static Csound library') - csoundLibraryEnvironment.Append(CCFLAGS='-fPIC') - csoundLibrary = csoundLibraryEnvironment.Library( - csoundLibraryName, libCsoundSources) -@@ -1316,7 +1316,7 @@ def makePythonModule(env, targetName, so - pyModule_ = env.SharedLibrary('_%s' % targetName, sources, SHLIBSUFFIX = '.pyd') - if getPlatform() == 'win32' and pythonLibs[0] < 'python24': - Depends(pyModule_, pythonImportLibrary) -- print "PYTHON MODULE %s..." % targetName -+ print ("PYTHON MODULE %s..." % targetName) - pythonModules.append(pyModule_) - pythonModules.append('%s.py' % targetName) - return pyModule_ -@@ -1330,15 +1330,15 @@ def makeLuaModule(env, targetName, srcs) - luaModule_ = env.SharedLibrary('%s' % targetName, srcs, SHLIBPREFIX="", SHLIBSUFFIX = '.so') - else: - luaModule_ = env.SharedLibrary('%s' % targetName, srcs, SHLIBSUFFIX = '.dll') -- print "LUA MODULE %s..." % targetName -+ print ("LUA MODULE %s..." % targetName) - return luaModule_ - - # libcsnd.so is used by all wrapper libraries. - - if not (commonEnvironment['buildInterfaces'] == '1'): -- print 'CONFIGURATION DECISION: Not building Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Not building Csound C++ interface library.') - else: -- print 'CONFIGURATION DECISION: Building Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Building Csound C++ interface library.') - csoundInterfacesEnvironment.Append(CPPPATH = ['interfaces']) - if musicXmlFound: - csoundInterfacesEnvironment.Prepend(LIBS = 'musicxml2') -@@ -1416,36 +1416,36 @@ else: - option = '-I' + option - csoundWrapperEnvironment.Append(SWIGFLAGS = [option]) - swigflags = csoundWrapperEnvironment['SWIGFLAGS'] -- print 'swigflags:', swigflags -+ print ('swigflags:', swigflags) - luaWrapper = None - if not (luaFound and commonEnvironment['buildLuaWrapper'] != '0'): -- print 'CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.') - else: -- print 'CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.' -- luaWrapperEnvironment = csoundWrapperEnvironment.Clone() -+ print ('CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.') -+ luaWrapperEnvironment = csoundWrapperEnvironment.Clone() - if getPlatform() != 'win32': - csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1']) - if getPlatform() == 'win32': - csoundLuaInterface = luaWrapperEnvironment.SharedObject( - 'interfaces/lua_interface.i', - SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.']) -- luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51']) -- else: -- csoundLuaInterface = luaWrapperEnvironment.SharedObject( -- 'interfaces/lua_interface.i', -- SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.']) -+ luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51']) -+ else: -+ csoundLuaInterface = luaWrapperEnvironment.SharedObject( -+ 'interfaces/lua_interface.i', -+ SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.']) - luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1']) - luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface]) -- Depends(luaWrapper, csoundLuaInterface) -+ Depends(luaWrapper, csoundLuaInterface) - - if not (javaFound and commonEnvironment['buildJavaWrapper'] != '0'): -- print 'CONFIGURATION DECISION: Not building Java wrapper to Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Not building Java wrapper to Csound C++ interface library.') - else: -- print 'CONFIGURATION DECISION: Building Java wrapper to Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Building Java wrapper to Csound C++ interface library.') - javaWrapperEnvironment = csoundWrapperEnvironment.Clone() - if getPlatform() == 'darwin': - javaWrapperEnvironment.Append(LINKFLAGS = ['-L.', '-l_csnd']) -- else: javaWrapperEnvironment.Prepend(LIBS = ['csnd']) -+ else: javaWrapperEnvironment.Prepend(LIBS = ['csnd']) - if getPlatform() == 'darwin': - javaWrapperEnvironment.Append(CPPPATH = - ['/System/Library/Frameworks/JavaVM.framework/Headers']) -@@ -1485,7 +1485,7 @@ else: - target = './interfaces', source = './interfaces', - JAVACFLAGS = ['-source', '5', '-target', '5']) - try: -- os.mkdir('interfaces/csnd', 0755) -+ os.mkdir('interfaces/csnd', 0o755) - except: - pass - jcsndJar = javaWrapperEnvironment.Jar( -@@ -1495,57 +1495,57 @@ else: - # Please do not remove these two variables, needed to get things to build on Windows... - pythonWrapper = None - if not (pythonFound and commonEnvironment['buildPythonWrapper'] != '0'): -- print 'CONFIGURATION DECISION: Not building Python wrapper to Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Not building Python wrapper to Csound C++ interface library.') - else: -- print 'CONFIGURATION DECISION: Building Python wrapper to Csound C++ interface library.' -+ print ('CONFIGURATION DECISION: Building Python wrapper to Csound C++ interface library.') - pythonWrapperEnvironment = csoundWrapperEnvironment.Clone() - if getPlatform() == 'darwin': - pythonWrapperEnvironment.Append(LINKFLAGS = ['-L.', '-l_csnd']) - else: pythonWrapperEnvironment.Prepend(LIBS = Split('csnd')) -- if getPlatform() == 'linux': -- os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_csnd.so']) -- # os.symlink('lib_csnd.so', '_csnd.so') -- pythonWrapperEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.']) -- if getPlatform() == 'darwin': -+ if getPlatform() == 'linux': -+ os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_csnd.so']) -+ # os.symlink('lib_csnd.so', '_csnd.so') -+ pythonWrapperEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.']) -+ if getPlatform() == 'darwin': - #pythonWrapperEnvironment.Append(LINKFLAGS = pythonLinkFlags) -- if commonEnvironment['dynamicCsoundLibrary'] == '1': -- #ilibName = "lib_csnd.dylib" -- #ilibVersion = csoundLibraryVersion -- #pythonWrapperEnvironment.Append(SHLINKFLAGS = Split('''-Xlinker -compatibility_version -Xlinker %s''' % ilibVersion)) -- #pythonWrapperEnvironment.Append(SHLINKFLAGS = Split('''-Xlinker -current_version -Xlinker %s''' % ilibVersion)) -- #pythonWrapperEnvironment.Append(SHLINKFLAGS = Split('''-install_name /Library/Frameworks/%s/%s''' % (OSXFrameworkCurrentVersion, ilibName))) -- pythonWrapperEnvironment.Append(LINKFLAGS = Split('''-undefined dynamic_lookup''')) -+ if commonEnvironment['dynamicCsoundLibrary'] == '1': -+ #ilibName = "lib_csnd.dylib" -+ #ilibVersion = csoundLibraryVersion -+ #pythonWrapperEnvironment.Append(SHLINKFLAGS = Split('''-Xlinker -compatibility_version -Xlinker %s''' % ilibVersion)) -+ #pythonWrapperEnvironment.Append(SHLINKFLAGS = Split('''-Xlinker -current_version -Xlinker %s''' % ilibVersion)) -+ #pythonWrapperEnvironment.Append(SHLINKFLAGS = Split('''-install_name /Library/Frameworks/%s/%s''' % (OSXFrameworkCurrentVersion, ilibName))) -+ pythonWrapperEnvironment.Append(LINKFLAGS = Split('''-undefined dynamic_lookup''')) - pythonWrapperEnvironment.Append(CPPPATH = pythonIncludePath) -- #pythonWrapper = pythonWrapperEnvironment.SharedLibrary('_csnd', pythonWrapperSources) -- pyVersToken = '-DPYTHON_24_or_newer' -- csoundPythonInterface = pythonWrapperEnvironment.SharedObject( -- 'interfaces/python_interface.i', -- SWIGFLAGS = [swigflags, '-python', '-outdir', '.', pyVersToken]) -- pythonWrapperEnvironment.Clean('.', 'interfaces/python_interface_wrap.h') -- #try: os.symlink('lib_csnd.dylib', 'libcsnd.dylib') -- #except: print "link exists..." -- else: -- pythonWrapperEnvironment.Append(LINKFLAGS = pythonLinkFlags) -- pythonWrapperEnvironment.Prepend(LIBPATH = pythonLibraryPath) -- if getPlatform() == 'win32': -- pythonWrapperEnvironment.Prepend(LIBS = pythonLibs) -- pythonWrapperEnvironment.Append(CPPPATH = pythonIncludePath) -- fixCFlagsForSwig(pythonWrapperEnvironment) -- pyVersToken = '-DPYTHON_24_or_newer' -- csoundPythonInterface = pythonWrapperEnvironment.SharedObject( -- 'interfaces/python_interface.i', -- SWIGFLAGS = [swigflags, '-python', '-outdir', '.', pyVersToken]) -- pythonWrapperEnvironment.Clean('.', 'interfaces/python_interface_wrap.h') -- if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and compilerGNU(): -- Depends(csoundPythonInterface, pythonImportLibrary) -- pythonWrapper = makePythonModule(pythonWrapperEnvironment, 'csnd', [csoundPythonInterface]) -- pythonModules.append('csnd.py') -- Depends(pythonWrapper, csnd) -+ #pythonWrapper = pythonWrapperEnvironment.SharedLibrary('_csnd', pythonWrapperSources) -+ pyVersToken = '-DPYTHON_24_or_newer' -+ csoundPythonInterface = pythonWrapperEnvironment.SharedObject( -+ 'interfaces/python_interface.i', -+ SWIGFLAGS = [swigflags, '-python', '-outdir', '.', pyVersToken]) -+ pythonWrapperEnvironment.Clean('.', 'interfaces/python_interface_wrap.h') -+ #try: os.symlink('lib_csnd.dylib', 'libcsnd.dylib') -+ #except: print ("link exists...") -+ else: -+ pythonWrapperEnvironment.Append(LINKFLAGS = pythonLinkFlags) -+ pythonWrapperEnvironment.Prepend(LIBPATH = pythonLibraryPath) -+ if getPlatform() == 'win32': -+ pythonWrapperEnvironment.Prepend(LIBS = pythonLibs) -+ pythonWrapperEnvironment.Append(CPPPATH = pythonIncludePath) -+ fixCFlagsForSwig(pythonWrapperEnvironment) -+ pyVersToken = '-DPYTHON_24_or_newer' -+ csoundPythonInterface = pythonWrapperEnvironment.SharedObject( -+ 'interfaces/python_interface.i', -+ SWIGFLAGS = [swigflags, '-python', '-outdir', '.', pyVersToken]) -+ pythonWrapperEnvironment.Clean('.', 'interfaces/python_interface_wrap.h') -+ if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and compilerGNU(): -+ Depends(csoundPythonInterface, pythonImportLibrary) -+ pythonWrapper = makePythonModule(pythonWrapperEnvironment, 'csnd', [csoundPythonInterface]) -+ pythonModules.append('csnd.py') -+ Depends(pythonWrapper, csnd) - - if commonEnvironment['generatePdf'] == '0': -- print 'CONFIGURATION DECISION: Not generating Csound API PDF documentation.' -+ print ('CONFIGURATION DECISION: Not generating Csound API PDF documentation.') - else: -- print 'CONFIGURATION DECISION: Generating Csound API PDF documentation.' -+ print ('CONFIGURATION DECISION: Generating Csound API PDF documentation.') - refmanTex = commonEnvironment.Command('doc/latex/refman.tex', 'Doxyfile', ['doxygen $SOURCE']) - Depends(refmanTex, csoundLibrary) - csoundPdf = commonEnvironment.Command('refman.pdf', 'doc/latex/refman.tex', ['pdflatex --include-directory=doc/latex --interaction=nonstopmode --job-name=CsoundAPI $SOURCE']) -@@ -1678,9 +1678,9 @@ makePlugin(pluginEnvironment, 'cellular' - ############################################################################# - # UDP opcodes - if commonEnvironment['useUDP'] == '0': -- print "CONFIGURATION DECISION: Not building UDP plugins." -+ print ("CONFIGURATION DECISION: Not building UDP plugins.") - else: -- print "CONFIGURATION DECISION: Building UDP plugins." -+ print ("CONFIGURATION DECISION: Building UDP plugins.") - udpEnvironment = pluginEnvironment.Clone() - udpEnvironment.Append(LIBS = ['pthread']) - if getPlatform() == 'win32': -@@ -1692,9 +1692,9 @@ else: - - # OSC opcodes - if not (commonEnvironment['useOSC'] == '1' and oscFound): -- print "CONFIGURATION DECISION: Not building OSC plugin." -+ print ("CONFIGURATION DECISION: Not building OSC plugin.") - else: -- print "CONFIGURATION DECISION: Building OSC plugin." -+ print ("CONFIGURATION DECISION: Building OSC plugin.") - oscEnvironment = pluginEnvironment.Clone() - oscEnvironment.Append(LIBS = ['lo', 'pthread']) - if getPlatform() == 'win32': -@@ -1728,32 +1728,32 @@ if jackFound and commonEnvironment['useJ - jpluginEnvironment.Append(LIBS = ['jackdmp']) - elif getPlatform() == 'darwin': - jpluginEnvironment.Append(LIBS = ['pthread']) -- jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp']) -+ jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp']) - makePlugin(jpluginEnvironment, 'jackTransport', 'Opcodes/jackTransport.c') - makePlugin(jpluginEnvironment, 'jacko', 'Opcodes/jacko.cpp') - if boostFound: - makePlugin(pluginEnvironment, 'chua', 'Opcodes/chua/ChuaOscillator.cpp') - if gmmFound and commonEnvironment['useDouble'] != '0': - makePlugin(pluginEnvironment, 'linear_algebra', 'Opcodes/linear_algebra.cpp') -- print 'CONFIGURATION DECISION: Building linear algebra opcodes.' -+ print ('CONFIGURATION DECISION: Building linear algebra opcodes.') - else: -- print 'CONFIGURATION DECISION: Not building linear algebra opcodes.' -+ print ('CONFIGURATION DECISION: Not building linear algebra opcodes.') - - if commonEnvironment['buildImageOpcodes'] == '1': - if getPlatform() == 'win32': - if configure.CheckHeader("png.h", language="C") and zlibhfound: -- print 'CONFIGURATION DECISION: Building image opcodes' -+ print ('CONFIGURATION DECISION: Building image opcodes') - imEnv = pluginEnvironment.Clone() - imEnv.Append(LIBS= Split(''' fltk_png fltk_z ''')) - makePlugin(imEnv, 'image', ['Opcodes/imageOpcodes.c']) - else: - if configure.CheckHeader("png.h", language="C") and zlibhfound: -- print 'CONFIGURATION DECISION: Building image opcodes' -+ print ('CONFIGURATION DECISION: Building image opcodes') - imEnv = pluginEnvironment.Clone() - imEnv.Append(LIBS= Split(''' png z ''')) - makePlugin(imEnv, 'image', ['Opcodes/imageOpcodes.c']) - else: -- print 'CONFIGURATION DECISION: Not building image opcodes' -+ print ('CONFIGURATION DECISION: Not building image opcodes') - - # FLTK widgets - -@@ -1767,11 +1767,11 @@ if getPlatform() != 'darwin': - if ((commonEnvironment['buildCsoundVST'] == '1') and boostFound and fltkFound): - try: - if vstEnvironment.ParseConfig(fltkConfigFlags): -- print 'Parsed fltk-config.' -+ print ('Parsed fltk-config.') - else: -- print 'Could not parse fltk-config.' -+ print ('Could not parse fltk-config.') - except: -- print 'Exception when attempting to parse fltk-config.' -+ print ('Exception when attempting to parse fltk-config.') - if getPlatform() == 'darwin': - vstEnvironment.Append(LIBS = ['fltk', 'fltk_images']) # png z jpeg are not on OSX at the mo - if getPlatform() == 'win32': -@@ -1804,7 +1804,7 @@ else: - csoundProgramEnvironment.Append(LINKFLAGS = Split('''-framework Carbon -framework CoreAudio -framework CoreMIDI''')) - - if (not (commonEnvironment['useFLTK'] == '1' and fltkFound)): -- print 'CONFIGURATION DECISION: Not building with FLTK graphs and widgets.' -+ print ('CONFIGURATION DECISION: Not building with FLTK graphs and widgets.') - else: - widgetsEnvironment = pluginEnvironment.Clone() - if (commonEnvironment['buildvst4cs'] == '1'): -@@ -1832,9 +1832,9 @@ else: - ['InOut/FL_graph.cpp', 'InOut/winFLTK.c', 'InOut/widgets.cpp']) - - if commonEnvironment['buildVirtual'] == '0' or not fltk117Found: -- print "CONFIGURATION DECISION: Not building Virtual Keyboard plugin. (FLTK 1.1.7+ required)" -+ print ("CONFIGURATION DECISION: Not building Virtual Keyboard plugin. (FLTK 1.1.7+ required)") - else: -- print "CONFIGURATION DECISION: Building Virtual Keyboard plugin." -+ print ("CONFIGURATION DECISION: Building Virtual Keyboard plugin.") - widgetsEnvironment.Append(CPPPATH = ['./InOut', './InOut/virtual_keyboard']) - makePlugin(widgetsEnvironment, 'virtual', - ['InOut/virtual_keyboard/FLTKKeyboard.cpp', -@@ -1850,7 +1850,7 @@ else: - # REAL TIME AUDIO AND MIDI - - if commonEnvironment['useCoreAudio'] == '1' and getPlatform() == 'darwin': -- print "CONFIGURATION DECISION: Building CoreAudio plugin." -+ print ("CONFIGURATION DECISION: Building CoreAudio plugin.") - coreaudioEnvironment = pluginEnvironment.Clone() - coreaudioEnvironment.Append(CCFLAGS = ['-I/System/Library/Frameworks/CoreAudio.framework/Headers']) - # makePlugin(coreaudioEnvironment, 'rtcoreaudio', ['InOut/rtcoreaudio.c']) -@@ -1858,18 +1858,18 @@ if commonEnvironment['useCoreAudio'] == - coreaudioEnvironment.Append(LINKFLAGS = ['-framework', 'AudioUnit']) - makePlugin(coreaudioEnvironment, 'rtauhal', ['InOut/rtauhal.c']) - else: -- print "CONFIGURATION DECISION: Not building CoreAudio plugin." -+ print ("CONFIGURATION DECISION: Not building CoreAudio plugin.") - - if not (commonEnvironment['useALSA'] == '1' and alsaFound): -- print "CONFIGURATION DECISION: Not building ALSA plugin." -+ print ("CONFIGURATION DECISION: Not building ALSA plugin.") - else: -- print "CONFIGURATION DECISION: Building ALSA plugin." -+ print ("CONFIGURATION DECISION: Building ALSA plugin.") - alsaEnvironment = pluginEnvironment.Clone() - alsaEnvironment.Append(LIBS = ['asound', 'pthread']) - makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c']) - - if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'): -- print "CONFIGURATION DECISION: Building PulseAudio plugin" -+ print ("CONFIGURATION DECISION: Building PulseAudio plugin") - pulseaudioEnv = pluginEnvironment.Clone() - pulseaudioEnv.Append(LIBS = ['pulse-simple']) - makePlugin(pulseaudioEnv, 'rtpulse', ['InOut/rtpulse.c']) -@@ -1880,9 +1880,9 @@ if getPlatform() == 'win32': - makePlugin(winmmEnvironment, 'rtwinmm', ['InOut/rtwinmm.c']) - - if not (commonEnvironment['usePortAudio'] == '1' and portaudioFound): -- print "CONFIGURATION DECISION: Not building PortAudio module." -+ print ("CONFIGURATION DECISION: Not building PortAudio module.") - else: -- print "CONFIGURATION DECISION: Building PortAudio module." -+ print ("CONFIGURATION DECISION: Building PortAudio module.") - portaudioEnvironment = pluginEnvironment.Clone() - if getPlatform() == 'win32': - portaudioEnvironment.Append(LIBS = ['portaudio']) -@@ -1890,7 +1890,7 @@ else: - portaudioEnvironment.Append(LIBS = ['portaudio']) - if (getPlatform() == 'linux'): - if (commonEnvironment['useJack']=='1' and jackFound): -- print "Adding Jack library for PortAudio" -+ print ("Adding Jack library for PortAudio") - portaudioEnvironment.Append(LIBS = ['jack']) - portaudioEnvironment.Append(LIBS = ['asound', 'pthread']) - makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c']) -@@ -1902,9 +1902,9 @@ else: - makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c']) - - if not (commonEnvironment['useJack'] == '1' and jackFound): -- print "CONFIGURATION DECISION: Not building JACK plugin." -+ print ("CONFIGURATION DECISION: Not building JACK plugin.") - else: -- print "CONFIGURATION DECISION: Building JACK plugin." -+ print ("CONFIGURATION DECISION: Building JACK plugin.") - jackEnvironment = pluginEnvironment.Clone() - if getPlatform() == 'linux': - jackEnvironment.Append(LIBS = ['jack', 'asound', 'pthread']) -@@ -1915,7 +1915,7 @@ else: - makePlugin(jackEnvironment, 'rtjack', ['InOut/rtjack.c']) - - if commonEnvironment['usePortMIDI'] == '1' and portmidiFound: -- print 'CONFIGURATION DECISION: Building with PortMIDI.' -+ print ('CONFIGURATION DECISION: Building with PortMIDI.') - portMidiEnvironment = pluginEnvironment.Clone() - portMidiEnvironment.Append(LIBS = ['portmidi']) - if getPlatform() != 'darwin' and getPlatform() != 'win32': -@@ -1927,7 +1927,7 @@ if commonEnvironment['usePortMIDI'] == ' - portMidiEnvironment.Append(LIBS = ['asound']) - makePlugin(portMidiEnvironment, 'pmidi', ['InOut/pmidi.c']) - else: -- print 'CONFIGURATION DECISION: Not building with PortMIDI.' -+ print ('CONFIGURATION DECISION: Not building with PortMIDI.') - - if getPlatform() == 'darwin': - coreMidiEnvironment = pluginEnvironment.Clone() -@@ -1939,30 +1939,30 @@ if getPlatform() == 'darwin': - # FLUIDSYNTH OPCODES - - if not configure.CheckHeader("fluidsynth.h", language = "C"): -- print "CONFIGURATION DECISION: Not building fluid opcodes." -+ print ("CONFIGURATION DECISION: Not building fluid opcodes.") - else: -- print "CONFIGURATION DECISION: Building fluid opcodes." -+ print ("CONFIGURATION DECISION: Building fluid opcodes.") - fluidEnvironment = pluginEnvironment.Clone() - if getPlatform() == 'win32': -- if compilerGNU(): -- fluidEnvironment.Append(LIBS = ['fluidsynth']) -- else: -- fluidEnvironment.Append(LIBS = ['fluidsynth']) -- fluidEnvironment.Append(CPPFLAGS = ['-DFLUIDSYNTH_NOT_A_DLL']) -- fluidEnvironment.Append(LIBS = ['winmm', 'dsound']) -- fluidEnvironment.Append(LIBS = csoundWindowsLibraries) -+ if compilerGNU(): -+ fluidEnvironment.Append(LIBS = ['fluidsynth']) -+ else: -+ fluidEnvironment.Append(LIBS = ['fluidsynth']) -+ fluidEnvironment.Append(CPPFLAGS = ['-DFLUIDSYNTH_NOT_A_DLL']) -+ fluidEnvironment.Append(LIBS = ['winmm', 'dsound']) -+ fluidEnvironment.Append(LIBS = csoundWindowsLibraries) - elif getPlatform() == 'linux' or getPlatform() == 'darwin': -- fluidEnvironment.Append(LIBS = ['fluidsynth']) -- fluidEnvironment.Append(LIBS = ['pthread']) -+ fluidEnvironment.Append(LIBS = ['fluidsynth']) -+ fluidEnvironment.Append(LIBS = ['pthread']) - makePlugin(fluidEnvironment, 'fluidOpcodes', - ['Opcodes/fluidOpcodes/fluidOpcodes.cpp']) - - # VST HOST OPCODES - - if (commonEnvironment['buildvst4cs'] != '1'): -- print "CONFIGURATION DECISION: Not building vst4cs opcodes." -+ print ("CONFIGURATION DECISION: Not building vst4cs opcodes.") - else: -- print "CONFIGURATION DECISION: Building vst4cs opcodes." -+ print ("CONFIGURATION DECISION: Building vst4cs opcodes.") - if (getPlatform() == 'win32'or getPlatform() == 'linux') and fltkFound: - vst4Environment = vstEnvironment.Clone() - vst4Environment.Append(CPPFLAGS = ['-DCS_VSTHOST']) -@@ -1996,19 +1996,19 @@ else: - # DSSI HOST OPCODES - - if (commonEnvironment['buildDSSI'] == '1' and (getPlatform() == 'linux' or getPlatform() == 'darwin') and configure.CheckHeader("ladspa.h", language = "C")) and configure.CheckHeader("dssi.h", language = "C"): -- print "CONFIGURATION DECISION: Building DSSI plugin host opcodes." -+ print ("CONFIGURATION DECISION: Building DSSI plugin host opcodes.") - dssiEnvironment = pluginEnvironment.Clone() - dssiEnvironment.Append(LIBS = ['dl']) - makePlugin(dssiEnvironment, 'dssi4cs', - ['Opcodes/dssi4cs/src/load.c', 'Opcodes/dssi4cs/src/dssi4cs.c']) - else: -- print "CONFIGURATION DECISION: Not building DSSI plugin host opcodes." -+ print ("CONFIGURATION DECISION: Not building DSSI plugin host opcodes.") - - # Loris opcodes - #if not (commonEnvironment['buildLoris'] == '1' and configure.CheckHeader("Opcodes/Loris/src/loris.h") and configure.CheckHeader("fftw3.h")): --# print "CONFIGURATION DECISION: Not building Loris Python extension and Csound opcodes." -+# print ("CONFIGURATION DECISION: Not building Loris Python extension and Csound opcodes."( - #else: --# print "CONFIGURATION DECISION: Building Loris Python extension and Csound opcodes." -+# print ("CONFIGURATION DECISION: Building Loris Python extension and Csound opcodes.") - # For Loris, we build only the loris Python extension module and - # the Csound opcodes (modified for Csound 5). - # It is assumed that you have copied all contents of the Loris -@@ -2065,9 +2065,9 @@ else: - # STK opcodes - - if not (commonEnvironment['buildStkOpcodes'] == '1' and stkFound): -- print 'CONFIGURATION DECISION: Not building STK opcodes.' -+ print ('CONFIGURATION DECISION: Not building STK opcodes.') - else: -- print 'CONFIGURATION DECISION: Building STK opcodes.' -+ print ('CONFIGURATION DECISION: Building STK opcodes.') - # For the STK opcodes, the STK distribution include, src, and rawwaves - # directories should be copied thusly: - # csound5/Opcodes/stk/include -@@ -2126,9 +2126,9 @@ else: - # Python opcodes - - if not (pythonFound and commonEnvironment['buildPythonOpcodes'] != '0'): -- print "CONFIGURATION DECISION: Not building Python opcodes." -+ print ("CONFIGURATION DECISION: Not building Python opcodes.") - else: -- print "CONFIGURATION DECISION: Building Python opcodes." -+ print ("CONFIGURATION DECISION: Building Python opcodes.") - pyEnvironment = pluginEnvironment.Clone() - if getPlatform() != 'darwin': - pyEnvironment.Append(CPPPATH = pythonIncludePath) -@@ -2152,9 +2152,9 @@ else: - # Python opcodes - - if not (commonEnvironment['buildLuaOpcodes'] != '0'): -- print "CONFIGURATION DECISION: Not building Lua opcodes." -+ print ("CONFIGURATION DECISION: Not building Lua opcodes.") - else: -- print "CONFIGURATION DECISION: Building Lua opcodes." -+ print ("CONFIGURATION DECISION: Building Lua opcodes.") - luaEnvironment = pluginEnvironment.Clone() - - if getPlatform() == 'linux': -@@ -2269,9 +2269,9 @@ def fluidTarget(env, dirName, baseName, - # Build Csound5gui (FLTK frontend) - - if not (commonEnvironment['buildCsound5GUI'] != '0' and fltk117Found): -- print 'CONFIGURATION DECISION: Not building FLTK CSOUND5GUI frontend.' -+ print ('CONFIGURATION DECISION: Not building FLTK CSOUND5GUI frontend.') - else: -- print 'CONFIGURATION DECISION: Building FLTK GUI CSOUND5GUI frontend.' -+ print ('CONFIGURATION DECISION: Building FLTK GUI CSOUND5GUI frontend.') - csound5GUIEnvironment = csoundProgramEnvironment.Clone() - csound5GUIEnvironment.Append(CPPPATH = ['./interfaces']) - if jackFound: -@@ -2347,9 +2347,9 @@ else: - # Build CsoundAC - - if not ((commonEnvironment['buildCsoundAC'] == '1') and fltkFound and boostFound and fltkFound and eigenFound): -- print 'CONFIGURATION DECISION: Not building CsoundAC extension module for Csound with algorithmic composition.' -+ print ('CONFIGURATION DECISION: Not building CsoundAC extension module for Csound with algorithmic composition.') - else: -- print 'CONFIGURATION DECISION: Building CsoundAC extension module for Csound with algorithmic composition.' -+ print ('CONFIGURATION DECISION: Building CsoundAC extension module for Csound with algorithmic composition.') - acEnvironment = vstEnvironment.Clone() - if getPlatform() == 'linux': - acEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags') -@@ -2414,7 +2414,7 @@ else: - for option in acEnvironment['CPPPATH']: - option = '-I' + option - acEnvironment.Append(SWIGFLAGS = [option]) -- print 'PATH =', commonEnvironment['ENV']['PATH'] -+ print ('PATH =', commonEnvironment['ENV']['PATH']) - csoundAcSources = Split(''' - frontends/CsoundAC/allegro.cpp - frontends/CsoundAC/allegrord.cpp -@@ -2485,7 +2485,7 @@ else: - csoundAcPythonModule = makePythonModule(pythonCsoundACWrapperEnvironment, 'CsoundAC', - csoundAcPythonWrapper) - if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and compilerGNU(): -- Depends(csoundAcPythonModule, pythonImportLibrary) -+ Depends(csoundAcPythonModule, pythonImportLibrary) - pythonModules.append('CsoundAC.py') - Depends(csoundAcPythonModule, pythonWrapper) - Depends(csoundAcPythonModule, csoundac) -@@ -2510,9 +2510,9 @@ else: - # Build CsoundVST - - if not ((commonEnvironment['buildCsoundVST'] == '1') and boostFound and fltkFound): -- print 'CONFIGURATION DECISION: Not building CsoundVST plugin and standalone.' -+ print ('CONFIGURATION DECISION: Not building CsoundVST plugin and standalone.') - else: -- print 'CONFIGURATION DECISION: Building CsoundVST plugin and standalone.' -+ print ('CONFIGURATION DECISION: Building CsoundVST plugin and standalone.') - headers += glob.glob('frontends/CsoundVST/*.h') - headers += glob.glob('frontends/CsoundVST/*.hpp') - vstEnvironment.Prepend(CPPPATH = ['interfaces', 'frontends/CsoundVST']) -@@ -2544,7 +2544,7 @@ else: - vstEnvironment.Append(LIBS = Split('fltk fltk_images fltk_png fltk_jpeg fltk_z')) - else: - vstEnvironment.Append(LIBS = Split('csound64 csnd fltk fltkimages fltkpng fltkjpeg fltkz')) -- print 'PATH =', commonEnvironment['ENV']['PATH'] -+ print ('PATH =', commonEnvironment['ENV']['PATH']) - csoundVstSources = Split(''' - frontends/CsoundVST/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp - frontends/CsoundVST/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.cpp -@@ -2578,9 +2578,9 @@ else: - - # Build csoundapi~ (pd class) - --print commonEnvironment['buildPDClass'], pdhfound -+print (commonEnvironment['buildPDClass'], pdhfound) - if commonEnvironment['buildPDClass'] == '1' and pdhfound: -- print "CONFIGURATION DECISION: Building PD csoundapi~ class" -+ print ("CONFIGURATION DECISION: Building PD csoundapi~ class") - pdClassEnvironment = commonEnvironment.Clone() - pdClassEnvironment.Append(LINKFLAGS = libCsoundLinkFlags) - pdClassEnvironment.Append(LIBS = libCsoundLibs) -@@ -2610,7 +2610,7 @@ if commonEnvironment['buildPDClass'] == - # Build tclcsound - - if commonEnvironment['buildTclcsound'] == '1' and tclhfound: -- print "CONFIGURATION DECISION: Building Tclcsound frontend" -+ print ("CONFIGURATION DECISION: Building Tclcsound frontend") - csTclEnvironment = commonEnvironment.Clone() - csTclEnvironment.Append(LINKFLAGS = libCsoundLinkFlags) - csTclEnvironment.Append(LIBS = libCsoundLibs) -@@ -2662,7 +2662,7 @@ if commonEnvironment['buildTclcsound'] = - executables.append(csTk) - libs.append(Tclcsoundlib) - try: -- os.mkdir('tclcsound', 0755) -+ os.mkdir('tclcsound', 0o755) - except: - pass - # if getPlatform() == 'darwin': -@@ -2674,12 +2674,12 @@ if commonEnvironment['buildTclcsound'] = - # csTclEnvironment.Command('tclcsound/pkgIndex.tcl', 'tclcsound/tclcsound.dll','tclsh84 pkgbuild.tcl') - - else: -- print "CONFIGURATION DECISION: Not building Tclcsound" -+ print ("CONFIGURATION DECISION: Not building Tclcsound") - - # Build Winsound FLTK frontend - - if commonEnvironment['buildWinsound'] == '1' and fltkFound: -- print "CONFIGURATION DECISION: Building Winsound frontend" -+ print ("CONFIGURATION DECISION: Building Winsound frontend") - # should these be installed ? - # headers += glob.glob('frontends/winsound/*.h') - csWinEnvironment = commonEnvironment.Clone() -@@ -2726,10 +2726,10 @@ if commonEnvironment['buildWinsound'] == - Depends(winsound5, csoundLibrary) - executables.append(winsound5) - else: -- print "CONFIGURATION DECISION: Not building Winsound" -+ print ("CONFIGURATION DECISION: Not building Winsound") - - #if (getPlatform() == 'darwin' and commonEnvironment['buildOSXGUI'] == '1'): --# print "CONFIGURATION DECISION: building OSX GUI frontend" -+# print ("CONFIGURATION DECISION: building OSX GUI frontend") - # csOSXGUIEnvironment = commonEnvironment.Clone() - # OSXGUI = csOSXGUIEnvironment.Command( - # '''frontends/OSX/build/Csound 5.app/Contents/MacOS/Csound 5''', -@@ -2737,10 +2737,10 @@ else: - # "cd frontends/OSX; xcodebuild -buildstyle Deployment") - # Depends(OSXGUI, csoundLibrary) - #else: --# print "CONFIGURATION DECISION: Not building OSX GUI frontend" -+# print ("CONFIGURATION DECISION: Not building OSX GUI frontend") - - # build csLADSPA --print "CONFIGURATION DEFAULT: Building csLadspa." -+print ("CONFIGURATION DEFAULT: Building csLadspa.") - csLadspaEnv = commonEnvironment.Clone() - csLadspaEnv.Append(LINKFLAGS = libCsoundLinkFlags) - csLadspaEnv.Append(LIBS=libCsoundLibs) -@@ -2759,9 +2759,9 @@ libs.append(csladspa) - # Build beats (score generator) - - if not (commonEnvironment['buildBeats'] != '0'): -- print 'CONFIGURATION DECISION: Not building beats score frontend.' -+ print ('CONFIGURATION DECISION: Not building beats score frontend.') - else: -- print "CONFIGURATION DECISION: Building beats score frontend" -+ print ("CONFIGURATION DECISION: Building beats score frontend") - csBeatsEnvironment = commonEnvironment.Clone() - csBeatsEnvironment.Append(LINKFLAGS = ['-lm']) - csBeatsEnvironment.Append(YACCFLAGS = ['-d']) -@@ -2777,9 +2777,9 @@ else: - executables.append(bb) - - if not (commonEnvironment['buildcatalog'] != '0'): -- print 'CONFIGURATION DECISION: Not building catalog builder.' -+ print ('CONFIGURATION DECISION: Not building catalog builder.') - else: -- print "CONFIGURATION DECISION: Building catalog builder" -+ print ("CONFIGURATION DECISION: Building catalog builder") - catEnvironment = Environment(ENV = os.environ) - catEnvironment.Append(LINKFLAGS = ['-ldl']) - bb = catEnvironment.Program('mkdb', ['mkdb.c']) -@@ -2787,9 +2787,9 @@ else: - - - if (commonEnvironment['generateTags']=='0') or (getPlatform() != 'darwin' and getPlatform() != 'linux'): -- print "CONFIGURATION DECISION: Not calling TAGS" -+ print ("CONFIGURATION DECISION: Not calling TAGS") - else: -- print "CONFIGURATION DECISION: Calling TAGS" -+ print ("CONFIGURATION DECISION: Calling TAGS") - allSources = string.join(glob.glob('*/*.h*')) - allSources = allSources + ' ' + string.join(glob.glob('*/*.c')) - allSources = allSources + ' ' + string.join(glob.glob('*/*.cpp')) -@@ -2860,7 +2860,7 @@ if commonEnvironment['install'] == '1': - Alias('install', [installExecutables, installOpcodes, installLibs, installHeaders, installPythonModules]) - - if getPlatform() == 'darwin' and commonEnvironment['useFLTK'] == '1': -- print "CONFIGURATION DECISION: Adding resource fork for csound" -+ print ("CONFIGURATION DECISION: Adding resource fork for csound") - addOSXResourceFork(commonEnvironment, 'csound', '') - - ###Code to create pkconfig files diff --git a/csound-strncat-fix.patch b/csound-strncat-fix.patch deleted file mode 100644 index 52651ac..0000000 --- a/csound-strncat-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: OOps/dumpf.c -=================================================================== ---- OOps/dumpf.c.orig -+++ OOps/dumpf.c -@@ -175,19 +175,19 @@ static void nkdump(CSOUND *csound, MYFLT - outbuf[0] = '\0'; - while (--nk) { - sprintf(buf1, "%ld\t", (long) *kp++); -- strncat(outbuf, buf1, 256); -+ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); - } - sprintf(buf1, "%ld\n", (long) *kp); -- strncat(outbuf, buf1, 256); -+ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); - len = strlen(outbuf); - break; - case 8: *outbuf = '\0'; - while (--nk) { - sprintf(buf1, "%6.4f\t", *kp++); -- strncat(outbuf, buf1, 256); -+ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); - } - sprintf(buf1, "%6.4f\n", *kp); -- strncat(outbuf, buf1, 256); -+ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); - len = strlen(outbuf); - break; - default: csound->Die(csound, Str("unknown kdump format")); diff --git a/csound.spec b/csound.spec index 0625758..78646df 100644 --- a/csound.spec +++ b/csound.spec @@ -16,21 +16,51 @@ # -%define support_fltk 0 +%define support_fltk 1 +%define maj 6 +%define min 0 Name: csound +Version: 6.12.2 +Release: 0 +Summary: Computer Sound Synthesis and Composition Program +License: GFDL-1.2 and LGPL-2.1+ and MIT +Group: Productivity/Multimedia/Sound/Utilities +Url: http://www.csounds.com +Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: README.SuSE +# Default to using pulseaudio instead of portaudio +Patch2: csound-6.08-default-pulse.patch +# Do not use SSE2 on non-x86_64 platforms +Patch3: csound-6.08-sse2.patch +# Use xdg-open to open a browser to view the manual +Patch4: csound-6.08-xdg-open.patch +# fixup library dirs to use rpm variables +#Patch5: csound-6.08-fix-library-dirs.patch +Patch6: fluidsynth2.patch +Patch0: csound-scons-on-py3.patch +BuildRequires: gcc-c++ BuildRequires: alsa-devel BuildRequires: bison +BuildRequires: libboost_atomic-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_thread-devel +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: eigen3-devel BuildRequires: fdupes BuildRequires: flex BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ BuildRequires: jack-devel BuildRequires: liblo-devel +#BuildRequires: lua-devel BuildRequires: libsndfile-devel BuildRequires: portaudio-devel -BuildRequires: python-devel -BuildRequires: scons +BuildRequires: python3-devel +#BuildRequires: scons BuildRequires: swig %if %support_fltk BuildRequires: fltk-devel @@ -38,54 +68,96 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: xorg-x11-devel %endif -Version: 5.18.02 -Release: 0 -Summary: Computer Sound Synthesis and Composition Program -License: GFDL-1.2 and LGPL-2.1+ and MIT -Group: Productivity/Multimedia/Sound/Utilities -Url: http://www.csounds.com -Source: Csound%{version}.tar.gz -Source1: README.SUSE -Patch0: csound-scons-on-py3.patch -Patch3: %{name}-strncat-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') + %description Csound is a software synthesis program. It is fully modular and supports an unlimited amount of oscillators and filters. +%package -n libcsnd6_%{maj}_%{min} +Summary: csound6 library +Group: System/Libraries + +%description -n libcsnd6_%{maj}_%{min} +Library for csound use + +%package -n libcsnd64_%{maj}_%{min} +Summary: csound6 library +Group: System/Libraries + +%description -n libcsnd64_%{maj}_%{min} +Library for csound use + +%package -n lib_jcsound6 +Summary: csound6 library +Group: System/Libraries + +%description -n lib_jcsound6 +Library for csound use + +%package plugins +Summary: Plugins +Group: Productivity/Multimedia/Other + +%description plugins +Plugins for csound + +%package python-bindings +Summary: Plugins +Group: Productivity/Multimedia/OtherBUILDROOT/ + +%description python-bindings +Plugins for csound + + %package devel Summary: Development files for Csound, a sound synthesis program Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} -Provides: %{name}-devel-static = %{version} +Requires: libcsnd6_%{maj}_%{min} = %{version} +Requires: libcsnd64_%{maj}_%{min} = %{version} +Requires: lib_jcsound6 = %{version} %description devel Development files for Csound. %prep -%setup -q -n Csound%{version} -%patch0 -p1 -%patch3 +%setup -q +%patch2 -p1 -b .default-pulse +%ifnarch x86_64 +%patch3 -p1 -b .sse2 +%endif +%patch4 -p1 -b .xdg-open +#%%patch5 -p1 +%patch6 -p1 + # remove __DATE__ from source files, causes unnecessary rebuilds -sed -i 's:__DATE__:"":' Engine/musmon.c frontends/CsoundVST/CsoundVstFltk.cpp Top/main.c +sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme cp %{SOURCE1} . -# fix encoding -iconv -f latin1 -t utf8 readme-csound5.txt > README -test -f custom.py || cp custom.py.mkg custom.py %build +# Needed to link libbuchla.so +export CFLAGS="%{optflags} -lm" +export CXXFLAGS="%{optflags} -std=c++11" + +%cmake -DPYTHON_LIBRARY="%{_libdir}/libpython%{python_version}.so" \ + -DPYTHON_INCLUDE_DIR="%{_includedir}/python%{python_version}" \ + -DNEED_PORTTIME:BOOL=OFF \ + -DRPM_LUAVER:STRING=%{luaver} \ %if %{_lib} == "lib64" -args="Word64=1" + -DUSE_LIB64:BOOL=ON %else -args="" + -DUSE_LIB64:BOOL=OFF %endif -scons prefix=%{_prefix} buildRelease=1 $args \ - customCCFLAGS="%{optflags} -fno-strict-aliasing" \ - customCXXFLAGS="%{optflags} -fno-strict-aliasing" +# -DRPM_PYTHON_SITEARCH:STRING=%%{python_sitelib} \ + +make %{_smp_mflags} %install +%cmake_install + %if %{_lib} == "lib64" args="--word64" %else @@ -102,7 +174,7 @@ mv %{buildroot}%{_bindir}/extract %{buildroot}%{_bindir}/csound-extract %files -f %{name}5.lang %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README README.SUSE +%doc AUTHORS COPYING ChangeLog README README.SuSE %{_bindir}/* %{_libdir}/csound/ diff --git a/fluidsynth2.patch b/fluidsynth2.patch new file mode 100644 index 0000000..3225d66 --- /dev/null +++ b/fluidsynth2.patch @@ -0,0 +1,60 @@ +Index: csound-6.12.2/Opcodes/fluidOpcodes/fluidOpcodes.cpp +=================================================================== +--- csound-6.12.2.orig/Opcodes/fluidOpcodes/fluidOpcodes.cpp 2018-11-07 16:05:23.000000000 +0200 ++++ csound-6.12.2/Opcodes/fluidOpcodes/fluidOpcodes.cpp 2019-04-05 15:33:21.652528196 +0200 +@@ -208,6 +208,7 @@ public: + } else if (listPresets) { + fluid_sfont_t *fluidSoundfont = + fluid_synth_get_sfont_by_id(fluidSynth, soundFontId); ++#if FLUIDSYNTH_VERSION_MAJOR < 2 + fluid_preset_t fluidPreset; + fluidSoundfont->iteration_start(fluidSoundfont); + OPARMS oparms; +@@ -218,6 +219,19 @@ public: + soundFontId, fluidPreset.get_banknum(&fluidPreset), + fluidPreset.get_num(&fluidPreset), + fluidPreset.get_name(&fluidPreset)); ++#else ++ fluid_preset_t *fluidPreset; ++ fluid_sfont_iteration_start(fluidSoundfont); ++ OPARMS oparms; ++ csound->GetOParms(csound, &oparms); ++ if (oparms.msglevel & 0x7) ++ while (fluidPreset = fluid_sfont_iteration_next(fluidSoundfont)) ++ { ++ log(csound, "SoundFont: %3d Bank: %3d Preset: %3d %s\n", ++ soundFontId, fluid_preset_get_banknum(fluidPreset), ++ fluid_preset_get_num(fluidPreset), ++ fluid_preset_get_name(fluidPreset)); ++#endif + } + } + return result; +@@ -279,6 +293,7 @@ public: + toa(iFluidSynth, fluidSynth); + fluid_sfont_t *fluidSoundfont = + fluid_synth_get_sfont(fluidSynth, 0); ++#if FLUIDSYNTH_VERSION_MAJOR < 2 + fluid_preset_t fluidPreset; + fluidSoundfont->iteration_start(fluidSoundfont); + OPARMS oparms; +@@ -290,6 +305,19 @@ public: + ss << "Bank: " << fluidPreset.get_banknum(&fluidPreset) << + " Preset: " << fluidPreset.get_num(&fluidPreset) << + " Name: " << fluidPreset.get_name(&fluidPreset); ++#else ++ fluid_preset_t *fluidPreset; ++ fluid_sfont_iteration_start(fluidSoundfont); ++ OPARMS oparms; ++ csound->GetOParms(csound, &oparms); ++ if (oparms.msglevel & 0x7) ++ while (fluidPreset = fluid_sfont_iteration_next(fluidSoundfont)) ++ { ++ std::stringstream ss; ++ ss << "Bank: " << fluid_preset_get_banknum(fluidPreset) << ++ " Preset: " << fluid_preset_get_num(fluidPreset) << ++ " Name: " << fluid_preset_get_name(fluidPreset); ++#endif + programs.push_back(ss.str()); + } + From c12762cbf6ac12668d6851839bb05e189554ef0c2532c30052a7ee8cffa540be Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 6 Apr 2019 11:04:05 +0000 Subject: [PATCH 02/14] Accepting request 691988 from home:plater Pre changes file OBS-URL: https://build.opensuse.org/request/show/691988 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=26 --- csound-6.08-64-bit-plugin-path.patch | 40 -------- csound-6.08-fix-conflicts.patch | 118 ----------------------- csound.spec | 138 +++++++++++++++------------ 3 files changed, 78 insertions(+), 218 deletions(-) delete mode 100644 csound-6.08-64-bit-plugin-path.patch delete mode 100644 csound-6.08-fix-conflicts.patch diff --git a/csound-6.08-64-bit-plugin-path.patch b/csound-6.08-64-bit-plugin-path.patch deleted file mode 100644 index e8db155..0000000 --- a/csound-6.08-64-bit-plugin-path.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2017-02-04 22:30:16.670767865 +0200 -+++ CMakeLists.txt 2017-02-04 22:29:23.216953000 +0200 -@@ -35,11 +35,10 @@ message(STATUS "LIBRARY INSTALL DIR: ${L - - if(USE_DOUBLE) - message(STATUS "Building with 64-bit floats") -- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}") - else() - message(STATUS "Building with 32-bit floats") -- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") - endif() -+set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") - - - execute_process ( ---- installer/misc/mkpackage.py.orig 2017-02-04 20:49:47.206563224 +0200 -+++ installer/misc/mkpackage.py 2017-02-04 20:50:43.818304341 +0200 -@@ -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 2016-11-25 01:42:03.000000000 +0200 -+++ Top/csmodule.c 2017-02-04 20:52:48.869523561 +0200 -@@ -146,9 +146,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.08-fix-conflicts.patch b/csound-6.08-fix-conflicts.patch deleted file mode 100644 index 6860b3f..0000000 --- a/csound-6.08-fix-conflicts.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- 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 2016-11-25 01:42:03.000000000 +0200 -+++ util/CMakeLists.txt 2017-02-04 21:13:26.135024754 +0200 -@@ -23,15 +23,15 @@ 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) - make_utility(lpanal lpc_main.c) - make_utility(lpc_export lpcx_main.c) - 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) - if(LINUX) - target_link_libraries(mixer-bin m) - endif() -@@ -39,9 +39,9 @@ if(BUILD_UTILITIES) - 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) - - - find_library(LIBSNDFILE_LIBRARY sndfile) diff --git a/csound.spec b/csound.spec index 78646df..5287639 100644 --- a/csound.spec +++ b/csound.spec @@ -1,7 +1,7 @@ # # spec file for package csound # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,9 @@ # +%define py3version %(pkg-config python3 --modversion) %define support_fltk 1 +%bcond_with python %define maj 6 %define min 0 @@ -24,29 +26,20 @@ Name: csound Version: 6.12.2 Release: 0 Summary: Computer Sound Synthesis and Composition Program -License: GFDL-1.2 and LGPL-2.1+ and MIT +License: GFDL-1.2-only AND LGPL-2.1-or-later AND MIT Group: Productivity/Multimedia/Sound/Utilities Url: http://www.csounds.com Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: README.SuSE +Source1: README.SUSE # Default to using pulseaudio instead of portaudio -Patch2: csound-6.08-default-pulse.patch +Patch2: csound-6.08-default-pulse.patch # Do not use SSE2 on non-x86_64 platforms -Patch3: csound-6.08-sse2.patch +Patch3: csound-6.08-sse2.patch # Use xdg-open to open a browser to view the manual -Patch4: csound-6.08-xdg-open.patch -# fixup library dirs to use rpm variables -#Patch5: csound-6.08-fix-library-dirs.patch -Patch6: fluidsynth2.patch -Patch0: csound-scons-on-py3.patch -BuildRequires: gcc-c++ +Patch4: csound-6.08-xdg-open.patch +Patch6: fluidsynth2.patch BuildRequires: alsa-devel BuildRequires: bison -BuildRequires: libboost_atomic-devel -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_locale-devel -BuildRequires: libboost_regex-devel -BuildRequires: libboost_thread-devel BuildRequires: cmake BuildRequires: doxygen BuildRequires: eigen3-devel @@ -54,20 +47,29 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: jack-devel +BuildRequires: java-devel-openjdk +BuildRequires: libboost_atomic-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_thread-devel BuildRequires: liblo-devel -#BuildRequires: lua-devel BuildRequires: libsndfile-devel +BuildRequires: lua-devel BuildRequires: portaudio-devel -BuildRequires: python3-devel -#BuildRequires: scons BuildRequires: swig +%if %{with python} +BuildRequires: python3-devel +%endif %if %support_fltk BuildRequires: fltk-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: xorg-x11-devel %endif +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') @@ -76,25 +78,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Csound is a software synthesis program. It is fully modular and supports an unlimited amount of oscillators and filters. -%package -n libcsnd6_%{maj}_%{min} -Summary: csound6 library +%package -n libcsnd6-%{maj}_%{min} +Summary: Csound6 library Group: System/Libraries -%description -n libcsnd6_%{maj}_%{min} +%description -n libcsnd6-%{maj}_%{min} Library for csound use -%package -n libcsnd64_%{maj}_%{min} -Summary: csound6 library +%package -n libcsound64-%{maj}_%{min} +Summary: Csound6 library Group: System/Libraries -%description -n libcsnd64_%{maj}_%{min} +%description -n libcsound64-%{maj}_%{min} Library for csound use -%package -n lib_jcsound6 -Summary: csound6 library +%package java-bindings +Summary: Csound6 library Group: System/Libraries -%description -n lib_jcsound6 +%description java-bindings Library for csound use %package plugins @@ -104,34 +106,27 @@ Group: Productivity/Multimedia/Other %description plugins Plugins for csound -%package python-bindings -Summary: Plugins -Group: Productivity/Multimedia/OtherBUILDROOT/ - -%description python-bindings -Plugins for csound - - %package devel Summary: Development files for Csound, a sound synthesis program Group: Development/Libraries/C and C++ -Requires: libcsnd6_%{maj}_%{min} = %{version} -Requires: libcsnd64_%{maj}_%{min} = %{version} Requires: lib_jcsound6 = %{version} +Requires: libcsnd6-%{maj}_%{min} = %{version} +Requires: libcsound64-%{maj}_%{min} = %{version} %description devel Development files for Csound. +%lang_package + %prep %setup -q %patch2 -p1 -b .default-pulse %ifnarch x86_64 -%patch3 -p1 -b .sse2 +%patch3 -p0 -b .sse2 %endif %patch4 -p1 -b .xdg-open #%%patch5 -p1 %patch6 -p1 - # remove __DATE__ from source files, causes unnecessary rebuilds sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme @@ -142,8 +137,11 @@ cp %{SOURCE1} . export CFLAGS="%{optflags} -lm" export CXXFLAGS="%{optflags} -std=c++11" -%cmake -DPYTHON_LIBRARY="%{_libdir}/libpython%{python_version}.so" \ - -DPYTHON_INCLUDE_DIR="%{_includedir}/python%{python_version}" \ +%cmake \ +%if %{with python} + -DPYTHON_LIBRARY="%{_libdir}/libpython$(pkg-config python3 --modversion)$(python3-config --abiflags).so" \ + -DPYTHON_INCLUDE_DIR="%{_includedir}/python$(pkg-config python3 --modversion)$(python3-config --abiflags)" \ +%endif -DNEED_PORTTIME:BOOL=OFF \ -DRPM_LUAVER:STRING=%{luaver} \ %if %{_lib} == "lib64" @@ -151,36 +149,56 @@ export CXXFLAGS="%{optflags} -std=c++11" %else -DUSE_LIB64:BOOL=OFF %endif -# -DRPM_PYTHON_SITEARCH:STRING=%%{python_sitelib} \ make %{_smp_mflags} %install %cmake_install +#python bindings are wip +rm -rf %{buildroot}root -%if %{_lib} == "lib64" -args="--word64" -%else -args="" -%endif -./install.py --prefix=%{_prefix} --instdir=%{buildroot} $args -rm -f %{buildroot}%{_prefix}/csound5-*.md5sums %{buildroot}%{_bindir}/uninstall-csound5 -rm -rf %{buildroot}%{_datadir}/doc/csound -# rename conflicting binary names -mv %{buildroot}%{_bindir}/sndinfo %{buildroot}%{_bindir}/csndinfo -mv %{buildroot}%{_bindir}/extract %{buildroot}%{_bindir}/csound-extract %fdupes -s %{buildroot} -%find_lang %{name}5 +%find_lang %{name}%{maj} -%files -f %{name}5.lang -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README README.SuSE +%post -n libcsnd6-%{maj}_%{min} -p /sbin/ldconfig +%postun -n libcsnd6-%{maj}_%{min} -p /sbin/ldconfig + +%post -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig +%postun -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig + +%post java-bindings -p /sbin/ldconfig +%postun java-bindings -p /sbin/ldconfig + +%files +%doc AUTHORS README.md README.SUSE Release_Notes +%license COPYING %{_bindir}/* + +%files -n libcsnd6-%{maj}_%{min} +%{_libdir}/libcsnd6.so.%{maj}.%{min} + +%files -n libcsound64-%{maj}_%{min} +%{_libdir}/libcsound64.so.%{maj}.%{min} + +%files java-bindings +%{_libdir}/lib_jcsound6.so +%{_libdir}/csnd6.jar + +%files plugins %{_libdir}/csound/ %files devel -%defattr(-,root,root) %{_includedir}/csound/ -%{_libdir}/libcsound.a +%{_libdir}/libcs*.so +%{_datadir}/cmake/Csound/ + +%files lang -f %{name}%{maj}.lang +%defattr(-,root,root) +%if 1 == 0 +-- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/_csnd6.so +-- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/csnd6.py +-- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/ctcsound.py + +%endif %changelog From 5c424e6ce580d11a51e013b7281e89e49874270844fca68b6a4e1fde9ad0c714 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 6 Apr 2019 11:18:04 +0000 Subject: [PATCH 03/14] Accepting request 691993 from home:plater - Update to version 6.12.2 and fix Factory build. - Remove obsolete patches: csound-scons-on-py3.patch and csound-strncat-fix.patch - Added fluidsynth2.patch from Arch linux - Added csound-6.08-default-pulse.patch, csound-6.08-xdg-open.patch from Fedora. - Now builds with cmake - For upstream changes see: /usr/share/doc/packages/csound/Release_Notes/ OBS-URL: https://build.opensuse.org/request/show/691993 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=27 --- csound-6.08-sse2.patch | 33 --------------------------------- csound.changes | 13 +++++++++++++ csound.spec | 5 ----- 3 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 csound-6.08-sse2.patch diff --git a/csound-6.08-sse2.patch b/csound-6.08-sse2.patch deleted file mode 100644 index eef2f8f..0000000 --- a/csound-6.08-sse2.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- cmake/CompilerOptimizations.cmake.orig 2017-02-04 21:33:49.238875410 +0200 -+++ cmake/CompilerOptimizations.cmake 2017-02-04 21:38:33.681564067 +0200 -@@ -19,30 +19,6 @@ if (HAS_CXX_FAST_MATH AND NOT MINGW) - 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 AND NOT IOS) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") --endif() --if (HAS_CXX_SSE2 AND NOT IOS) -- 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.changes b/csound.changes index 5507973..d78a2c9 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Apr 6 11:05:19 UTC 2019 - plater + +- Update to version 6.12.2 and fix Factory build. +- Remove obsolete patches: + csound-scons-on-py3.patch and csound-strncat-fix.patch +- Added fluidsynth2.patch from Arch linux +- Added csound-6.08-default-pulse.patch, csound-6.08-xdg-open.patch + from Fedora. +- Now builds with cmake +- For upstream changes see: + /usr/share/doc/packages/csound/Release_Notes/ + ------------------------------------------------------------------- Thu Nov 23 14:49:33 UTC 2017 - dimstar@opensuse.org diff --git a/csound.spec b/csound.spec index 5287639..58a6738 100644 --- a/csound.spec +++ b/csound.spec @@ -33,8 +33,6 @@ Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{ Source1: README.SUSE # Default to using pulseaudio instead of portaudio Patch2: csound-6.08-default-pulse.patch -# Do not use SSE2 on non-x86_64 platforms -Patch3: csound-6.08-sse2.patch # Use xdg-open to open a browser to view the manual Patch4: csound-6.08-xdg-open.patch Patch6: fluidsynth2.patch @@ -121,9 +119,6 @@ Development files for Csound. %prep %setup -q %patch2 -p1 -b .default-pulse -%ifnarch x86_64 -%patch3 -p0 -b .sse2 -%endif %patch4 -p1 -b .xdg-open #%%patch5 -p1 %patch6 -p1 From d8064f92cbf871b6e9af0a455b72795cb94b210c9a3bdfe5f54ddf7f1d8d3dae Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 7 Apr 2019 08:00:32 +0000 Subject: [PATCH 04/14] Accepting request 692126 from home:plater Fix < Factory build OBS-URL: https://build.opensuse.org/request/show/692126 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=28 --- csound.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/csound.spec b/csound.spec index 58a6738..584007c 100644 --- a/csound.spec +++ b/csound.spec @@ -19,6 +19,13 @@ %define py3version %(pkg-config python3 --modversion) %define support_fltk 1 %bcond_with python + +%if 0%{?suse_version} > 1500 +%bcond_without java +%else +%bcond_with java +%endif + %define maj 6 %define min 0 @@ -47,7 +54,9 @@ BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ BuildRequires: gcc-c++ BuildRequires: jack-devel +%if %{with java} BuildRequires: java-devel-openjdk +%endif BuildRequires: libboost_atomic-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_locale-devel @@ -90,12 +99,14 @@ Group: System/Libraries %description -n libcsound64-%{maj}_%{min} Library for csound use +%if %{with java} %package java-bindings Summary: Csound6 library Group: System/Libraries %description java-bindings -Library for csound use +Java bindings for csound use +%endif %package plugins Summary: Plugins @@ -105,14 +116,14 @@ Group: Productivity/Multimedia/Other Plugins for csound %package devel -Summary: Development files for Csound, a sound synthesis program +Summary: Development files for Csound Group: Development/Libraries/C and C++ Requires: lib_jcsound6 = %{version} Requires: libcsnd6-%{maj}_%{min} = %{version} Requires: libcsound64-%{maj}_%{min} = %{version} %description devel -Development files for Csound. +Development files for Csound, a sound synthesis program. %lang_package @@ -161,8 +172,10 @@ rm -rf %{buildroot}root %post -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig %postun -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig +%if %{with java} %post java-bindings -p /sbin/ldconfig %postun java-bindings -p /sbin/ldconfig +%endif %files %doc AUTHORS README.md README.SUSE Release_Notes @@ -175,9 +188,11 @@ rm -rf %{buildroot}root %files -n libcsound64-%{maj}_%{min} %{_libdir}/libcsound64.so.%{maj}.%{min} +%if %{with java} %files java-bindings %{_libdir}/lib_jcsound6.so %{_libdir}/csnd6.jar +%endif %files plugins %{_libdir}/csound/ @@ -189,6 +204,8 @@ rm -rf %{buildroot}root %files lang -f %{name}%{maj}.lang %defattr(-,root,root) + +# TODO: %if 1 == 0 -- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/_csnd6.so -- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/csnd6.py From 834dc5def55996a99f02e56c2002b98572b1ff0306c4728f5de4567e64845b9d Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 8 Apr 2019 12:54:21 +0000 Subject: [PATCH 05/14] Accepting request 692290 from home:plater delete extra requires OBS-URL: https://build.opensuse.org/request/show/692290 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=29 --- csound.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/csound.spec b/csound.spec index 584007c..4da0dac 100644 --- a/csound.spec +++ b/csound.spec @@ -52,7 +52,6 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ -BuildRequires: gcc-c++ BuildRequires: jack-devel %if %{with java} BuildRequires: java-devel-openjdk From cbb443df86b21c555954a6160ba1899ad834a065e986a865127e648299eff329 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 5 Jun 2019 14:09:42 +0000 Subject: [PATCH 06/14] Accepting request 707858 from home:plater - Remove undistributable scansyn files from source. - Relicenced to GPL-2.0-or-later AND BSD-2-Clause, there is one GPL-2.0 or later source file which relicenses the LGPL sources and one BSD 2 clause file OBS-URL: https://build.opensuse.org/request/show/707858 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=30 --- csound.changes | 8 ++++++++ csound.spec | 17 ++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/csound.changes b/csound.changes index d78a2c9..e7d1000 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 5 13:57:01 UTC 2019 - Dave Plater + +- Remove undistributable scansyn files from source. +- Relicenced to GPL-2.0-or-later AND BSD-2-Clause, there is one + GPL-2.0 or later source file which relicenses the LGPL sources + and one BSD 2 clause file + ------------------------------------------------------------------- Sat Apr 6 11:05:19 UTC 2019 - plater diff --git a/csound.spec b/csound.spec index 4da0dac..1c6fa84 100644 --- a/csound.spec +++ b/csound.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -33,7 +33,7 @@ Name: csound Version: 6.12.2 Release: 0 Summary: Computer Sound Synthesis and Composition Program -License: GFDL-1.2-only AND LGPL-2.1-or-later AND MIT +License: GPL-2.0-or-later AND BSD-2-Clause Group: Productivity/Multimedia/Sound/Utilities Url: http://www.csounds.com Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -136,6 +136,8 @@ Development files for Csound, a sound synthesis program. sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme cp %{SOURCE1} . +#These source files are undistributable +rm -f Opcodes/scansyn* %build # Needed to link libbuchla.so @@ -143,6 +145,7 @@ export CFLAGS="%{optflags} -lm" export CXXFLAGS="%{optflags} -std=c++11" %cmake \ + -DBUILD_SCANSYN_OPCODES=OFF \ %if %{with python} -DPYTHON_LIBRARY="%{_libdir}/libpython$(pkg-config python3 --modversion)$(python3-config --abiflags).so" \ -DPYTHON_INCLUDE_DIR="%{_includedir}/python$(pkg-config python3 --modversion)$(python3-config --abiflags)" \ @@ -178,7 +181,7 @@ rm -rf %{buildroot}root %files %doc AUTHORS README.md README.SUSE Release_Notes -%license COPYING +%license COPYING OOps/LICENCE.random %{_bindir}/* %files -n libcsnd6-%{maj}_%{min} @@ -204,12 +207,4 @@ rm -rf %{buildroot}root %files lang -f %{name}%{maj}.lang %defattr(-,root,root) -# TODO: -%if 1 == 0 --- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/_csnd6.so --- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/csnd6.py --- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/ctcsound.py - -%endif - %changelog From 268fb545b19595dbe9e523572ddd13991fe0cfe253de5c6ea4382a241808ddcd Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 5 Jun 2019 14:26:03 +0000 Subject: [PATCH 07/14] Accepting request 707861 from home:plater - Remove undistributable scansyn files from source. - Relicenced to GPL-2.0-or-later AND BSD-2-Clause, there is one GPL-2.0 or later source file which relicenses the LGPL sources and one BSD 2 clause file. - Added COPYING_gpl2+.txt to licenses. - Update to version 6.12.2 and fix Factory build. - Remove obsolete patches: csound-scons-on-py3.patch and csound-strncat-fix.patch - Added fluidsynth2.patch from Arch linux - Added csound-6.08-default-pulse.patch, csound-6.08-xdg-open.patch from Fedora. OBS-URL: https://build.opensuse.org/request/show/707861 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=31 --- COPYING_gpl2+.txt | 133 ++++++++++++++++++++++++++++++++++++++++++++++ csound.changes | 3 +- csound.spec | 5 +- 3 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 COPYING_gpl2+.txt diff --git a/COPYING_gpl2+.txt b/COPYING_gpl2+.txt new file mode 100644 index 0000000..d208442 --- /dev/null +++ b/COPYING_gpl2+.txt @@ -0,0 +1,133 @@ +GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +END OF TERMS AND CONDITIONS +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the program's name and an idea of what it does. +Copyright (C) yyyy name of author + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details +type `show w'. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' +for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright +interest in the program `Gnomovision' +(which makes passes at compilers) written +by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. \ No newline at end of file diff --git a/csound.changes b/csound.changes index e7d1000..a199684 100644 --- a/csound.changes +++ b/csound.changes @@ -4,7 +4,8 @@ Wed Jun 5 13:57:01 UTC 2019 - Dave Plater - Remove undistributable scansyn files from source. - Relicenced to GPL-2.0-or-later AND BSD-2-Clause, there is one GPL-2.0 or later source file which relicenses the LGPL sources - and one BSD 2 clause file + and one BSD 2 clause file. +- Added COPYING_gpl2+.txt to licenses. ------------------------------------------------------------------- Sat Apr 6 11:05:19 UTC 2019 - plater diff --git a/csound.spec b/csound.spec index 1c6fa84..a6f62cf 100644 --- a/csound.spec +++ b/csound.spec @@ -38,6 +38,7 @@ Group: Productivity/Multimedia/Sound/Utilities Url: http://www.csounds.com Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: README.SUSE +Source2: COPYING_gpl2+.txt # Default to using pulseaudio instead of portaudio Patch2: csound-6.08-default-pulse.patch # Use xdg-open to open a browser to view the manual @@ -135,7 +136,7 @@ Development files for Csound, a sound synthesis program. # remove __DATE__ from source files, causes unnecessary rebuilds sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme -cp %{SOURCE1} . +cp %{SOURCE1} %{SOURCE2} . #These source files are undistributable rm -f Opcodes/scansyn* @@ -181,7 +182,7 @@ rm -rf %{buildroot}root %files %doc AUTHORS README.md README.SUSE Release_Notes -%license COPYING OOps/LICENCE.random +%license COPYING OOps/LICENCE.random COPYING_gpl2+.txt %{_bindir}/* %files -n libcsnd6-%{maj}_%{min} From 785341d888a869989ae5d017b3ddc4fe01b3a43d879dfd878a88cc2b602cf430 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 6 Jun 2019 09:19:41 +0000 Subject: [PATCH 08/14] Accepting request 708050 from home:plater Added pre_checkin.sh to remove undistributable scansyn files from the source tarball. OBS-URL: https://build.opensuse.org/request/show/708050 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=32 --- csound-6.12.2-distibutable.tar.xz | 3 +++ csound-6.12.2.tar.gz | 3 --- csound.changes | 6 +++--- csound.spec | 14 +++++++++----- pre_checkin.sh | 22 ++++++++++++++++++++++ 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 csound-6.12.2-distibutable.tar.xz delete mode 100644 csound-6.12.2.tar.gz create mode 100644 pre_checkin.sh diff --git a/csound-6.12.2-distibutable.tar.xz b/csound-6.12.2-distibutable.tar.xz new file mode 100644 index 0000000..a71a480 --- /dev/null +++ b/csound-6.12.2-distibutable.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8ec07b486decbd3edcc442554b73befe7972c81e1723047f5c02a2ff9215d30 +size 20890172 diff --git a/csound-6.12.2.tar.gz b/csound-6.12.2.tar.gz deleted file mode 100644 index 1407081..0000000 --- a/csound-6.12.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39f4872b896eb1cbbf596fcacc0f2122fd3e5ebbb5cec14a81b4207d6b8630ff -size 26297850 diff --git a/csound.changes b/csound.changes index a199684..0a3dc19 100644 --- a/csound.changes +++ b/csound.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- Wed Jun 5 13:57:01 UTC 2019 - Dave Plater -- Remove undistributable scansyn files from source. -- Relicenced to GPL-2.0-or-later AND BSD-2-Clause, there is one +- Added pre_checkin.sh to remove undistributable scansyn files from + the source tarball. +- Relicenced to GPL-2.0-or-later AND BSD-3-Clause AND PostgreSQL GPL-2.0 or later source file which relicenses the LGPL sources - and one BSD 2 clause file. - Added COPYING_gpl2+.txt to licenses. ------------------------------------------------------------------- diff --git a/csound.spec b/csound.spec index a6f62cf..69b81ba 100644 --- a/csound.spec +++ b/csound.spec @@ -33,12 +33,16 @@ Name: csound Version: 6.12.2 Release: 0 Summary: Computer Sound Synthesis and Composition Program -License: GPL-2.0-or-later AND BSD-2-Clause +License: GPL-2.0-or-later AND BSD-3-Clause AND PostgreSQL Group: Productivity/Multimedia/Sound/Utilities Url: http://www.csounds.com -Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +#Source: https://github.com/%%{name}/%%{name}/archive/%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz +Source0: %{name}-%{version}-distibutable.tar.xz Source1: README.SUSE Source2: COPYING_gpl2+.txt +#Update and remove undistributable files from the sources and repack with this script +#Usage = ./pre_checkin.sh +Source3: pre_checkin.sh # Default to using pulseaudio instead of portaudio Patch2: csound-6.08-default-pulse.patch # Use xdg-open to open a browser to view the manual @@ -80,7 +84,6 @@ Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') - %description Csound is a software synthesis program. It is fully modular and supports an unlimited amount of oscillators and filters. @@ -138,7 +141,8 @@ sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme cp %{SOURCE1} %{SOURCE2} . #These source files are undistributable -rm -f Opcodes/scansyn* +#rm -f Opcodes/scansyn* +head -n 28 util/SDIF/sdif.c > COPYING.PostgreSQL %build # Needed to link libbuchla.so @@ -182,7 +186,7 @@ rm -rf %{buildroot}root %files %doc AUTHORS README.md README.SUSE Release_Notes -%license COPYING OOps/LICENCE.random COPYING_gpl2+.txt +%license COPYING OOps/LICENCE.random COPYING_gpl2+.txt COPYING.PostgreSQL %{_bindir}/* %files -n libcsnd6-%{maj}_%{min} diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..f59d4d0 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,22 @@ +#! /bin/bash + +vers=$(cat csound.spec|grep "Version: "|cut -b 17-23) +rm -f *.tar.* +wget https://github.com/csound/csound/archive/${vers}.tar.gz || exit 1 +echo "\n\nUnpacking tarball\n" +tar -xf ${vers}.tar.gz +echo "Removing undistibutable files\n" +rm -f csound-${vers}/Opcodes/scansyn* +echo "Creating distributable tarball\n" +tar -acf csound-${vers}-distibutable.tar.xz csound-${vers} +echo "Cleaning up\n" +rm -rf csound-${vers} ${vers}.tar.gz +if ! test -e ${vers}.tar.gz; +then +echo "success" +osc ar +exit 0 +else +echo "error" +exit 1 +fi From 678e821f211effe4fd1d3cce05f5b655207433d2cddbe8731a7ed2fc3e18c1b6 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 6 Jun 2019 09:26:16 +0000 Subject: [PATCH 09/14] Accepting request 708084 from home:plater sh pre_checkin OBS-URL: https://build.opensuse.org/request/show/708084 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=33 --- csound.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csound.spec b/csound.spec index 69b81ba..ced5c25 100644 --- a/csound.spec +++ b/csound.spec @@ -41,7 +41,7 @@ Source0: %{name}-%{version}-distibutable.tar.xz Source1: README.SUSE Source2: COPYING_gpl2+.txt #Update and remove undistributable files from the sources and repack with this script -#Usage = ./pre_checkin.sh +#Usage = sh pre_checkin.sh Source3: pre_checkin.sh # Default to using pulseaudio instead of portaudio Patch2: csound-6.08-default-pulse.patch From b7487367f5589859f07e5c0d592abb27303740ec33021ad84d4ef9d71cfc75ee Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 11 Jun 2019 07:39:25 +0000 Subject: [PATCH 10/14] Accepting request 708989 from home:jengelh:branches:multimedia:apps - Update summaries. OBS-URL: https://build.opensuse.org/request/show/708989 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=34 --- csound.changes | 5 +++++ csound.spec | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/csound.changes b/csound.changes index 0a3dc19..cb125a4 100644 --- a/csound.changes +++ b/csound.changes @@ -7,6 +7,11 @@ Wed Jun 5 13:57:01 UTC 2019 - Dave Plater GPL-2.0 or later source file which relicenses the LGPL sources - Added COPYING_gpl2+.txt to licenses. +------------------------------------------------------------------- +Tue Apr 9 07:29:47 UTC 2019 - Jan Engelhardt + +- Update summaries. + ------------------------------------------------------------------- Sat Apr 6 11:05:19 UTC 2019 - plater diff --git a/csound.spec b/csound.spec index ced5c25..7ce9a6d 100644 --- a/csound.spec +++ b/csound.spec @@ -85,34 +85,38 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') %description -Csound is a software synthesis program. It is fully modular and +Csound is a software synthesis program. It is modular and supports an unlimited amount of oscillators and filters. %package -n libcsnd6-%{maj}_%{min} -Summary: Csound6 library +Summary: Computer sound synthesis and composition library Group: System/Libraries %description -n libcsnd6-%{maj}_%{min} -Library for csound use +Library for csound use. +Csound is a software synthesis program supporting oscillators and +filters. %package -n libcsound64-%{maj}_%{min} -Summary: Csound6 library +Summary: Computer sound synthesis and composition library Group: System/Libraries %description -n libcsound64-%{maj}_%{min} Library for csound use +Csound is a software synthesis program supporting oscillators and +filters. -%if %{with java} %package java-bindings -Summary: Csound6 library +Summary: Java bindings for the Csound sound synthesis and composition library Group: System/Libraries %description java-bindings -Java bindings for csound use -%endif +Java bindings for csound use. +Csound is a software synthesis program supporting oscillators and +filters. %package plugins -Summary: Plugins +Summary: Plugins for csound Group: Productivity/Multimedia/Other %description plugins @@ -179,10 +183,8 @@ rm -rf %{buildroot}root %post -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig %postun -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig -%if %{with java} %post java-bindings -p /sbin/ldconfig %postun java-bindings -p /sbin/ldconfig -%endif %files %doc AUTHORS README.md README.SUSE Release_Notes From 9966ad16f8f1643e603377f88f4fe1d6353f741729b31ee4a6dc0607f167e4d3 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 26 Jun 2019 08:09:52 +0000 Subject: [PATCH 11/14] Accepting request 712080 from home:plater Renamed sndifo to csndinfo again to fix conflict with snd package using csound-rename-sndinfo.patch this time. OBS-URL: https://build.opensuse.org/request/show/712080 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=35 --- csound-rename-sndinfo.patch | 129 ++++++++++++++++++++++++++++++++++++ csound.changes | 6 ++ csound.spec | 6 +- 3 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 csound-rename-sndinfo.patch diff --git a/csound-rename-sndinfo.patch b/csound-rename-sndinfo.patch new file mode 100644 index 0000000..6d6d6e0 --- /dev/null +++ b/csound-rename-sndinfo.patch @@ -0,0 +1,129 @@ +Index: csound-6.12.2/util/CMakeLists.txt +=================================================================== +--- csound-6.12.2.orig/util/CMakeLists.txt 2018-11-07 16:05:23.000000000 +0200 ++++ csound-6.12.2/util/CMakeLists.txt 2019-06-26 09:45:26.891391042 +0200 +@@ -1,62 +1,62 @@ +-# UTILITY PLUGIN AND PROGRAMS +- +-set(stdutil_SRCS +- atsa.c cvanal.c dnoise.c envext.c +- het_export.c het_import.c hetro.c lpanal.c +- lpc_export.c lpc_import.c mixer.c pvanal.c +- pv_export.c pv_import.c pvlook.c scale.c +- sndinfo.c srconv.c std_util.c xtrct.c +- SDIF/sdif.c) +- +-if(MSVC) +- make_plugin(stdutil "${stdutil_SRCS}" ) +- target_link_libraries(stdutil ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS}) +-elseif(WIN32) +- make_plugin(stdutil "${stdutil_SRCS}" m +- ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS}) +-else() +- make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY}) +-endif() +- +-add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY}) +- +-if(BUILD_UTILITIES) +- make_utility(atsa atsa_main.c) +- 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(het_export hetx_main.c) +- make_utility(het_import heti_main.c) +- make_utility(hetro het_main.c) +- make_utility(lpanal lpc_main.c) +- make_utility(lpc_export lpcx_main.c) +- make_utility(lpc_import lpci_main.c) +- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) +- if(LINUX) +- target_link_libraries(mixer-bin m) +- endif() +- 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) +- +- +- #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1) +- find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0) +- +- if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY) +- make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}") +- if(MSVC) +- target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS}) +- endif() +- else() +- message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).") +- endif() +- +-endif() +-add_subdirectory(SDIF) ++# UTILITY PLUGIN AND PROGRAMS ++ ++set(stdutil_SRCS ++ atsa.c cvanal.c dnoise.c envext.c ++ het_export.c het_import.c hetro.c lpanal.c ++ lpc_export.c lpc_import.c mixer.c pvanal.c ++ pv_export.c pv_import.c pvlook.c scale.c ++ sndinfo.c srconv.c std_util.c xtrct.c ++ SDIF/sdif.c) ++ ++if(MSVC) ++ make_plugin(stdutil "${stdutil_SRCS}" ) ++ target_link_libraries(stdutil ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS}) ++elseif(WIN32) ++ make_plugin(stdutil "${stdutil_SRCS}" m ++ ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS}) ++else() ++ make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY}) ++endif() ++ ++add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY}) ++ ++if(BUILD_UTILITIES) ++ make_utility(atsa atsa_main.c) ++ 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(het_export hetx_main.c) ++ make_utility(het_import heti_main.c) ++ make_utility(hetro het_main.c) ++ make_utility(lpanal lpc_main.c) ++ make_utility(lpc_export lpcx_main.c) ++ make_utility(lpc_import lpci_main.c) ++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) ++ if(LINUX) ++ target_link_libraries(mixer-bin m) ++ endif() ++ 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(csndinfo sndinfo_main.c) ++ make_utility(srconv srconv_main.c) ++ ++ ++ #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1) ++ find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0) ++ ++ if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY) ++ make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}") ++ if(MSVC) ++ target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS}) ++ endif() ++ else() ++ message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).") ++ endif() ++ ++endif() ++add_subdirectory(SDIF) diff --git a/csound.changes b/csound.changes index cb125a4..1d62221 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 26 08:00:12 UTC 2019 - Dave Plater + +- Renamed sndifo to csndinfo again to fix conflict with snd package + using csound-rename-sndinfo.patch this time. + ------------------------------------------------------------------- Wed Jun 5 13:57:01 UTC 2019 - Dave Plater diff --git a/csound.spec b/csound.spec index 7ce9a6d..c04355c 100644 --- a/csound.spec +++ b/csound.spec @@ -48,6 +48,7 @@ Patch2: csound-6.08-default-pulse.patch # Use xdg-open to open a browser to view the manual Patch4: csound-6.08-xdg-open.patch Patch6: fluidsynth2.patch +Patch7: csound-rename-sndinfo.patch BuildRequires: alsa-devel BuildRequires: bison BuildRequires: cmake @@ -136,10 +137,7 @@ Development files for Csound, a sound synthesis program. %prep %setup -q -%patch2 -p1 -b .default-pulse -%patch4 -p1 -b .xdg-open -#%%patch5 -p1 -%patch6 -p1 +%autopatch -p1 # remove __DATE__ from source files, causes unnecessary rebuilds sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme From 8f625cc4a8f52750947d958cbcb89356c688327e169f7ad4d8404ef77346f301 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 1 Jul 2019 12:23:09 +0000 Subject: [PATCH 12/14] Accepting request 712846 from home:plater conditionally require lib_jcsound6 in the devel package OBS-URL: https://build.opensuse.org/request/show/712846 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=36 --- csound.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/csound.spec b/csound.spec index c04355c..0808627 100644 --- a/csound.spec +++ b/csound.spec @@ -126,7 +126,9 @@ Plugins for csound %package devel Summary: Development files for Csound Group: Development/Libraries/C and C++ +%if %{with java} Requires: lib_jcsound6 = %{version} +%endif Requires: libcsnd6-%{maj}_%{min} = %{version} Requires: libcsound64-%{maj}_%{min} = %{version} From bf5f2886e5b5e3f39f38e116cadc6f149f2dcd29124fcd5916012ab53426619a Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 1 Jul 2019 13:09:39 +0000 Subject: [PATCH 13/14] Accepting request 712855 from home:plater Require java-bindings instead of lib_jcsound6 in the devel package OBS-URL: https://build.opensuse.org/request/show/712855 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=37 --- csound.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csound.spec b/csound.spec index 0808627..f714434 100644 --- a/csound.spec +++ b/csound.spec @@ -127,7 +127,7 @@ Plugins for csound Summary: Development files for Csound Group: Development/Libraries/C and C++ %if %{with java} -Requires: lib_jcsound6 = %{version} +Requires: java-bindings = %{version} %endif Requires: libcsnd6-%{maj}_%{min} = %{version} Requires: libcsound64-%{maj}_%{min} = %{version} From af17401f620a620538adb951f3c60b98999dbe6ce7fbabfe761e1afc02034317 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 2 Jul 2019 07:34:32 +0000 Subject: [PATCH 14/14] Accepting request 712993 from home:plater fix requires in devel package OBS-URL: https://build.opensuse.org/request/show/712993 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=38 --- csound.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csound.spec b/csound.spec index f714434..93f7539 100644 --- a/csound.spec +++ b/csound.spec @@ -127,7 +127,7 @@ Plugins for csound Summary: Development files for Csound Group: Development/Libraries/C and C++ %if %{with java} -Requires: java-bindings = %{version} +Requires: %{name}-java-bindings = %{version} %endif Requires: libcsnd6-%{maj}_%{min} = %{version} Requires: libcsound64-%{maj}_%{min} = %{version}