[SCM] csound/master: Refresh patches

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Sun Oct 23 16:16:05 UTC 2011 

The following commit has been merged in the master branch:
commit cda69f4a9675b53ab8f7904c2daf2c3f1afe7572
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Oct 21 19:46:37 2011 -0300

    Refresh patches

diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index 6c34c73..6b704f9 100644
--- a/debian/patches/1000-use-system-stk.diff
+++ b/debian/patches/1000-use-system-stk.diff
@@ -6,15 +6,15 @@ Author: Felipe Sateler <fsateler at gmail.com>
 Forwarded: no
 --- a/SConstruct
 +++ b/SConstruct
-@@ -800,6 +800,7 @@
+@@ -766,6 +766,7 @@
+ 
+ jackFound = configure.CheckHeader("jack/jack.h", language = "C")
  pulseaudioFound = configure.CheckHeader("pulse/simple.h", language = "C")
- #else:
- #pulseaudioFound = 0
 +systemStkFound = configure.CheckHeader("Stk.h", language = "C++")
  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")
-@@ -2103,7 +2104,7 @@
+@@ -1973,7 +1974,7 @@
  
  # STK opcodes
  
@@ -23,7 +23,7 @@ Forwarded: no
      print 'CONFIGURATION DECISION: Not building STK opcodes.'
  else:
      print 'CONFIGURATION DECISION: Building STK opcodes.'
-@@ -2114,53 +2115,47 @@
+@@ -1984,53 +1985,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 310fd8e..c26dfa8 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
-@@ -950,6 +950,7 @@
+@@ -920,6 +920,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:
-@@ -2876,6 +2877,8 @@
+@@ -2769,6 +2770,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 545f7bc..9a16c5e 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
-@@ -2418,12 +2418,10 @@
+@@ -2300,12 +2300,10 @@
          acEnvironment.Prepend(LIBS = pythonLibs)
      if musicXmlFound:
          acEnvironment.Prepend(LIBS = 'musicxml2')
diff --git a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
index d608c05..c667b32 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
-@@ -2436,7 +2436,6 @@
+@@ -2318,7 +2318,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,.'])
-@@ -2560,7 +2559,6 @@
+@@ -2442,7 +2441,6 @@
      vstEnvironment.Append(LIBS = libCsoundLibs)
      if getPlatform() == 'linux':
          vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
@@ -23,13 +23,3 @@ Last-Update: 2011-06-26
          vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
      elif getPlatform() == 'darwin':
---- a/frontends/SConscript
-+++ b/frontends/SConscript
-@@ -392,7 +392,6 @@
-         acEnvironment['SHLINKFLAGS'].remove(flag)
-     if util.platform == 'linux':
-         acEnvironment.Append(LIBS               = ['util', 'dl', 'm'])
--        acEnvironment.Append(SHLINKFLAGS        = '--no-export-all-symbols')
-         acEnvironment.Append(LINKFLAGS          = ['-Wl,-rpath-link,interfaces'])
-         acEnvironment.Append(LIBS               = ['fltk', 'fltk_images'])
-         try     : os.symlink('lib_CsoundAC.so', '_CsoundAC.so')
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index 8c413ec..fbaf516 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,12 +6,12 @@ Description: Avoid non-free scansyn plugin
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1656,8 +1656,6 @@
+@@ -1538,8 +1538,6 @@
+ '''))
  makePlugin(pluginEnvironment, 'pitch',
             ['Opcodes/pitch.c', 'Opcodes/pitch0.c', 'Opcodes/spectra.c'])
- if not buildOLPC:
-- makePlugin(pluginEnvironment, 'scansyn',
+-makePlugin(pluginEnvironment, 'scansyn',
 -           ['Opcodes/scansyn.c', 'Opcodes/scansynx.c'])
-  makePlugin(pluginEnvironment, 'ambicode1', ['Opcodes/ambicode1.c'])
+ makePlugin(pluginEnvironment, 'ambicode1', ['Opcodes/ambicode1.c'])
  if mpafound==1:
    makePlugin(pluginEnvironment, 'mp3in', ['Opcodes/mp3in.c'])
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index eb3a3b8..ee25968 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -5,7 +5,7 @@ Description: Do not link against lua library
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1485,7 +1485,7 @@
+@@ -1388,7 +1388,7 @@
          if getPlatform() == 'win32':
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
@@ -14,7 +14,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
         	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
  	Depends(luaWrapper, csoundLuaInterface)
  
-@@ -2531,7 +2531,7 @@
+@@ -2413,7 +2413,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 54d8b7d..b9a8312 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
-@@ -2437,8 +2437,6 @@
+@@ -2319,8 +2319,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'])
-@@ -2493,7 +2491,17 @@
+@@ -2375,7 +2373,17 @@
      acWrapperEnvironment = csoundWrapperEnvironment.Clone()
      fixCFlagsForSwig(acWrapperEnvironment)
      if commonEnvironment['dynamicCsoundLibrary'] == '1':
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index d8e20c2..296a420 100644
--- a/debian/patches/2004-fix-gettext.diff
+++ b/debian/patches/2004-fix-gettext.diff
@@ -8,7 +8,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
      /* bind_textdomain_codeset("csound5", "UTF-8"); */
 -#ifdef never
      /* This is experimental; where should these be?? */
--    bindtextdomain("csound5", "/home/jpff/Sourceforge/csound5/po");
+-    bindtextdomain("csound5", "/home/jpff/Sourceforge/csound/csound5/po");
 -#endif
 +    bindtextdomain("csound5", "/usr/share/locale");
  }
diff --git a/debian/patches/2010-disable-multithread-sparc.patch b/debian/patches/2010-disable-multithread-sparc.patch
index c447864..1d1fdcc 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
-@@ -769,7 +769,9 @@
+@@ -740,7 +740,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 a9b56b0..ec884d4 100644
--- a/debian/patches/2011-no-link-csoundac-python.diff
+++ b/debian/patches/2011-no-link-csoundac-python.diff
@@ -2,7 +2,7 @@ Description: Avoid linking with the python library, csoundac doesn't need it.
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2415,7 +2415,8 @@
+@@ -2297,7 +2297,8 @@
      acEnvironment.Append(LINKFLAGS = pythonLinkFlags)
      acEnvironment.Append(LIBPATH = pythonLibraryPath)
      if getPlatform() != 'darwin':
diff --git a/debian/patches/2012-luaCsnd-soname.diff b/debian/patches/2012-luaCsnd-soname.diff
index df47ac7..f3ad3a8 100644
--- a/debian/patches/2012-luaCsnd-soname.diff
+++ b/debian/patches/2012-luaCsnd-soname.diff
@@ -1,6 +1,6 @@
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1488,6 +1488,8 @@
+@@ -1391,6 +1391,8 @@
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
              luaWrapperEnvironment.Prepend(LIBS = ['csnd'])

-- 
csound packaging

More information about the pkg-multimedia-commits mailing list