[SCM] csound/master: Add patch to fix linkage of csoundac to csnd

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Jan 19 01:50:42 UTC 2011


The following commit has been merged in the master branch:
commit 018514f2ad597eac66c495822ead365fe48908aa
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jan 17 22:46:33 2011 -0300

    Add patch to fix linkage of csoundac to csnd

diff --git a/debian/patches/1004-fix-csoundac-csnd-linkage.diff b/debian/patches/1004-fix-csoundac-csnd-linkage.diff
new file mode 100644
index 0000000..0ffb971
--- /dev/null
+++ b/debian/patches/1004-fix-csoundac-csnd-linkage.diff
@@ -0,0 +1,22 @@
+Description: Correct linkage of csnd library to CsoundAC
+Forwarded: no
+Author: Felipe Sateler <fsateler at debian.org>
+--- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:39:54.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:40:30.000000000 -0300
+@@ -2418,12 +2418,10 @@
+         acEnvironment.Prepend(LIBS = pythonLibs)
+     if musicXmlFound:
+         acEnvironment.Prepend(LIBS = 'musicxml2')
+-        if getPlatform() != 'win32':
+-           acEnvironment.Prepend(LIBS = csnd)
+-        else:  
+-            acEnvironment.Prepend(LIBS = 'csnd')
+-    else: 
+-        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':
+       acEnvironment.Prepend(LIBS = libCsoundLibs)
diff --git a/debian/patches/series b/debian/patches/series
index 2d62d5e..be3de7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 1000-use-system-stk.diff
 1003-abi-plugin-dir.diff
+1004-fix-csoundac-csnd-linkage.diff
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2002-csoundac.diff

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list