[SCM] gsequencer/master: remove work-around patch because final fix available

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Sun Feb 5 14:58:24 UTC 2017


The following commit has been merged in the master branch:
commit 1a2419216605dee30df1bd2393eccbd3dbfb2427
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Sun Feb 5 15:05:19 2017 +0100

    remove work-around patch because final fix available

diff --git a/debian/patches/fix-thread-posix.patch b/debian/patches/fix-thread-posix.patch
deleted file mode 100644
index e6f4efc..0000000
--- a/debian/patches/fix-thread-posix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: This patch is considered critical since it fixes the beginning
- of the data-race. It has a strong relation with soundcard output. Since
- the start of threads has some uncertainity about when it is ready. It
- has a need for 2 tics to be ready and not only 1.
- Note this is a work-around, better would be add 1 tic to tic_delay field as
- it's in sync. But it's not evident when it happens.
-Author: Joël Krähmann <jkraehemann at gmail.com>
-Applied-Upstream: 0.7.122.x, http://git.savannah.gnu.org/cgit/gsequencer.git
-Last-Update: 2017-01-31
---- a/ags/thread/ags_thread-posix.c
-+++ b/ags/thread/ags_thread-posix.c
-@@ -2288,6 +2288,7 @@
- 	
- 	chaos_tree = ags_thread_chaos_tree(thread);
- 
-+	//FIXME:JK: it works but I think its wrong
- 	/* set tic delay */
- 	if((AGS_THREAD_INTERMEDIATE_PRE_SYNC & (g_atomic_int_get(&(thread->flags)))) != 0){
- 	  /* intermediate pre sync */
-@@ -2298,10 +2299,12 @@
- 	  }
- 	}else if((AGS_THREAD_INTERMEDIATE_POST_SYNC & (g_atomic_int_get(&(thread->flags)))) != 0){
- 	  /* intermediate post sync */
--	  if(chaos_tree->tic_delay < thread->delay){
--	    thread->tic_delay = chaos_tree->tic_delay + 1;
--	  }else{
-+	  if(chaos_tree->tic_delay + 1 < thread->delay){
-+	    thread->tic_delay = chaos_tree->tic_delay + 2;
-+	  }else if(chaos_tree->tic_delay + 1 == thread->delay){
- 	    thread->tic_delay = 0;
-+	  }else{
-+	    thread->tic_delay = 1;
- 	  }
- 	}else{
- 	  /* ordinary sync */
diff --git a/debian/patches/series b/debian/patches/series
index 2c690a4..391dbf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,7 +37,6 @@ wish-mute-audio.patch
 wish-mute-audio-signal.patch
 fix-jack-midiin.patch
 fix-xorg-application-context.patch
-fix-thread-posix.patch
 fix-makefile-am.patch
 fix-machine-selector.patch
 fix-pad-callbacks.patch

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list