[gentoo-commits] gentoo-x86 commit in media-sound/csound/files: csound-5.16.6-tests.patch csound-5.16.6-install.patch csound-5.16.6-scons.patch

[Tim Harder (radhermit)]

radhermit    12/02/27 05:37:48

  Added:                csound-5.16.6-tests.patch
                        csound-5.16.6-install.patch
                        csound-5.16.6-scons.patch
  Log:
  Initial import. Ebuild by me.
  
  (Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/csound/files/csound-5.16.6-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-tests.patch?rev=1.1&content-type=text/plain

Index: csound-5.16.6-tests.patch
===================================================================
--- Csound5.16.6/tests/test.py.orig
+++ Csound5.16.6/tests/test.py
@@ -6,9 +6,6 @@
 import os
 import sys
 
-from testUI import TestApplication
-from Tkinter import *
-
 parserType = "--new-parser"
 showUIatClose = False
 csoundExecutable = ""
@@ -104,8 +101,6 @@
    ]
 
 
-    output = ""
-    tempfile = "/tmp/csound_test_output.txt"
     counter = 1
 
     retVals = []
@@ -124,7 +119,7 @@
             retVal = os.system(command)
         else:
             executable = (csoundExecutable == "") and "../csound" or csoundExecutable
-            command = "%s %s %s %s &> %s"%(executable, parserType, runArgs, filename, tempfile)
+            command = "%s %s %s %s"%(executable, parserType, runArgs, filename)
             retVal = os.system(command)
 
         print "Test %i: %s (%s)\nReturn Code: %i"%(counter, desc, filename, retVal)
@@ -136,24 +131,6 @@
             testFail += 1
             print "Result: FAIL\n"
         
-        output += "%s\n"%("=" * 80)
-        output += "Test %i: %s (%s)\nReturn Code: %i\n"%(counter, desc, filename, retVal)
-        output += "%s\n\n"%("=" * 80)
-
-        f = open(tempfile, "r")
-
-        csOutput = ""
-
-        for line in f:
-            csOutput += line
-
-        output += csOutput
-
-        f.close()
-
-        retVals.append(t + [retVal, csOutput])
-
-        output += "\n\n"
         counter += 1
 
 #    print output
@@ -162,12 +139,7 @@
     print "Tests Passed: %i\nTests Failed: %i\n"%(testPass, testFail)
 
 
-    f = open("results.txt", "w")
-    f.write(output)
-    f.flush()
-    f.close()
-
-    return retVals
+    return testFail
 
 if __name__ == "__main__":
     if(len(sys.argv) > 1):
@@ -176,6 +148,8 @@
                 showHelp()
                 sys.exit(0)
             elif arg == "--show-ui":
+                from testUI import TestApplication
+                from Tkinter import *
                 showUIatClose = True
             elif arg == "--old-parser":
                 parserType = "--old-parser"
@@ -185,6 +159,8 @@
             elif arg.startswith("--opcodedir64="):
                 os.environ['OPCODEDIR64'] = arg[14:]
                 print os.environ['OPCODEDIR64'] 
-    results = runTest()
-    if (showUIatClose):
-        showUI(results)
+    failures = runTest()
+    if failures > 0:
+        sys.exit(1)
+    else:
+        sys.exit(0)



1.1                  media-sound/csound/files/csound-5.16.6-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-install.patch?rev=1.1&content-type=text/plain

Index: csound-5.16.6-install.patch
===================================================================
--- Csound5.16.6/install.py
+++ Csound5.16.6/install.py
@@ -29,8 +29,6 @@
 
 exeFiles2 = ['brkpt', 'linseg', 'tabdes']
 
-docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound5.txt']
-
 # -----------------------------------------------------------------------------
 
 print 'Csound5 Linux installer by Istvan Varga'
@@ -115,6 +113,8 @@
 javaDir     = concatPath([libDir, '/csound/java'])
 # LISP interface
 lispDir     = concatPath([libDir, '/csound/lisp'])
