[SCM] csound/master: Refresh patches
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 e2702388db64c46e9defce63948ee204b95d5d77
Author: Felipe Sateler <fsateler at debian.org>
Date: Mon Jan 17 22:46:59 2011 -0300
Refresh patches
diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index c8327f0..5386311 100644
--- a/debian/patches/1000-use-system-stk.diff
+++ b/debian/patches/1000-use-system-stk.diff
@@ -4,9 +4,11 @@ Description: Enable use of system STK instead of a bundled copy
another of the same name.
Author: Felipe Sateler <fsateler at gmail.com>
Forwarded: no
---- a/SConstruct
-+++ b/SConstruct
-@@ -769,6 +769,7 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:20:05.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:19:26.000000000 -0300
+@@ -800,6 +800,7 @@
pulseaudioFound = configure.CheckHeader("pulse/simple.h", language = "C")
#else:
#pulseaudioFound = 0
@@ -14,7 +16,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")
-@@ -2046,7 +2047,7 @@
+@@ -2103,7 +2104,7 @@
# STK opcodes
@@ -23,7 +25,7 @@ Forwarded: no
print 'CONFIGURATION DECISION: Not building STK opcodes.'
else:
print 'CONFIGURATION DECISION: Building STK opcodes.'
-@@ -2057,43 +2058,47 @@
+@@ -2114,53 +2115,47 @@
# csound5/Opcodes/stk/rawwaves
# Then, the following sources (and any other future I/O or OS dependent
# sources) should be ignored:
@@ -67,15 +69,16 @@ Forwarded: no
- stkLibrarySources += stkEnvironment.SharedObject(i)
- stkLibrary = stkEnvironment.StaticLibrary('stk_base', stkLibrarySources)
- stkEnvironment.Prepend(LIBS = ['stk_base'])
-+ removeSources = Split('''
-+ Opcodes/stk/src/InetWvIn.cpp Opcodes/stk/src/InetWvOut.cpp
-+ Opcodes/stk/src/Mutex.cpp Opcodes/stk/src/RtAudio.cpp
-+ Opcodes/stk/src/RtMidi.cpp
-+ Opcodes/stk/src/RtWvIn.cpp Opcodes/stk/src/RtWvOut.cpp
-+ Opcodes/stk/src/Socket.cpp Opcodes/stk/src/TcpClient.cpp
-+ Opcodes/stk/src/TcpServer.cpp Opcodes/stk/src/Thread.cpp
-+ Opcodes/stk/src/UdpSocket.cpp
-+ ''')
+- if compilerGNU() and getPlatform() != 'win32':
+- stkEnvironment.Append(LIBS = ['stdc++'])
+- if getPlatform() == 'win32':
+- stkEnvironment.Append(LIBS = csoundWindowsLibraries)
+- elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'sunos':
+- stkEnvironment.Append(LIBS = ['pthread'])
+- # This is the one that actually defines the opcodes.
+- # They are straight wrappers, as simple as possible.
+- stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp'])
+- Depends(stk, stkLibrary)
+ if getPlatform() == 'win32':
+ stkEnvironment.Append(CCFLAGS = '-D__OS_WINDOWS__')
+ stkEnvironment.Append(CCFLAGS = '-D__STK_REALTIME__')
@@ -103,16 +106,15 @@ Forwarded: no
+ stkLibrarySources += stkEnvironment.SharedObject(i)
+ stkLibrary = stkEnvironment.StaticLibrary('stk_base', stkLibrarySources)
+ stkEnvironment.Prepend(LIBS = ['stk_base'])
- if compilerGNU():
- stkEnvironment.Append(LIBS = ['stdc++'])
- if getPlatform() == 'win32':
-@@ -2102,8 +2107,7 @@
- stkEnvironment.Append(LIBS = ['pthread'])
- # This is the one that actually defines the opcodes.
- # They are straight wrappers, as simple as possible.
-- stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp'])
-- Depends(stk, stkLibrary)
-+ stk = makePlugin(stkEnvironment, 'stkopcodes', ['Opcodes/stk/stkOpcodes.cpp'])
++ if compilerGNU() and getPlatform() != 'win32':
++ stkEnvironment.Append(LIBS = ['stdc++'])
++ if getPlatform() == 'win32':
++ stkEnvironment.Append(LIBS = csoundWindowsLibraries)
++ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'sunos':
++ stkEnvironment.Append(LIBS = ['pthread'])
++ # This is the one that actually defines the opcodes.
++ # They are straight wrappers, as simple as possible.
++ stk = makePlugin(stkEnvironment, 'stkopcodes', ['Opcodes/stk/stkOpcodes.cpp'])
# Python opcodes
diff --git a/debian/patches/1003-abi-plugin-dir.diff b/debian/patches/1003-abi-plugin-dir.diff
index ff8315c..7b1ff42 100644
--- a/debian/patches/1003-abi-plugin-dir.diff
+++ b/debian/patches/1003-abi-plugin-dir.diff
@@ -2,9 +2,11 @@ Description: Append library version to plugin dir
Install plugins into a versioned directory to allow co-installation of
different versions of the library.
Author: Felipe Sateler <fsateler at gmail.com>
---- a/SConstruct
-+++ b/SConstruct
-@@ -919,6 +919,7 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:44:52.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:44:55.000000000 -0300
+@@ -950,6 +950,7 @@
tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
if commonEnvironment['useDouble'] != '0':
tmp += '64'
@@ -12,7 +14,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
csoundLibraryEnvironment.Append(CPPFLAGS = [s])
elif buildOSXFramework != 0:
-@@ -2801,6 +2802,8 @@
+@@ -2875,6 +2876,8 @@
PLUGIN_DIR = LIB_DIR + "/csound/plugins"
else:
PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index c74d9be..e920de9 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -4,9 +4,11 @@ Description: Avoid non-free scansyn plugin
to prevent build failures. We don't remove them at the same time as the
opcodes themselves to keep repacking of the source minimal.
Author: Felipe Sateler <fsateler at gmail.com>
---- a/SConstruct
-+++ b/SConstruct
-@@ -1615,8 +1615,6 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:45:00.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:45:06.000000000 -0300
+@@ -1656,8 +1656,6 @@
makePlugin(pluginEnvironment, 'pitch',
['Opcodes/pitch.c', 'Opcodes/pitch0.c', 'Opcodes/spectra.c'])
if not buildOLPC:
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 35aa863..537dccb 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -3,9 +3,11 @@ Description: Do not link against lua library
doesn't help at all. All lua-using programs will load the library, not
the modules.
Author: Felipe Sateler <fsateler at gmail.com>
---- a/SConstruct
-+++ b/SConstruct
-@@ -1447,7 +1447,7 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:45:06.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:45:09.000000000 -0300
+@@ -1485,7 +1485,7 @@
if getPlatform() == 'win32':
luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
else:
@@ -14,7 +16,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
Depends(luaWrapper, csoundLuaInterface)
-@@ -2484,7 +2484,7 @@
+@@ -2532,7 +2532,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 26376dc..45e479a 100644
--- a/debian/patches/2002-csoundac.diff
+++ b/debian/patches/2002-csoundac.diff
@@ -1,17 +1,19 @@
Description: Enable support for building CsoundAC as a shared library
Author: Felipe Sateler <fsateler at gmail.com>
---- a/SConstruct
-+++ b/SConstruct
-@@ -2392,8 +2392,6 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:45:09.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:45:10.000000000 -0300
+@@ -2438,8 +2438,6 @@
acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
acEnvironment.Append(LIBS = ['fltk_images'])
guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
- os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundAC.so'])
- #os.symlink('lib_CsoundAC.so', '_CsoundAC.so')
elif getPlatform() == 'darwin':
- acEnvironment.Append(LIBS = ['dl', 'm', 'fltk_images', 'fltk_png', 'fltk_jpeg'])
- acEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
-@@ -2446,7 +2444,17 @@
+ acEnvironment.Append(LIBS = ['fltk'])
+ acEnvironment.Append(LIBS = ['dl', 'm', 'fltk_images', 'png', 'jpeg'])
+@@ -2494,7 +2492,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..270c9c6 100644
--- a/debian/patches/2004-fix-gettext.diff
+++ b/debian/patches/2004-fix-gettext.diff
@@ -1,7 +1,9 @@
Description: Set the correct path to search for locales
Author: Felipe Sateler <fsateler at gmail.com>
---- a/Top/getstring.c
-+++ b/Top/getstring.c
+Index: csound-5.13.0~dfsg/Top/getstring.c
+===================================================================
+--- csound-5.13.0~dfsg.orig/Top/getstring.c 2011-01-17 22:44:44.000000000 -0300
++++ csound-5.13.0~dfsg/Top/getstring.c 2011-01-17 22:45:11.000000000 -0300
@@ -63,10 +63,8 @@
/* setlocale (LC_MESSAGES, s); /\* Set to particular value *\/ */
/* textdomain("csound5"); */ /* This is not needed when using dgettext */
diff --git a/debian/patches/2006-apidocs-font.patch b/debian/patches/2006-apidocs-font.patch
index 2ea2e51..d6223ef 100644
--- a/debian/patches/2006-apidocs-font.patch
+++ b/debian/patches/2006-apidocs-font.patch
@@ -1,7 +1,9 @@
Description: Use DejaVu font in doxygen config
Author: Felipe Sateler <fsateler at gmail.com>
---- a/Doxyfile
-+++ b/Doxyfile
+Index: csound-5.13.0~dfsg/Doxyfile
+===================================================================
+--- csound-5.13.0~dfsg.orig/Doxyfile 2011-01-17 22:44:44.000000000 -0300
++++ csound-5.13.0~dfsg/Doxyfile 2011-01-17 22:45:13.000000000 -0300
@@ -1376,6 +1376,8 @@
DOT_FONTPATH =
diff --git a/debian/patches/2007-apidoc-dotpath.patch b/debian/patches/2007-apidoc-dotpath.patch
index a6b6330..ff906a4 100644
--- a/debian/patches/2007-apidoc-dotpath.patch
+++ b/debian/patches/2007-apidoc-dotpath.patch
@@ -1,7 +1,9 @@
Description: Leave dotpath blank in doxygen config
Author: Felipe Sateler <fsateler at gmail.com>
---- a/Doxyfile
-+++ b/Doxyfile
+Index: csound-5.13.0~dfsg/Doxyfile
+===================================================================
+--- csound-5.13.0~dfsg.orig/Doxyfile 2011-01-17 22:45:13.000000000 -0300
++++ csound-5.13.0~dfsg/Doxyfile 2011-01-17 22:45:14.000000000 -0300
@@ -1459,7 +1459,7 @@
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
diff --git a/debian/patches/2008-apidoc-listings-pkg.patch b/debian/patches/2008-apidoc-listings-pkg.patch
index 99b6543..939ad87 100644
--- a/debian/patches/2008-apidoc-listings-pkg.patch
+++ b/debian/patches/2008-apidoc-listings-pkg.patch
@@ -1,7 +1,9 @@
Description: Use listings package in doxygen TeX header
Author: Felipe Sateler <fsateler at gmail.com>
---- a/refman_header.tex
-+++ b/refman_header.tex
+Index: csound-5.13.0~dfsg/refman_header.tex
+===================================================================
+--- csound-5.13.0~dfsg.orig/refman_header.tex 2011-01-17 22:44:44.000000000 -0300
++++ csound-5.13.0~dfsg/refman_header.tex 2011-01-17 22:45:17.000000000 -0300
@@ -36,6 +36,7 @@
\fi
\usepackage[utf8]{inputenc}
diff --git a/debian/patches/2010-disable-multithread-sparc.patch b/debian/patches/2010-disable-multithread-sparc.patch
index ae394ce..1acadbd 100644
--- a/debian/patches/2010-disable-multithread-sparc.patch
+++ b/debian/patches/2010-disable-multithread-sparc.patch
@@ -4,12 +4,14 @@ Description: Drop spinlock implementation when on SPARC
proper solution.
This custom implementation of spinlocks is likely to go away.
Author: Felipe Sateler <fsateler at gmail.com>
---- a/SConstruct
-+++ b/SConstruct
-@@ -738,7 +738,9 @@
- pthreadBarrierFound = configure.CheckLibWithHeader('pthread', 'pthread.h', 'C', 'pthread_barrier_init(0, 0, 0);')
- if pthreadBarrierFound:
- commonEnvironment.Append(CPPFLAGS = ['-DHAVE_PTHREAD_BARRIER_INIT'])
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:45:10.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:45:18.000000000 -0300
+@@ -769,7 +769,9 @@
+ useOpenMP = True;
+ else:
+ useOpenMP = False;
-if compilerMicrosoft():
+import platform
+if platform.machine()[:5] == 'sparc':
diff --git a/debian/patches/2011-no-link-csoundac-python.diff b/debian/patches/2011-no-link-csoundac-python.diff
index 19da806..4c76ae6 100644
--- a/debian/patches/2011-no-link-csoundac-python.diff
+++ b/debian/patches/2011-no-link-csoundac-python.diff
@@ -1,14 +1,16 @@
Description: Avoid linking with the python library, csoundac doesn't need it.
Author: Felipe Sateler <fsateler at gmail.com>
---- a/SConstruct
-+++ b/SConstruct
-@@ -2367,7 +2367,8 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:45:18.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:45:19.000000000 -0300
+@@ -2415,7 +2415,8 @@
acEnvironment.Append(LINKFLAGS = pythonLinkFlags)
acEnvironment.Append(LIBPATH = pythonLibraryPath)
if getPlatform() != 'darwin':
- acEnvironment.Prepend(LIBS = pythonLibs)
+ #acEnvironment.Prepend(LIBS = pythonLibs)
+ pass
- if musicXmlFound:
- acEnvironment.Prepend(LIBS = 'musicxml2')
- if getPlatform() != 'win32':
+ if musicXmlFound:
+ acEnvironment.Prepend(LIBS = 'musicxml2')
+ if getPlatform() != 'win32':
diff --git a/debian/patches/2012-luaCsnd-soname.diff b/debian/patches/2012-luaCsnd-soname.diff
index d448cbd..a71d8ea 100644
--- a/debian/patches/2012-luaCsnd-soname.diff
+++ b/debian/patches/2012-luaCsnd-soname.diff
@@ -1,6 +1,8 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -1450,6 +1450,8 @@
+Index: csound-5.13.0~dfsg/SConstruct
+===================================================================
+--- csound-5.13.0~dfsg.orig/SConstruct 2011-01-17 22:45:19.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct 2011-01-17 22:45:22.000000000 -0300
+@@ -1488,6 +1488,8 @@
luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
else:
luaWrapperEnvironment.Prepend(LIBS = ['csnd'])
diff --git a/debian/patches/2013-no-rawwave-defined.diff b/debian/patches/2013-no-rawwave-defined.diff
index 6ca1517..c8a265d 100644
--- a/debian/patches/2013-no-rawwave-defined.diff
+++ b/debian/patches/2013-no-rawwave-defined.diff
@@ -1,10 +1,10 @@
Description: Do not print error message when RAWwAVE_PATH is undefined
In Debian, we know where they are.
-Index: csound-5.12.1~dfsg/Opcodes/stk/stkOpcodes.cpp
+Index: csound-5.13.0~dfsg/Opcodes/stk/stkOpcodes.cpp
===================================================================
---- csound-5.12.1~dfsg.orig/Opcodes/stk/stkOpcodes.cpp 2010-08-02 20:01:37.000000000 -0400
-+++ csound-5.12.1~dfsg/Opcodes/stk/stkOpcodes.cpp 2010-08-02 20:04:43.000000000 -0400
-@@ -585,19 +585,14 @@
+--- csound-5.13.0~dfsg.orig/Opcodes/stk/stkOpcodes.cpp 2011-01-17 22:44:44.000000000 -0300
++++ csound-5.13.0~dfsg/Opcodes/stk/stkOpcodes.cpp 2011-01-17 22:45:23.000000000 -0300
+@@ -681,19 +681,13 @@
const char *path = csound->GetEnv(csound, "RAWWAVE_PATH");
if(!path)
{
@@ -12,21 +12,21 @@ Index: csound-5.12.1~dfsg/Opcodes/stk/stkOpcodes.cpp
- Str("Error: define environment variable RAWWAVE_PATH\n"
- "(points to rawwaves directory) to use STK opcodes."));
- return 0;
-+ path = "/usr/share/stk/rawwaves";
- }
+- }
- else
- {
- csound_global_mutex_lock();
- Stk::setRawwavePath(path);
- csound_global_mutex_unlock();
- csound->Message(csound,
-+
+- Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
++ path = "/usr/share/stk/rawwaves";
+ }
+ csound_global_mutex_lock();
+ Stk::setRawwavePath(path);
+ csound_global_mutex_unlock();
+ csound->Message(csound,
- Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
-- }
++ Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
int status = 0;
for(OENTRY *oentry = &oentries[0]; oentry->opname; oentry++)
{
--
csound packaging
More information about the pkg-multimedia-commits
mailing list