diff -Nru fluidsynth-2.1.1/.azure-pipelines-mac.yml fluidsynth-2.1.2/.azure-pipelines-mac.yml --- fluidsynth-2.1.1/.azure-pipelines-mac.yml 2020-02-16 18:55:28.000000000 +0000 +++ fluidsynth-2.1.2/.azure-pipelines-mac.yml 2020-04-06 08:40:37.000000000 +0000 @@ -7,9 +7,11 @@ - job: macOS pool: vmImage: 'macOS-10.14' +# recommended by https://github.com/Homebrew/brew/issues/2491#issuecomment-294207661 steps: - script: | - brew update + brew update || brew update + brew upgrade brew install glib gobject-introspection libsndfile pkg-config jack dbus-glib pulseaudio portaudio sdl2 displayName: 'Prerequisites' - script: | diff -Nru fluidsynth-2.1.1/.cirrus.yml fluidsynth-2.1.2/.cirrus.yml --- fluidsynth-2.1.1/.cirrus.yml 2020-02-16 18:55:28.000000000 +0000 +++ fluidsynth-2.1.2/.cirrus.yml 2020-04-06 08:40:37.000000000 +0000 @@ -7,7 +7,7 @@ image_family: freebsd-13-0-snap image_family: freebsd-12-0 - install_script: pwd && ls -la && pkg install -y cmake glib alsa-lib ladspa portaudio pulseaudio pkgconf sdl2 + install_script: pwd && ls -la && pkg update --force && pkg install -y cmake glib alsa-lib ladspa portaudio pulseaudio pkgconf sdl2 compile_script: pwd && ls -la && mkdir $HOME/fluidsynth_install/ && mkdir build && cd build && cmake -Werror=dev -DCMAKE_INSTALL_PREFIX=$HOME/fluidsynth_install -Denable-portaudio=1 -Denable-ladspa=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=0 -DNO_GUI=1 .. && make -j4 && make check && make install diff -Nru fluidsynth-2.1.1/cmake_admin/FindReadline.cmake fluidsynth-2.1.2/cmake_admin/FindReadline.cmake --- fluidsynth-2.1.1/cmake_admin/FindReadline.cmake 2020-02-16 18:55:28.000000000 +0000 +++ fluidsynth-2.1.2/cmake_admin/FindReadline.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# Try to find the READLINE library -# HAVE_READLINE - system has READLINE -# READLINE_INCLUDE_DIR - READLINE include directory -# READLINE_LIBRARIES - Libraries needed to use READLINE - -if ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) - set ( READLINE_FIND_QUIETLY TRUE ) -endif ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) - -find_path ( READLINE_INCLUDE_DIR NAMES history.h readline/history.h ) -find_library ( READLINE_LIBRARIES NAMES readline ) - -if ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) - set ( HAVE_READLINE TRUE CACHE BOOL "Found readline header and lib" FORCE ) -endif ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) - -include ( FindPackageHandleStandardArgs ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( READLINE DEFAULT_MSG - READLINE_INCLUDE_DIR - READLINE_LIBRARIES ) - -mark_as_advanced( READLINE_INCLUDE_DIR READLINE_LIBRARIES HAVE_READLINE ) diff -Nru fluidsynth-2.1.1/cmake_admin/FindREADLINE.cmake fluidsynth-2.1.2/cmake_admin/FindREADLINE.cmake --- fluidsynth-2.1.1/cmake_admin/FindREADLINE.cmake 1970-01-01 00:00:00.000000000 +0000 +++ fluidsynth-2.1.2/cmake_admin/FindREADLINE.cmake 2020-04-06 08:40:37.000000000 +0000 @@ -0,0 +1,22 @@ +# Try to find the READLINE library +# HAVE_READLINE - system has READLINE +# READLINE_INCLUDE_DIR - READLINE include directory +# READLINE_LIBRARIES - Libraries needed to use READLINE + +if ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) + set ( READLINE_FIND_QUIETLY TRUE ) +endif ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) + +find_path ( READLINE_INCLUDE_DIR NAMES history.h readline/history.h ) +find_library ( READLINE_LIBRARIES NAMES readline ) + +if ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) + set ( HAVE_READLINE TRUE CACHE BOOL "Found readline header and lib" FORCE ) +endif ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES ) + +include ( FindPackageHandleStandardArgs ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( READLINE DEFAULT_MSG + READLINE_INCLUDE_DIR + READLINE_LIBRARIES ) + +mark_as_advanced( READLINE_INCLUDE_DIR READLINE_LIBRARIES HAVE_READLINE ) diff -Nru fluidsynth-2.1.1/CMakeLists.txt fluidsynth-2.1.2/CMakeLists.txt --- fluidsynth-2.1.1/CMakeLists.txt 2020-02-16 18:55:28.000000000 +0000 +++ fluidsynth-2.1.2/CMakeLists.txt 2020-04-06 08:40:37.000000000 +0000 @@ -29,7 +29,7 @@ # FluidSynth package version set ( FLUIDSYNTH_VERSION_MAJOR 2 ) set ( FLUIDSYNTH_VERSION_MINOR 1 ) -set ( FLUIDSYNTH_VERSION_MICRO 1 ) +set ( FLUIDSYNTH_VERSION_MICRO 2 ) set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" ) set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" ) @@ -44,7 +44,7 @@ # This is not exactly the same algorithm as the libtool one, but the results are the same. set ( LIB_VERSION_CURRENT 2 ) set ( LIB_VERSION_AGE 3 ) -set ( LIB_VERSION_REVISION 1 ) +set ( LIB_VERSION_REVISION 2 ) set ( LIB_VERSION_INFO "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" ) @@ -583,7 +583,7 @@ if ( enable-readline ) pkg_check_modules ( READLINE readline ) if ( NOT READLINE_FOUND ) - find_package ( Readline ) + find_package ( READLINE ) set ( READLINE_FOUND ${HAVE_READLINE} ) endif ( NOT READLINE_FOUND ) if ( READLINE_FOUND ) diff -Nru fluidsynth-2.1.1/debian/changelog fluidsynth-2.1.2/debian/changelog --- fluidsynth-2.1.1/debian/changelog 2020-03-04 20:20:05.000000000 +0000 +++ fluidsynth-2.1.2/debian/changelog 2020-04-30 18:08:17.000000000 +0000 @@ -1,3 +1,11 @@ +fluidsynth (2.1.2-1) unstable; urgency=medium + + * New upstream version 2.1.2 + * Drop patches, applied by upstream + * Bump dh-compat to 13 + + -- Dennis Braun Thu, 30 Apr 2020 20:08:17 +0200 + fluidsynth (2.1.1-2) unstable; urgency=medium * Team upload. diff -Nru fluidsynth-2.1.1/debian/control fluidsynth-2.1.2/debian/control --- fluidsynth-2.1.1/debian/control 2020-02-28 22:29:55.000000000 +0000 +++ fluidsynth-2.1.2/debian/control 2020-04-30 18:08:17.000000000 +0000 @@ -9,7 +9,7 @@ Dennis Braun Build-Depends: cmake, - debhelper-compat (= 12), + debhelper-compat (= 13), ladspa-sdk, libasound2-dev, libdbus-1-dev, diff -Nru fluidsynth-2.1.1/debian/patches/0001-Turn-SDL2-initialization-message-into-a-warning.patch fluidsynth-2.1.2/debian/patches/0001-Turn-SDL2-initialization-message-into-a-warning.patch --- fluidsynth-2.1.1/debian/patches/0001-Turn-SDL2-initialization-message-into-a-warning.patch 2020-03-04 20:18:52.000000000 +0000 +++ fluidsynth-2.1.2/debian/patches/0001-Turn-SDL2-initialization-message-into-a-warning.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From a359e7f222deb0ea5fea01f963fd878ecfd19a1a Mon Sep 17 00:00:00 2001 -From: derselbst -Date: Tue, 3 Mar 2020 16:15:32 +0100 -Subject: [PATCH 1/3] Turn SDL2 initialization message into a warning - -Resolves #622 ---- - src/drivers/fluid_sdl2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drivers/fluid_sdl2.c b/src/drivers/fluid_sdl2.c -index be49dff..3468609 100644 ---- a/src/drivers/fluid_sdl2.c -+++ b/src/drivers/fluid_sdl2.c -@@ -60,7 +60,7 @@ void fluid_sdl2_audio_driver_settings(fluid_settings_t *settings) - - if(!SDL_WasInit(SDL_INIT_AUDIO)) - { -- FLUID_LOG(FLUID_ERR, "SDL2 not initialized"); -+ FLUID_LOG(FLUID_WARN, "SDL2 not initialized, SDL2 audio driver won't be usable"); - return; - } - --- -2.25.0 - diff -Nru fluidsynth-2.1.1/debian/patches/0002-Exit-with-error-when-invalid-commandline-arguments-a.patch fluidsynth-2.1.2/debian/patches/0002-Exit-with-error-when-invalid-commandline-arguments-a.patch --- fluidsynth-2.1.1/debian/patches/0002-Exit-with-error-when-invalid-commandline-arguments-a.patch 2020-03-04 20:19:02.000000000 +0000 +++ fluidsynth-2.1.2/debian/patches/0002-Exit-with-error-when-invalid-commandline-arguments-a.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,171 +0,0 @@ -From 33f687704ffab537771f699a832e21ffaef983f9 Mon Sep 17 00:00:00 2001 -From: derselbst -Date: Tue, 3 Mar 2020 16:46:50 +0100 -Subject: [PATCH 2/3] Exit with error when invalid commandline arguments are - supplied - -Resolves #623 ---- - src/fluidsynth.c | 65 ++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 52 insertions(+), 13 deletions(-) - -diff --git a/src/fluidsynth.c b/src/fluidsynth.c -index a63bc6d..a1ea2ba 100644 ---- a/src/fluidsynth.c -+++ b/src/fluidsynth.c -@@ -490,7 +490,10 @@ int main(int argc, char **argv) - } - else - { -- fluid_settings_setstr(settings, "audio.driver", optarg); -+ if(fluid_settings_setstr(settings, "audio.driver", optarg) != FLUID_OK) -+ { -+ goto cleanup; -+ } - } - - break; -@@ -508,7 +511,10 @@ int main(int argc, char **argv) - break; - - case 'c': -- fluid_settings_setint(settings, "audio.periods", atoi(optarg)); -+ if(fluid_settings_setint(settings, "audio.periods", atoi(optarg)) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - - case 'd': -@@ -533,7 +539,10 @@ int main(int argc, char **argv) - } - else - { -- fluid_settings_setstr(settings, "audio.file.endian", optarg); -+ if(fluid_settings_setstr(settings, "audio.file.endian", optarg) != FLUID_OK) -+ { -+ goto cleanup; -+ } - } - - break; -@@ -543,7 +552,10 @@ int main(int argc, char **argv) - break; - - case 'F': -- fluid_settings_setstr(settings, "audio.file.name", optarg); -+ if(fluid_settings_setstr(settings, "audio.file.name", optarg) != FLUID_OK) -+ { -+ goto cleanup; -+ } - fast_render = 1; - break; - -@@ -552,7 +564,10 @@ int main(int argc, char **argv) - break; - - case 'g': -- fluid_settings_setnum(settings, "synth.gain", atof(optarg)); -+ if(fluid_settings_setnum(settings, "synth.gain", atof(optarg)) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - - case 'h': -@@ -572,12 +587,18 @@ int main(int argc, char **argv) - break; - - case 'K': -- fluid_settings_setint(settings, "synth.midi-channels", atoi(optarg)); -+ if(fluid_settings_setint(settings, "synth.midi-channels", atoi(optarg)) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - - case 'L': - audio_channels = atoi(optarg); -- fluid_settings_setint(settings, "synth.audio-channels", audio_channels); -+ if(fluid_settings_setint(settings, "synth.audio-channels", audio_channels) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - - case 'l': /* disable LASH */ -@@ -596,7 +617,10 @@ int main(int argc, char **argv) - } - else - { -- fluid_settings_setstr(settings, "midi.driver", optarg); -+ if(fluid_settings_setstr(settings, "midi.driver", optarg) != FLUID_OK) -+ { -+ goto cleanup; -+ } - } - - break; -@@ -636,7 +660,10 @@ int main(int argc, char **argv) - break; - - case 'p' : -- fluid_settings_setstr(settings, "midi.portname", optarg); -+ if(fluid_settings_setstr(settings, "midi.portname", optarg) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - - case 'q': -@@ -665,7 +692,10 @@ int main(int argc, char **argv) - break; - - case 'r': -- fluid_settings_setnum(settings, "synth.sample-rate", atof(optarg)); -+ if(fluid_settings_setnum(settings, "synth.sample-rate", atof(optarg)) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - - case 's': -@@ -692,7 +722,10 @@ int main(int argc, char **argv) - } - else - { -- fluid_settings_setstr(settings, "audio.file.type", optarg); -+ if(fluid_settings_setstr(settings, "audio.file.type", optarg) != FLUID_OK) -+ { -+ goto cleanup; -+ } - } - - break; -@@ -710,7 +743,10 @@ int main(int argc, char **argv) - break; - - case 'z': -- fluid_settings_setint(settings, "audio.period-size", atoi(optarg)); -+ if(fluid_settings_setint(settings, "audio.period-size", atoi(optarg)) != FLUID_OK) -+ { -+ goto cleanup; -+ } - break; - #ifdef GETOPT_SUPPORT - -@@ -780,7 +816,10 @@ int main(int argc, char **argv) - - if(audio_groups != 0) - { -- fluid_settings_setint(settings, "synth.audio-groups", audio_groups); -+ if(fluid_settings_setint(settings, "synth.audio-groups", audio_groups) != FLUID_OK) -+ { -+ goto cleanup; -+ } - } - - if(fast_render) --- -2.25.0 - diff -Nru fluidsynth-2.1.1/debian/patches/series fluidsynth-2.1.2/debian/patches/series --- fluidsynth-2.1.1/debian/patches/series 2020-03-04 20:19:02.000000000 +0000 +++ fluidsynth-2.1.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -0002-Exit-with-error-when-invalid-commandline-arguments-a.patch -0001-Turn-SDL2-initialization-message-into-a-warning.patch diff -Nru fluidsynth-2.1.1/doc/Doxyfile fluidsynth-2.1.2/doc/Doxyfile --- fluidsynth-2.1.1/doc/Doxyfile 2020-02-16 18:55:28.000000000 +0000 +++ fluidsynth-2.1.2/doc/Doxyfile 2020-04-06 08:40:37.000000000 +0000 @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = libfluidsynth -PROJECT_NUMBER = 2.1.1 +PROJECT_NUMBER = 2.1.2 OUTPUT_DIRECTORY = api CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff -Nru fluidsynth-2.1.1/doc/fluidsettings.xml fluidsynth-2.1.2/doc/fluidsettings.xml --- fluidsynth-2.1.1/doc/fluidsettings.xml 2020-02-16 18:55:28.000000000 +0000 +++ fluidsynth-2.1.2/doc/fluidsettings.xml 2020-04-06 08:40:37.000000000 +0000 @@ -354,8 +354,7 @@ - - +