+# luaCsnd.so
+luaDir     = concatPath([libDir, '/csound/lua'])
 # STK raw wave files
 rawWaveDir  = concatPath([prefix, '/share/csound/rawwaves'])
 
@@ -214,37 +214,12 @@
 if findFiles('.', 'libcsound64\\.so\\..+').__len__() > 0:
     useDouble = 1
 
-# check for an already existing installation
-
-makeDir(concatPath([binDir]))
-installedBinaries = findFiles(concatPath([instDir, binDir]), '.+')
-if ('csound' in installedBinaries) or ('csound64' in installedBinaries):
-    if 'uninstall-csound5' in installedBinaries:
-        print ' *** WARNING: found an already existing installation of Csound'
-        tmp = ''
-        while (tmp != 'yes\n') and (tmp != 'no\n'):
-            sys.__stderr__.write(
-                ' *** Uninstall it ? Type \'yes\', or \'no\' to quit: ')
-            tmp = sys.__stdin__.readline()
-        if tmp != 'yes\n':
-            print ' *** Csound installation has been aborted'
-            print ''
-            raise SystemExit(1)
-        print ' --- Removing old Csound installation...'
-        runCmd([concatPath([instDir, binDir, 'uninstall-csound5'])])
-        print ''
-    else:
-        print ' *** Error: an already existing installation of Csound was found'
-        print ' *** Try removing it first, and then run this script again'
-        print ''
-        raise SystemExit(1)
-
 # copy binaries
 
 print ' === Installing executables ==='
 for i in exeFiles1:
     if findFiles('.', i).__len__() > 0:
-        err = installXFile('--strip-unneeded', i, binDir)
+        err = installXFile('', i, binDir)
         installErrors = installErrors or err
 for i in exeFiles2:
     if findFiles('.', i).__len__() > 0:
@@ -265,7 +240,7 @@
     if i[-2:] == '.a':
         err = installFile(i, libDir)
     else:
-        err = installXFile('--strip-debug', i, libDir)
+        err = installXFile('', i, libDir)
     if err == 0:
         if i[:13] == 'libcsound.so.':
             err = installLink(i, concatPath([libDir, 'libcsound.so']))
@@ -292,7 +267,7 @@
     if i in pluginList:
         pluginList.remove(i)
 for i in pluginList:
-    err = installXFile('--strip-unneeded', i, pluginDir)
+    err = installXFile('', i, pluginDir)
     installErrors = installErrors or err
 
 # copy header files
@@ -313,6 +288,7 @@
                ['_loris\\.so', '1', pythonDir2],
                ['_scoregen\\.so', '1', pythonDir2],
                ['_CsoundAC\\.so ', '1', pythonDir2],
+			   ['luaCsnd\\.so', '1', luaDir],
                ['csnd\\.jar', '0', javaDir],
                ['interfaces/csound5\\.lisp', '0', lispDir]]
 for i in wrapperList:
@@ -322,48 +298,21 @@
         if i[1] == '0':
             err = installFile(fName, i[2])
         else:
-            err = installXFile('--strip-debug', fName, i[2])
-        installErrors = installErrors or err
-
-# copy XMG files
-
-print ' === Installing Localisation files ==='
-xmgList = findFiles('.', '.+\\.xmg')
-if xmgList.__len__() > 0:
-    err = installFiles(xmgList, xmgDir)
-    installErrors = installErrors or err
-else:
-  xmgList = ['de', 'en_GB','en_US', 'es_CO', 'fr', 'it','ro']
-  for i in xmgList:
-    makeDir(concatPath([xmgDir, i, 'LC_MESSAGES']))
-    src = 'po/' + i + '/LC_MESSAGES/csound5.mo'
-    fileName = concatPath([instDir, xmgDir, i, 'LC_MESSAGES/csound5.mo'])
-    err = runCmd(['install', '-p', '-m', '0644', src, fileName])
-    if err == 0:
-        addMD5(fileName, fileName)
-        print '  %s' % fileName
-    else:
-        print ' *** error copying %s' % fileName
+            err = installXFile('', fName, i[2])
         installErrors = installErrors or err
 
