From fd3ab10e5bedde17926e78b907f7c7d207463a93 Mon Sep 17 00:00:00 2001 From: clfreville2 Date: Sun, 14 May 2023 17:46:58 +0200 Subject: [PATCH] Fix SIGTERM signal handling asix uses the SIGTERM signal to rerun the simulation. Since SDL2 registers a signal handler, killing the old simulation does not have any effect. The usual way to deal with that is to poll SDL events, but since SDL is only used for audio here, a single line change does the job. --- build-package.sh | 2 +- debian/changelog | 12 +++++++++--- debian/patches/remove-sdl-signal-handler.patch | 12 ++++++++++++ debian/patches/series | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 debian/patches/remove-sdl-signal-handler.patch diff --git a/build-package.sh b/build-package.sh index 372abe6..36e14c8 100755 --- a/build-package.sh +++ b/build-package.sh @@ -2,7 +2,7 @@ set -euo pipefail -declare -r VERSION='0.1.4-1' +declare -r VERSION='0.1.4-2' declare -r ORIG_VERSION='0.1.4' declare -r ORIG_FILE="asix_$ORIG_VERSION.orig.tar.gz" diff --git a/debian/changelog b/debian/changelog index 85b9d03..4af1190 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +asix (0.1.4-2) jammy; urgency=low + + * Handle SIGTERM signals + + -- Clément Fréville Sun, 14 May 2023 17:34:10 +0200 + asix (0.1.4-1) jammy; urgency=medium * Merge with source @@ -5,19 +11,19 @@ asix (0.1.4-1) jammy; urgency=medium -- Clément Fréville Sat, 06 May 2023 15:31:25 +0200 -asix (1.1.3) jammy; urgency=low +asix (1.1.3-1) jammy; urgency=low * Merge with source -- Clément Fréville Wed, 18 May 2022 17:16:51 +0200 -asix (1.1.2) jammy; urgency=medium +asix (1.1.2-1) jammy; urgency=medium * Merge with source -- Clément Fréville Tue, 17 May 2022 07:22:35 +0200 -asix (1.1.1) jammy; urgency=medium +asix (1.1.1-1) jammy; urgency=medium * Merge with source * Add bash completion diff --git a/debian/patches/remove-sdl-signal-handler.patch b/debian/patches/remove-sdl-signal-handler.patch new file mode 100644 index 0000000..be1ee7a --- /dev/null +++ b/debian/patches/remove-sdl-signal-handler.patch @@ -0,0 +1,12 @@ +--- a/src/tone/tone.cpp ++++ b/src/tone/tone.cpp +@@ -248,7 +248,8 @@ + + void initTone() { + +- if(SDL_Init( SDL_INIT_AUDIO ) < 0) { ++ SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1"); ++ if(SDL_Init( SDL_INIT_AUDIO ) < 0) { + printf("Erreur d'initialisation de la SDL : %s",SDL_GetError());//on affiche l'erreur + exit( EXIT_FAILURE); + } diff --git a/debian/patches/series b/debian/patches/series index b1ff27f..41bc263 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ add-install-target.patch fix-macro-conflict.patch +remove-sdl-signal-handler.patch