[SCM] csound/master: Refresh patches

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Dec 28 01:38:59 UTC 2011 

The following commit has been merged in the master branch:
commit f43ede6aab9f948adbd8efb8e225af2afcbb9f0d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Dec 24 17:13:19 2011 -0300

    Refresh patches

diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index 6b704f9..0847d2a 100644
--- a/debian/patches/1000-use-system-stk.diff
+++ b/debian/patches/1000-use-system-stk.diff
@@ -6,7 +6,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
 Forwarded: no
 --- a/SConstruct
 +++ b/SConstruct
-@@ -766,6 +766,7 @@
+@@ -767,6 +767,7 @@
  
  jackFound = configure.CheckHeader("jack/jack.h", language = "C")
  pulseaudioFound = configure.CheckHeader("pulse/simple.h", language = "C")
@@ -14,7 +14,7 @@ Forwarded: no
  stkFound = configure.CheckHeader("Opcodes/stk/include/Stk.h", language = "C++")
  pdhfound = configure.CheckHeader("m_pd.h", language = "C")
  tclhfound = configure.CheckHeader("tcl.h", language = "C")
-@@ -1973,7 +1974,7 @@
+@@ -2071,7 +2072,7 @@
  
  # STK opcodes
  
@@ -23,7 +23,7 @@ Forwarded: no
      print 'CONFIGURATION DECISION: Not building STK opcodes.'
  else:
      print 'CONFIGURATION DECISION: Building STK opcodes.'
-@@ -1984,53 +1985,47 @@
+@@ -2082,53 +2083,47 @@
      #   csound5/Opcodes/stk/rawwaves
      # Then, the following sources (and any other future I/O or OS dependent
      # sources) should be ignored:
diff --git a/debian/patches/1003-abi-plugin-dir.diff b/debian/patches/1003-abi-plugin-dir.diff
index c26dfa8..b457fbf 100644
--- a/debian/patches/1003-abi-plugin-dir.diff
+++ b/debian/patches/1003-abi-plugin-dir.diff
@@ -4,7 +4,7 @@ Description: Append library version to plugin dir
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -920,6 +920,7 @@
+@@ -922,6 +922,7 @@
              tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
          if commonEnvironment['useDouble'] != '0':
              tmp += '64'
@@ -12,7 +12,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
          s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
          csoundLibraryEnvironment.Append(CPPFLAGS = [s])
      elif buildOSXFramework != 0:
-@@ -2769,6 +2770,8 @@
+@@ -2870,6 +2871,8 @@
      PLUGIN_DIR = LIB_DIR + "/csound/plugins"
  else:
      PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
diff --git a/debian/patches/1004-fix-csoundac-csnd-linkage.diff b/debian/patches/1004-fix-csoundac-csnd-linkage.diff
index 9a16c5e..a39d2ff 100644
--- a/debian/patches/1004-fix-csoundac-csnd-linkage.diff
+++ b/debian/patches/1004-fix-csoundac-csnd-linkage.diff
@@ -3,7 +3,7 @@ Forwarded: no
 Author: Felipe Sateler <fsateler at debian.org>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2300,12 +2300,10 @@
+@@ -2400,15 +2400,10 @@
          acEnvironment.Prepend(LIBS = pythonLibs)
      if musicXmlFound:
          acEnvironment.Prepend(LIBS = 'musicxml2')
@@ -12,11 +12,14 @@ Author: Felipe Sateler <fsateler at debian.org>
 -        else:  
 -            acEnvironment.Prepend(LIBS = 'csnd')
 -    else: 
+-     if getPlatform() != 'darwin':
 -        acEnvironment.Prepend(LIBS = '_csnd')
-+    if getPlatform() != 'win32':
-+       acEnvironment.Prepend(LIBS = csnd)
-+    else:  
-+       acEnvironment.Prepend(LIBS = 'csnd')
-     acEnvironment.Append(LINKFLAGS = libCsoundLinkFlags)
-     if not getPlatform() == 'darwin' or commonEnvironment['dynamicCsoundLibrary']== '0':
+-     else:
+-        acEnvironment.Append(LINKFLAGS = ['-L.', '-l_csnd'])
++    if getPlatform() == 'win32':
++        acEnvironment.Prepend(LIBS = 'csnd')
++    else:
++        acEnvironment.Prepend(LIBS = csnd)
+     if not getPlatform() == 'darwin' or commonEnvironment['dynamicCsoundLibrary'] == '0':
        acEnvironment.Prepend(LIBS = libCsoundLibs)
+     else:
diff --git a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
index c667b32..0f9e199 100644
--- a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
+++ b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-06-26
 
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2318,7 +2318,6 @@
+@@ -2423,7 +2423,6 @@
          acEnvironment['LINKFLAGS'].remove(flag)
      if getPlatform() == 'linux':
          acEnvironment.Append(LIBS = ['util', 'dl', 'm'])
@@ -15,7 +15,7 @@ Last-Update: 2011-06-26
          acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          acEnvironment.Append(LIBS = ['fltk_images'])
          guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