-# Copy documentation
-
-print ' === Installing documentation ==='
-err = installFiles(docFiles, docDir)
-installErrors = installErrors or err
-
 # copy Tcl/Tk files
 
 print ' === Installing Tcl/Tk modules and scripts ==='
 if findFiles('.', 'tclcsound\\.so').__len__() > 0:
-    err = installXFile('--strip-unneeded', 'tclcsound.so', tclDir)
+    err = installXFile('', 'tclcsound.so', tclDir)
     installErrors = installErrors or err
     err = installFile('frontends/tclcsound/command_summary.txt', tclDir)
     installErrors = installErrors or err
-err = installFile('nsliders.tk', tclDir)
-installErrors = installErrors or err
-err = installXFile('', 'matrix.tk', binDir)
-installErrors = installErrors or err
+    err = installFile('nsliders.tk', tclDir)
+    installErrors = installErrors or err
+    err = installXFile('', 'matrix.tk', binDir)
+    installErrors = installErrors or err
 
 # copy STK raw wave files
 
@@ -398,7 +347,7 @@
     pdDir = ''
 if pdDir != '':
     print ' === Installing csoundapi~ PD object ==='
-    err = installXFile('--strip-unneeded', 'csoundapi~.pd_linux', pdDir)
+    err = installXFile('', 'csoundapi~.pd_linux', pdDir)
     if err == 0:
         try:
             os.chmod(concatPath([instDir, pdDir, 'csoundapi~.pd_linux']), 0644)
@@ -420,42 +369,6 @@
                           '%s/%s' % (vimDir, 'syntax'))
         installErrors = installErrors or err
 
-# create uninstall script
-
-print ' === Installing uninstall script ==='
-fileList += [concatPath([prefix, md5Name])]
-fileList += [concatPath([binDir, 'uninstall-csound5'])]
-try:
-    f = open(concatPath([instDir, binDir, 'uninstall-csound5']), 'w')
-    print >> f, '#!/bin/sh'
-    print >> f, ''
-    for i in fileList:
-        print >> f, 'rm -f "%s"' % i
-    print >> f, ''
-    print >> f, '/sbin/ldconfig > /dev/null 2> /dev/null'
-    print >> f, ''
-    f.close()
-    os.chmod(concatPath([instDir, binDir, 'uninstall-csound5']), 0755)
-    addMD5(concatPath([instDir, binDir, 'uninstall-csound5']),
-           concatPath([binDir, 'uninstall-csound5']))
-    print '  %s' % concatPath([binDir, 'uninstall-csound5'])
-except:
-    print ' *** Error creating uninstall script'
-    installErrors = 1
-
-# save MD5 checksums
-
-print ' === Installing MD5 checksums ==='
-try:
-    f = open(concatPath([instDir, prefix, md5Name]), 'w')
-    print >> f, md5List,
-    f.close()
-    os.chmod(concatPath([instDir, prefix, md5Name]), 0644)
-    print '  %s' % concatPath([prefix, md5Name])
-except:
-    print ' *** Error installing MD5 checksums'
-    installErrors = 1
-
     
 # -----------------------------------------------------------------------------
 
@@ -481,10 +394,6 @@
     print '  CSSTRNGS=%s' % xmgDir
     if '%s/libstk.so' % pluginDir in fileList:
         print '  RAWWAVE_PATH=%s' % rawWaveDir
-    print 'Csound can be uninstalled by running %s/uninstall-csound5' % binDir
-
-if os.getuid() == 0:
-    runCmd(['/sbin/ldconfig'])
 
 print ''
 



1.1                  media-sound/csound/files/csound-5.16.6-scons.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-scons.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-scons.patch?rev=1.1&content-type=text/plain

Index: csound-5.16.6-scons.patch
===================================================================
--- Csound5.16.6/SConstruct
+++ Csound5.16.6/SConstruct
@@ -89,6 +89,9 @@
 commandOptions.Add('usePortMIDI',
     'Build PortMidi plugin for real time MIDI input and output.',
     '1')
