[SCM] csound/master: Acquire lock before using it on chnclear opcode (Closes: #603321)
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Thu Dec 16 23:59:56 UTC 2010
The following commit has been merged in the master branch:
commit 01d18bf1b5569c9366b23c7f2d53f3827e29c10c
Author: Felipe Sateler <fsateler at debian.org>
Date: Sat Nov 13 21:31:03 2010 -0300
Acquire lock before using it on chnclear opcode (Closes: #603321)
diff --git a/debian/patches/0001-acquire-lock-before-use.diff b/debian/patches/0001-acquire-lock-before-use.diff
new file mode 100644
index 0000000..2a2c99e
--- /dev/null
+++ b/debian/patches/0001-acquire-lock-before-use.diff
@@ -0,0 +1,15 @@
+Description: Acquire bus lock at init time
+ Otherwise we get segfaults when trying to use it at perf time
+Origin: upstream, commit:1.40
+Bug-Debian: http://bugs.debian.org/603321
+--- a/OOps/bus.c
++++ b/OOps/bus.c
+@@ -1056,6 +1056,8 @@
+ err = csoundGetChannelPtr(csound, &(p->fp), (char*) p->iname,
+ CSOUND_AUDIO_CHANNEL | CSOUND_OUTPUT_CHANNEL);
+ if (LIKELY(!err)) {
++ p->lock = csoundGetChannelLock(csound, (char*) p->iname,
++ CSOUND_AUDIO_CHANNEL | CSOUND_OUTPUT_CHANNEL);
+ p->h.opadr = (SUBR) chnclear_opcode_perf;
+ return OK;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 78eabc3..46cfd13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
0000-fix-continuation-segfaults.diff
+0001-acquire-lock-before-use.diff
1000-use-system-stk.diff
1003-abi-plugin-dir.diff
2000-avoid-nonfree-scansyn-plugin.diff
--
csound packaging
More information about the pkg-multimedia-commits
mailing list