[SCM] gsequencer/master: added patch to exclude all timer related code

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Fri Feb 3 10:06:13 UTC 2017


The following commit has been merged in the master branch:
commit 12cee15f4a6842e8f8014aa5f0b16d3ae4a96325
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Fri Feb 3 11:05:42 2017 +0100

    added patch to exclude all timer related code

diff --git a/debian/patches/fix-gsequencer-main.patch b/debian/patches/fix-gsequencer-main.patch
new file mode 100644
index 0000000..64404be
--- /dev/null
+++ b/debian/patches/fix-gsequencer-main.patch
@@ -0,0 +1,127 @@
+Description: This patch fixes not excluded timer code by macro. Certain
+ platforms don't support the SIGRTMIN signal and thus don't compile the
+ code. It is safe to use this patch because timers are disabled by default.
+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-02-03
+--- a/ags/gsequencer_main.c
++++ b/ags/gsequencer_main.c
+@@ -121,6 +121,7 @@
+ 
+ extern volatile gboolean ags_show_start_animation;
+ 
++#ifndef AGS_USE_TIMER
+ void
+ ags_signal_handler(int signr)
+ {
+@@ -136,7 +137,9 @@
+     //    }
+   }
+ }
++#endif
+ 
++#ifdef AGS_USE_TIMER
+ void
+ ags_signal_handler_timer(int sig, siginfo_t *si, void *uc)
+ {
+@@ -152,6 +155,7 @@
+     pthread_mutex_unlock(AGS_THREAD(ags_application_context->main_loop)->timer_mutex);
+   //  signal(sig, SIG_IGN);
+ }
++#endif
+ 
+ static void
+ ags_signal_cleanup()
+@@ -267,6 +271,7 @@
+ 		 ags_start_animation_thread, window);
+ }
+ 
++#ifndef AGS_USE_TIMER
+ void
+ ags_setup(int argc, char **argv)
+ {
+@@ -424,6 +429,8 @@
+   ags_application_context->argc = argc;
+   ags_application_context->argv = argv;
+ 
++  ags_application_context_register_types(ags_application_context);
++
+   /* fix cross-references in managers */
+   lv2_worker_manager->thread_pool = ((AgsXorgApplicationContext *) ags_application_context)->thread_pool;
+   
+@@ -437,7 +444,9 @@
+   g_atomic_int_set(&(ags_show_start_animation),
+ 		   FALSE);
+ }
++#endif
+ 
++#ifndef AGS_USE_TIMER
+ void
+ ags_launch(gboolean single_thread)
+ {
+@@ -578,7 +587,9 @@
+     ags_thread_start((AgsThread *) single_thread);
+   }
+ }
++#endif
+ 
++#ifndef AGS_USE_TIMER
+ void
+ ags_launch_filename(gchar *filename,
+ 		    gboolean single_thread)
+@@ -747,7 +758,9 @@
+     		 NULL);
+   }
+ }
++#endif
+ 
++#ifdef AGS_USE_TIMER
+ timer_t*
+ ags_timer_setup()
+ {
+@@ -782,11 +795,13 @@
+   if(timer_create(CLOCK_MONOTONIC, &ags_sev_timer, timer_id) == -1){
+     perror("timer_create\0");
+     exit(EXIT_FAILURE);
+-  }
++  }  
+ 
+   return(timer_id);
+ }
++#endif
+ 
++#ifdef AGS_USE_TIMER
+ void
+ ags_timer_start(timer_t *timer_id)
+ {
+@@ -807,9 +822,11 @@
+   if(sigprocmask(SIG_UNBLOCK, &ags_timer_mask, NULL) == -1){
+     perror("sigprocmask\0");
+     exit(EXIT_FAILURE);
+-  }
++  }  
+ }
++#endif
+ 
++#ifdef AGS_USE_TIMER
+ void
+ ags_timer_launch(timer_t *timer_id,
+ 		 gboolean single_thread)
+@@ -954,7 +971,9 @@
+     ags_thread_start((AgsThread *) single_thread);
+   }
+ }
++#endif
+ 
++#ifdef AGS_USE_TIMER
+ void
+ ags_timer_launch_filename(timer_t *timer_id, gchar *filename,
+ 			  gboolean single_thread)
+@@ -1128,6 +1147,7 @@
+ 		 NULL);
+   }
+ }
++#endif
+ 
+ void
+ ags_show_file_error(gchar *filename,
diff --git a/debian/patches/series b/debian/patches/series
index 146c19a..49e1cb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-gsequencer-main.patch
 wish-indicator.patch
 wish-recall-channel.patch
 wish-recall-audio.patch

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list