+commandOptions.Add('usePulseAudio',
+    'Set to 1 to use PulseAudio for real-time audio and MIDI input and output.',
+    '1')
 commandOptions.Add('useALSA',
     'Set to 1 to use ALSA for real-time audio and MIDI input and output.',
     '1')
@@ -180,6 +183,15 @@
     commandOptions.Add('dynamicCsoundLibrary',
         'Build dynamic Csound library instead of libcsound.a',
         '0')
+commandOptions.Add('buildChuaOpcodes',
+    'Set to 1 to build chua opcodes.',
+    '1')
+commandOptions.Add('buildLinearOpcodes',
+    'Set to 1 to build linear algebra opcodes.',
+    '1')
+commandOptions.Add('buildFluidOpcodes',
+    'Set to 1 to build Fluidsynth opcodes.',
+    '1')
 commandOptions.Add('buildStkOpcodes',
     "Build opcodes encapsulating Perry Cook's Synthesis Toolkit in C++ instruments and effects",
     '0')
@@ -469,14 +481,6 @@
 if commonEnvironment['buildRelease'] == '0':
     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
 
-if commonEnvironment['Lib64'] == '1':
-    if getPlatform() == 'sunos':
-        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64'])
-    else:
-        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
-else:
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
-
 if commonEnvironment['Word64'] == '1':
     if compilerSun():
         commonEnvironment.Append(CCFLAGS = ['-xcode=pic32'])
@@ -494,10 +498,7 @@
 if getPlatform() == 'linux':
     commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
     commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
-    commonEnvironment.Append(CPPPATH = ['/usr/local/include'])
     commonEnvironment.Append(CPPPATH = ['/usr/include'])
-    commonEnvironment.Append(CPPPATH = ['/usr/include'])
-    commonEnvironment.Append(CPPPATH = ['/usr/X11R6/include'])
     commonEnvironment.Append(CCFLAGS = ["-DPIPES"])
     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 elif getPlatform() == 'sunos':
@@ -559,18 +560,17 @@
 
 if getPlatform() == 'linux':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
-    pythonIncludePath = [path1, path2]
+    pythonIncludePath = [path1]
     path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion']
     path2 = '/usr/include/tk%s' % commonEnvironment['tclversion']
     tclIncludePath = [path1, path2]
     pythonLinkFlags = []
     if commonEnvironment['Lib64'] == '1':
         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+        pythonLibraryPath = ['/usr/lib64', tmp]
     else:
         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+        pythonLibraryPath = ['/usr/lib', tmp]
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 elif getPlatform() == 'sunos':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
@@ -777,6 +777,7 @@
 zlibhfound = configure.CheckHeader("zlib.h", language = "C")
 midiPluginSdkFound = configure.CheckHeader("funknown.h", language = "C++")
 luaFound = configure.CheckHeader("lua.h", language = "C")
