[SCM] csound packaging branch, master, updated. debian/5.12.1.dfsg-5

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit abf53ce0f9bae9d5c7b650d6855b5cb6dc15098e
Author: Felipe Sateler <fsateler at gmail.com>
Date:   Thu Aug 5 11:51:04 2010 -0400

    Do not print error message when RAWwAVE_PATH is undefined

diff --git a/debian/patches/2013-no-rawwave-defined.diff b/debian/patches/2013-no-rawwave-defined.diff
new file mode 100644
index 0000000..6ca1517
--- /dev/null
+++ b/debian/patches/2013-no-rawwave-defined.diff
@@ -0,0 +1,32 @@
+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
+===================================================================
+--- 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 @@
+       const char *path = csound->GetEnv(csound, "RAWWAVE_PATH");
+     if(!path)
+       {
+-        csound->ErrorMsg(csound,
+-                         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,
++
++    csound_global_mutex_lock();
++    Stk::setRawwavePath(path);
++    csound_global_mutex_unlock();
++    csound->Message(csound,
+ 			Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
+-      }
+     int status = 0;
+     for(OENTRY *oentry = &oentries[0]; oentry->opname; oentry++)
+       {
diff --git a/debian/patches/series b/debian/patches/series
index e3952b1..78eabc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 2010-disable-multithread-sparc.patch
 2011-no-link-csoundac-python.diff
 2012-luaCsnd-soname.diff
+2013-no-rawwave-defined.diff

-- 
csound packaging