From 4ee4b0403e9f461e8bff18a6a0e45f3731fb40cf Mon Sep 17 00:00:00 2001 From: derselbst Date: Fri, 22 Apr 2022 23:38:29 +0200 Subject: [PATCH 1/3] Fix Fluidsynth not responding to either SIGTERM nor SIGINT with recent SDL2 --- src/fluidsynth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fluidsynth.c b/src/fluidsynth.c index 55d1000f..ea383d79 100644 --- a/src/fluidsynth.c +++ b/src/fluidsynth.c @@ -400,7 +400,8 @@ int main(int argc, char **argv) #endif #if SDL2_SUPPORT - + // Tell SDL that it shouldn't intercept signals, otherwise SIGINT and SIGTERM won't quit fluidsynth + SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1"); if(SDL_Init(SDL_INIT_AUDIO) != 0) { fprintf(stderr, "Warning: Unable to initialize SDL2 Audio: %s", SDL_GetError()); From 50003761c10c938272b4dab5fcc5464ef00d9aa5 Mon Sep 17 00:00:00 2001 From: Tom M Date: Sat, 23 Apr 2022 09:58:05 +0200 Subject: [PATCH 2/3] Bump minimum required SDL2 version due to SDL_HINT_NO_SIGNAL_HANDLERS --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfef8b3a..0fc19ff4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -651,7 +651,7 @@ else(NOT enable-pkgconfig) unset ( SDL2_SUPPORT CACHE ) if ( enable-sdl2 ) - pkg_check_modules ( SDL2 sdl2 ) + pkg_check_modules ( SDL2 sdl2>=2.0.4 ) set ( SDL2_SUPPORT ${SDL2_FOUND} ) if ( SDL2_SUPPORT ) list( APPEND PC_REQUIRES_PRIV "sdl2") From 1daf0787080b48134b394d93ab4abe73a4d21b58 Mon Sep 17 00:00:00 2001 From: derselbst Date: Mon, 25 Apr 2022 20:18:10 +0200 Subject: [PATCH 3/3] Bump to 2.2.7 --- CMakeLists.txt | 6 +++--- doc/fluidsynth-v20-devdoc.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fc19ff4..41a61ef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ set ( PACKAGE "fluidsynth" ) # FluidSynth package version set ( FLUIDSYNTH_VERSION_MAJOR 2 ) set ( FLUIDSYNTH_VERSION_MINOR 2 ) -set ( FLUIDSYNTH_VERSION_MICRO 6 ) +set ( FLUIDSYNTH_VERSION_MICRO 7 ) set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" ) set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" ) @@ -52,8 +52,8 @@ set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" ) # if any interfaces have been removed/changed (compatibility broken): AGE=0 # This is not exactly the same algorithm as the libtool one, but the results are the same. set ( LIB_VERSION_CURRENT 3 ) -set ( LIB_VERSION_AGE 0 ) -set ( LIB_VERSION_REVISION 6 ) +set ( LIB_VERSION_AGE 1 ) +set ( LIB_VERSION_REVISION 0 ) set ( LIB_VERSION_INFO "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" ) diff --git a/doc/fluidsynth-v20-devdoc.txt b/doc/fluidsynth-v20-devdoc.txt index 0bf7ca17..8ffd63f5 100644 --- a/doc/fluidsynth-v20-devdoc.txt +++ b/doc/fluidsynth-v20-devdoc.txt @@ -8,8 +8,8 @@ \author David Henningsson \author Tom Moebert \author Copyright © 2003-2022 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert -\version Revision 2.2.6 -\date 2022-03-19 +\version Revision 2.2.7 +\date 2022-04-25 All the source code examples in this document are in the public domain; you can use them as you please. This document is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported License. To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/3.0/ . The FluidSynth library is distributed under the GNU Lesser General Public License. A copy of the GNU Lesser General Public License is contained in the FluidSynth package; if not, visit https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.