+luajitFound = configure.CheckLibWithHeader("luajit-5.1", "luajit-2.0/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)])
@@ -1452,7 +1453,7 @@
     swigflags = csoundWrapperEnvironment['SWIGFLAGS']
     print 'swigflags:', swigflags
     luaWrapper = None
-    if not (luaFound and commonEnvironment['buildLuaWrapper'] != '0'):
+    if not (luajitFound and commonEnvironment['buildLuaWrapper'] != '0'):
         print 'CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.'
     else:
         print 'CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.'
@@ -1510,6 +1511,9 @@
             javaWrapper = javaWrapperEnvironment.Program(
                 'lib_jcsound.jnilib', javaWrapperSources)
         else:
+            soname = 'lib_jcsound.so'
+            soflag = [ '-Wl,-soname=%s' % soname ]
+            javaWrapperEnvironment.Prepend(LINKFLAGS = [soflag])
             javaWrapper = javaWrapperEnvironment.SharedLibrary(
                 '_jcsound', javaWrapperSources)
         #Depends(javaWrapper, csoundLibrary)
@@ -1759,9 +1763,12 @@
 	jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp'])
     makePlugin(jpluginEnvironment, 'jackTransport', 'Opcodes/jackTransport.c')
     makePlugin(jpluginEnvironment, 'jacko', 'Opcodes/jacko.cpp')
-if boostFound:
+if commonEnvironment['buildChuaOpcodes'] == '1' and boostFound:
+    print 'CONFIGURATION DECISION: Building chua opcodes.'
     makePlugin(pluginEnvironment, 'chua', 'Opcodes/chua/ChuaOscillator.cpp')
-if gmmFound and commonEnvironment['useDouble'] != '0':
+else:
+    print 'CONFIGURATION DECISION: Not building chua opcodes.'
+if commonEnvironment['buildLinearOpcodes'] == '1' and gmmFound and commonEnvironment['useDouble'] != '0':
     makePlugin(pluginEnvironment, 'linear_algebra', 'Opcodes/linear_algebra.cpp')
     print 'CONFIGURATION DECISION: Building linear algebra opcodes.'
 else:
@@ -1893,11 +1900,13 @@
     alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
     makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
 
-if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
+if commonEnvironment['usePulseAudio'] == '1' and pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
    print "CONFIGURATION DECISION: Building PulseAudio plugin"
    pulseaudioEnv = pluginEnvironment.Clone()
    pulseaudioEnv.Append(LIBS = ['pulse-simple'])
    makePlugin(pulseaudioEnv, 'rtpulse', ['InOut/rtpulse.c'])
+else:
+   print "CONFIGURATION DECISION: Not building PulseAudio plugin."
 
 if getPlatform() == 'win32':
     winmmEnvironment = pluginEnvironment.Clone()
@@ -1963,9 +1972,7 @@
 
 # FLUIDSYNTH OPCODES
 
-if not configure.CheckHeader("fluidsynth.h", language = "C"):
-    print "CONFIGURATION DECISION: Not building fluid opcodes."
-else:
+if commonEnvironment['buildFluidOpcodes'] == '1' and configure.CheckHeader("fluidsynth.h", language = "C"):
 	print "CONFIGURATION DECISION: Building fluid opcodes."
 	fluidEnvironment = pluginEnvironment.Clone()
 	if getPlatform() == 'win32':
@@ -1981,6 +1988,8 @@
 		fluidEnvironment.Append(LIBS = ['pthread'])
 	makePlugin(fluidEnvironment, 'fluidOpcodes',
 			   ['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
+else:
+    print "CONFIGURATION DECISION: Not building fluid opcodes."
 
 # VST HOST OPCODES
 
@@ -2174,7 +2183,7 @@
     if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
         Depends(pythonOpcodes, pythonImportLibrary)
 
-# Python opcodes
+# Lua opcodes
 
 if not (commonEnvironment['buildLuaOpcodes'] != '0'):
     print "CONFIGURATION DECISION: Not building Lua opcodes."
@@ -2183,10 +2192,10 @@
     luaEnvironment = pluginEnvironment.Clone()
     
     if getPlatform() == 'linux':
-       if(luaFound == 1):
+       if(luajitFound == 1):
          luaEnvironment.Append(LIBS = ['luajit-5.1'])
          luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
-         luaEnvironment.Append(CPPPATH = '/usr/local/include/luajit-2.0')
+         luaEnvironment.Append(CPPPATH = '/usr/include/luajit-2.0')
     elif getPlatform() == 'win32':
        if(luaFound == 1):
         luaEnvironment.Append(LIBS = ['lua51'])
@@ -2538,7 +2547,7 @@
     Depends(csoundAcPythonModule, pythonWrapper)
     Depends(csoundAcPythonModule, csoundac)
     Depends(csoundAcPythonModule, csnd)
-    if luaFound and commonEnvironment['buildLuaWrapper'] != '0':
+    if luajitFound and commonEnvironment['buildLuaWrapper'] != '0':
        luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
        if getPlatform() == 'win32':
        	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))