-@@ -2442,7 +2441,6 @@
+@@ -2549,7 +2548,6 @@
      vstEnvironment.Append(LIBS = libCsoundLibs)
      if getPlatform() == 'linux':
          vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index fbaf516..3458cc3 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,12 +6,13 @@ Description: Avoid non-free scansyn plugin
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1538,8 +1538,6 @@
- '''))
- makePlugin(pluginEnvironment, 'pitch',
-            ['Opcodes/pitch.c', 'Opcodes/pitch0.c', 'Opcodes/spectra.c'])
+@@ -1678,9 +1678,6 @@
+     makePlugin(pluginEnvironment, 'urandom', ['Opcodes/urandom.c'])
+ 
+ 
+-# scanned synthesis
 -makePlugin(pluginEnvironment, 'scansyn',
 -           ['Opcodes/scansyn.c', 'Opcodes/scansynx.c'])
- makePlugin(pluginEnvironment, 'ambicode1', ['Opcodes/ambicode1.c'])
- if mpafound==1:
-   makePlugin(pluginEnvironment, 'mp3in', ['Opcodes/mp3in.c'])
+ 
+ # tables
+ makePlugin(pluginEnvironment, 'fareygen', ['Opcodes/fareygen.c'])
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 49dc8fc..aa0ab9a 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -7,7 +7,7 @@ Description: Only link to lua when necessary, and to the correct lib
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1388,7 +1388,7 @@
+@@ -1456,7 +1456,7 @@
          if getPlatform() == 'win32':
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
@@ -16,7 +16,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
         	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
  	Depends(luaWrapper, csoundLuaInterface)
  
-@@ -2063,7 +2063,7 @@
+@@ -2160,7 +2160,7 @@
      
      if getPlatform() == 'linux':
         if(luaFound == 1):
@@ -25,7 +25,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
           luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
      elif getPlatform() == 'win32':
         if(luaFound == 1):
-@@ -2413,7 +2413,7 @@
+@@ -2519,7 +2519,7 @@
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
         else:
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
diff --git a/debian/patches/2002-csoundac.diff b/debian/patches/2002-csoundac.diff
index b9a8312..35af01b 100644
--- a/debian/patches/2002-csoundac.diff
+++ b/debian/patches/2002-csoundac.diff
@@ -2,7 +2,7 @@ Description: Enable support for building CsoundAC as a shared library
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2319,8 +2319,6 @@
+@@ -2423,8 +2423,6 @@
          acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          acEnvironment.Append(LIBS = ['fltk_images'])
          guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
@@ -11,7 +11,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
      elif getPlatform() == 'darwin':
          acEnvironment.Append(LIBS = ['fltk'])
          acEnvironment.Append(LIBS = ['dl', 'm', 'fltk_images', 'png', 'jpeg'])
-@@ -2375,7 +2373,17 @@
+@@ -2479,7 +2477,17 @@
      acWrapperEnvironment = csoundWrapperEnvironment.Clone()
      fixCFlagsForSwig(acWrapperEnvironment)
      if commonEnvironment['dynamicCsoundLibrary'] == '1':
diff --git a/debian/patches/2010-disable-multithread-sparc.patch b/debian/patches/2010-disable-multithread-sparc.patch
index 1d1fdcc..f75d722 100644
--- a/debian/patches/2010-disable-multithread-sparc.patch
+++ b/debian/patches/2010-disable-multithread-sparc.patch
@@ -6,7 +6,7 @@ Description: Drop spinlock implementation when on SPARC
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -740,7 +740,9 @@
+@@ -741,7 +741,9 @@
      useOpenMP = True;
  else:
      useOpenMP = False;
diff --git a/debian/patches/2011-no-link-csoundac-python.diff b/debian/patches/2011-no-link-csoundac-python.diff
index ec884d4..a482c84 100644
--- a/debian/patches/2011-no-link-csoundac-python.diff
+++ b/debian/patches/2011-no-link-csoundac-python.diff
@@ -2,9 +2,9 @@ Description: Avoid linking with the python library, csoundac doesn't need it.
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2297,7 +2297,8 @@
-     acEnvironment.Append(LINKFLAGS = pythonLinkFlags)
+@@ -2395,7 +2395,8 @@
      acEnvironment.Append(LIBPATH = pythonLibraryPath)
+     acEnvironment.Append(LINKFLAGS = libCsoundLinkFlags)
      if getPlatform() != 'darwin':
 -        acEnvironment.Prepend(LIBS = pythonLibs)
 +        #acEnvironment.Prepend(LIBS = pythonLibs)
diff --git a/debian/patches/2012-luaCsnd-soname.diff b/debian/patches/2012-luaCsnd-soname.diff
index f3ad3a8..4f61a49 100644
--- a/debian/patches/2012-luaCsnd-soname.diff
+++ b/debian/patches/2012-luaCsnd-soname.diff
@@ -1,6 +1,6 @@
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1391,6 +1391,8 @@
+@@ -1459,6 +1459,8 @@
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
              luaWrapperEnvironment.Prepend(LIBS = ['csnd'])

-- 
csound packaging

More information about the pkg-multimedia-commits mailing list