From 9d65db6b8c66f27c65d9bf525015788aa2dd21d5 Mon Sep 17 00:00:00 2001
From: green <green@fedoraproject.org>
Date: Oct 10 2007 21:31:26 +0000
Subject: add unzombify patch


---

diff --git a/zynaddsubfx-unzombify.patch b/zynaddsubfx-unzombify.patch
new file mode 100644
index 0000000..3a2c3d6
--- /dev/null
+++ b/zynaddsubfx-unzombify.patch
@@ -0,0 +1,20 @@
+--- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C~	2007-10-10 15:12:05.000000000 -0400
++++ ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C	2007-10-10 15:17:59.047476392 -0400
+@@ -77,9 +77,14 @@
+     jack_default_audio_sample_t *outl=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_left, nframes);
+     jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
+ 
+-    pthread_mutex_lock(&jackmaster->mutex);
+-    jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
+-    pthread_mutex_unlock(&jackmaster->mutex);
++    if (!pthread_mutex_trylock(&jackmaster->mutex)) {
++      jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
++      pthread_mutex_unlock(&jackmaster->mutex);
++    }
++    else {
++      memset(outl, 0, sizeof(jack_default_audio_sample_t) * nframes);
++      memset(outr, 0, sizeof(jack_default_audio_sample_t) * nframes);
++    }
+     
+     return(0);
+ };
diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec
index d23d70b..8c1578d 100644
--- a/zynaddsubfx.spec
+++ b/zynaddsubfx.spec
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.2.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -9,6 +9,7 @@ Source0:        http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{ver
 Patch0:         zyn_lash-0.5.0pre0.diff
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
+Patch3:         zynaddsubfx-unzombify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -42,6 +43,7 @@ Documentation and examples for ZynAddSubFX
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 # fix microtuning bug (no keyboard mapping being done)
@@ -148,6 +150,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Wed Oct 10 2007 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 2.2.1-15
+- added tweaked unzombify patch by Lars Luthman (patch3), see:
+  http://sourceforge.net/tracker/index.php?func=detail&aid=1498438&group_id=62934&atid=502314
+
 * Fri Apr 06 2007 Anthony Green <green@redhat.com> 2.2.1-14
 - Rebuild with new ImageMagick for working desktop icons.