Hello community, here is the log from the commit of package qsynth for openSUSE:Factory checked in at 2018-10-01 08:20:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qsynth (Old) and /work/SRC/openSUSE:Factory/.qsynth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qsynth" Mon Oct 1 08:20:00 2018 rev:2 rq:639130 version:0.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qsynth/qsynth.changes 2018-02-23 15:29:17.167632347 +0100 +++ /work/SRC/openSUSE:Factory/.qsynth.new/qsynth.changes 2018-10-01 08:20:25.913852451 +0200 @@ -1,0 +2,19 @@ +Thu Sep 27 11:37:32 UTC 2018 - Luigi Baldoni <[email protected]> + +- Update to version 0.5.2 + * AppData/AppStream metadata is now settled under an all + permisssive license (FSFAP). + version 0.5.1 + * Disable singleton/unique application instance setup logic + when the display server platform is not X11. + * Fixed deprecated calls to fluid_synth_get_channel_info(), + fluid_synth_set_midi_router() and fluid_settings_getstr() + (as signaled on libfluidsynth >= 1.1.9). + * A little hardening on the configure (autoconf) macro side. + +- Backported fluidsynthv2_overhaul.patch, fluidsynthv2_cmake.patch, + fluidsynthv2_more.patch, fluidsynthv2_copyright.patch, + fluidsynthv2_last.patch and fluidsynthv2_version.patch to + support fluidsynth 2.0.0 + +------------------------------------------------------------------- Old: ---- qsynth-0.5.0.tar.gz New: ---- fluidsynthv2_cmake.patch fluidsynthv2_copyright.patch fluidsynthv2_last.patch fluidsynthv2_more.patch fluidsynthv2_overhaul.patch fluidsynthv2_version.patch qsynth-0.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qsynth.spec ++++++ --- /var/tmp/diff_new_pack.EylbXM/_old 2018-10-01 08:20:26.389852148 +0200 +++ /var/tmp/diff_new_pack.EylbXM/_new 2018-10-01 08:20:26.389852148 +0200 @@ -13,24 +13,31 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: qsynth -Version: 0.5.0 +Version: 0.5.2 Release: 0 Summary: Graphical User Interface for fluidsynth -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Midi URL: https://qsynth.sourceforge.net/qsynth-index.html Source: https://sourceforge.net/projects/qsynth/files/qsynth/%{version}/qsynth-%{version}.tar.gz Patch1: qsynth-fix_desktop_file.patch +Patch2: fluidsynthv2_overhaul.patch +Patch3: fluidsynthv2_cmake.patch +Patch4: fluidsynthv2_more.patch +Patch5: fluidsynthv2_copyright.patch +Patch6: fluidsynthv2_last.patch +Patch7: fluidsynthv2_version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist +BuildRequires: libqt5-linguist-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -50,9 +57,16 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build export QT_HASH_SEED=0 +autoreconf -fiv %configure \ --enable-system-tray \ --enable-gradient ++++++ fluidsynthv2_cmake.patch ++++++ ++++ 5409 lines (skipped) ++++++ fluidsynthv2_copyright.patch ++++++ >From e1871e10b1508ae1327ff48975f7effbadba3d0c Mon Sep 17 00:00:00 2001 From: rncbc <[email protected]> Date: Thu, 23 Aug 2018 17:18:49 +0100 Subject: [PATCH] - Bumped some updated copyright headers.. --- src/qsynthAboutForm.cpp | 4 ++-- src/qsynthAboutForm.h | 2 +- src/qsynthAboutForm.ui | 2 +- src/qsynthChannelsForm.ui | 2 +- src/qsynthMainForm.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qsynthAboutForm.cpp b/src/qsynthAboutForm.cpp index ab4dd1e..f8a54cf 100644 --- a/src/qsynthAboutForm.cpp +++ b/src/qsynthAboutForm.cpp @@ -1,7 +1,7 @@ // qsynthAboutForm.cpp // /**************************************************************************** - Copyright (C) 2003-2017, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -49,7 +49,7 @@ qsynthAboutForm::qsynthAboutForm ( #ifndef CONFIG_FLUID_SERVER list << tr("Server option disabled."); #endif -#ifndef CONFIG_FLUID_RESET +#ifndef CONFIG_FLUID_SYSTEM_RESET list << tr("System reset option disabled."); #endif #ifndef CONFIG_FLUID_BANK_OFFSET diff --git a/src/qsynthAboutForm.h b/src/qsynthAboutForm.h index 12fcc25..0cf1ea5 100644 --- a/src/qsynthAboutForm.h +++ b/src/qsynthAboutForm.h @@ -1,7 +1,7 @@ // qsynthAboutForm.h // /**************************************************************************** - Copyright (C) 2003-2017, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/qsynthAboutForm.ui b/src/qsynthAboutForm.ui index c144dc9..27ba288 100644 --- a/src/qsynthAboutForm.ui +++ b/src/qsynthAboutForm.ui @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsynth - A fluidsynth Qt GUI Interface. - Copyright (C) 2003-2017, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/qsynthChannelsForm.ui b/src/qsynthChannelsForm.ui index f94ecf8..f8a8c31 100644 --- a/src/qsynthChannelsForm.ui +++ b/src/qsynthChannelsForm.ui @@ -2,7 +2,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsynth - A fluidsynth Qt GUI Interface. - Copyright (C) 2003-2014, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/qsynthMainForm.cpp b/src/qsynthMainForm.cpp index d7283cb..2a2007f 100644 --- a/src/qsynthMainForm.cpp +++ b/src/qsynthMainForm.cpp @@ -1247,7 +1247,7 @@ void qsynthMainForm::systemReset (void) qsynthEngine *pEngine = currentEngine(); if (pEngine && pEngine->pSynth) { - #ifdef CONFIG_FLUID_RESET + #ifdef CONFIG_FLUID_SYSTEM_RESET appendMessagesColor(pEngine->name() + ": fluid_synth_system_reset()", "#993366"); ::fluid_synth_system_reset(pEngine->pSynth); ++++++ fluidsynthv2_last.patch ++++++ >From 204f4daaefc72101e214fc8a73fe89fb63471324 Mon Sep 17 00:00:00 2001 From: rncbc <[email protected]> Date: Sat, 15 Sep 2018 15:24:21 +0100 Subject: [PATCH] - Fixed last adaptations for building against FluidSynth API V2 (>= 2.0.0). --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 709b45c..97d4f18 100644 --- a/configure.ac +++ b/configure.ac @@ -571,7 +571,7 @@ if test "x$ac_cv_fluidsynth2" = "xyes"; then AC_DEFINE(CONFIG_FLUID_SETTINGS_GETINT_DEFAULT, 1, [Define if fluid_settings_getint_default is available.]) fi # Check for fluid_settings_getstr_default function. - AC_CHECK_LIB(fluidsynth, fluid_settings_getstr_default, [ac_fluid_settings_getint_default="yes"], [ac_fluid_settings_getstr_default="no"]) + AC_CHECK_LIB(fluidsynth, fluid_settings_getstr_default, [ac_fluid_settings_getstr_default="yes"], [ac_fluid_settings_getstr_default="no"]) if test "x$ac_fluid_settings_getstr_default" = "xyes"; then AC_DEFINE(CONFIG_FLUID_SETTINGS_GETSTR_DEFAULT, 1, [Define if fluid_settings_getstr_default is available.]) fi ++++++ fluidsynthv2_more.patch ++++++ >From 9f847e405e9514c21e1032823b348e9d5e003311 Mon Sep 17 00:00:00 2001 From: rncbc <[email protected]> Date: Thu, 23 Aug 2018 17:06:48 +0100 Subject: [PATCH] - More adaptations for building against FluidSynth API V2 (>= 2.0.0). --- configure.ac | 112 ++++++++++++++++++--------------------------------- 1 file changed, 40 insertions(+), 72 deletions(-) diff --git a/configure.ac b/configure.ac index 9ad1ff6..709b45c 100644 --- a/configure.ac +++ b/configure.ac @@ -550,80 +550,48 @@ if test "x$ac_fluid_synth_get_chorus_depth" = "xyes"; then fi -# Check for fluid_settings_getnum_default function. -AC_CACHE_CHECK([for fluid_settings_getnum_default], - ac_cv_fluid_settings_getnum_default, [ +# Check for FluidSynth API V2 (>= 2.0.0). +AC_CACHE_CHECK([for FluidSynth API V2 (>= 2.0.0)], + ac_cv_fluidsynth2, [ AC_TRY_COMPILE([#include "fluidsynth.h"], [ - fluid_settings_t *p; const char *s; double v; - fluid_settings_getnum_default(p, s, &v); - ], ac_cv_fluid_settings_getnum_default="yes", ac_cv_fluid_settings_getnum_default="no") + #if FLUIDSYNTH_VERSION_MAJOR < 2 + #error FluidSynth API V2 or greater is not available. + #endif + ], ac_cv_fluidsynth2="yes", ac_cv_fluidsynth2="no") ]) -if test "x$ac_cv_fluid_settings_getnum_default" = "xyes"; then - AC_DEFINE(CONFIG_FLUID_SETTINGS_GETNUM_DEFAULT, 1, [Define if fluid_settings_getnum_default is available.]) -fi - -# Check for fluid_settings_getint_default function. -AC_CACHE_CHECK([for fluid_settings_getint_default], - ac_cv_fluid_settings_getint_default, [ - AC_TRY_COMPILE([#include "fluidsynth.h"], [ - fluid_settings_t *p; const char *s; int v; - fluid_settings_getint_default(p, s, &v); - ], ac_cv_fluid_settings_getint_default="yes", ac_cv_fluid_settings_getint_default="no") -]) -if test "x$ac_cv_fluid_settings_getint_default" = "xyes"; then - AC_DEFINE(CONFIG_FLUID_SETTINGS_GETINT_DEFAULT, 1, [Define if fluid_settings_getint_default is available.]) -fi - -# Check for fluid_settings_getstr_default function. -AC_CACHE_CHECK([for fluid_settings_getstr_default], - ac_cv_fluid_settings_getstr_default, [ - AC_TRY_COMPILE([#include "fluidsynth.h"], [ - fluid_settings_t *p; const char *s; char *v; - fluid_settings_getstr_default(p, s, &v); - ], ac_cv_fluid_settings_getstr_default="yes", ac_cv_fluid_settings_getstr_default="no") -]) -if test "x$ac_cv_fluid_settings_getstr_default" = "xyes"; then - AC_DEFINE(CONFIG_FLUID_SETTINGS_GETSTR_DEFAULT, 1, [Define if fluid_settings_getstr_default is available.]) -fi - - -# Check for fluid_settings_foreach function. -AC_CACHE_CHECK([for fluid_settings_foreach], - ac_cv_fluid_settings_foreach, [ - AC_TRY_COMPILE([#include "fluidsynth.h"], [ - void qsynth_settings_foreach(void *, const char *, int); - fluid_settings_foreach_t p = qsynth_settings_foreach; - ], ac_cv_fluid_settings_foreach="yes", ac_cv_fluid_settings_foreach="no") -]) -if test "x$ac_cv_fluid_settings_foreach" = "xyes"; then - AC_DEFINE(CONFIG_FLUID_SETTINGS_FOREACH, 1, [Define if fluid_settings_foreach is available.]) -fi - -# Check for fluid_settings_foreach_option function. -AC_CACHE_CHECK([for fluid_settings_foreach_option], - ac_cv_fluid_settings_foreach_option, [ - AC_TRY_COMPILE([#include "fluidsynth.h"], [ - void qsynth_settings_foreach_option(void *, const char *, const char *); - fluid_settings_foreach_option_t p = qsynth_settings_foreach_option; - ], ac_cv_fluid_settings_foreach_option="yes", ac_cv_fluid_settings_foreach_option="no") -]) -if test "x$ac_cv_fluid_settings_foreach_option" = "xyes"; then - AC_DEFINE(CONFIG_FLUID_SETTINGS_FOREACH_OPTION, 1, [Define if fluid_settings_foreach_option is available.]) -fi - - -# Check for new_fluid_server function. -if test "x$ac_fluid_server" = "xyes"; then - AC_CACHE_CHECK([for new_fluid_server], - ac_cv_new_fluid_server, [ - AC_TRY_COMPILE([#include "fluidsynth.h"], [ - fluid_settings_t *p; fluid_synth_t *q; fluid_midi_router_t *r; - new_fluid_server(p, q, r); - ], ac_cv_new_fluid_server="yes", ac_cv_new_fluid_server="no") - ]) - if test "x$ac_cv_new_fluid_server" = "xyes"; then - AC_DEFINE(CONFIG_NEW_FLUID_SERVER, 1, [Define if new_fluid_server is available.]) - fi +if test "x$ac_cv_fluidsynth2" = "xyes"; then + # Check for fluid_settings_getnum_default function. + AC_CHECK_LIB(fluidsynth, fluid_settings_getnum_default, [ac_fluid_settings_getnum_default="yes"], [ac_fluid_settings_getnum_default="no"]) + if test "x$ac_fluid_settings_getnum_default" = "xyes"; then + AC_DEFINE(CONFIG_FLUID_SETTINGS_GETNUM_DEFAULT, 1, [Define if fluid_settings_getnum_default is available.]) + fi + # Check for fluid_settings_getint_default function. + AC_CHECK_LIB(fluidsynth, fluid_settings_getint_default, [ac_fluid_settings_getint_default="yes"], [ac_fluid_settings_getint_default="no"]) + if test "x$ac_fluid_settings_getint_default" = "xyes"; then + AC_DEFINE(CONFIG_FLUID_SETTINGS_GETINT_DEFAULT, 1, [Define if fluid_settings_getint_default is available.]) + fi + # Check for fluid_settings_getstr_default function. + AC_CHECK_LIB(fluidsynth, fluid_settings_getstr_default, [ac_fluid_settings_getint_default="yes"], [ac_fluid_settings_getstr_default="no"]) + if test "x$ac_fluid_settings_getstr_default" = "xyes"; then + AC_DEFINE(CONFIG_FLUID_SETTINGS_GETSTR_DEFAULT, 1, [Define if fluid_settings_getstr_default is available.]) + fi + # Check for fluid_settings_foreach function. + AC_CHECK_LIB(fluidsynth, fluid_settings_foreach, [ac_fluid_settings_foreach="yes"], [ac_fluid_settings_foreach="no"]) + if test "x$ac_fluid_settings_foreach" = "xyes"; then + AC_DEFINE(CONFIG_FLUID_SETTINGS_FOREACH, 1, [Define if fluid_settings_foreach is available.]) + fi + # Check for fluid_settings_foreach_option function. + AC_CHECK_LIB(fluidsynth, fluid_settings_foreach_option, [ac_fluid_settings_foreach_option="yes"], [ac_fluid_settings_foreach_option="no"]) + if test "x$ac_fluid_settings_foreach_option" = "xyes"; then + AC_DEFINE(CONFIG_FLUID_SETTINGS_FOREACH_OPTION, 1, [Define if fluid_settings_foreach_option is available.]) + fi + # Check for new_fluid_server function. + if test "x$ac_fluid_server" = "xyes"; then + AC_CHECK_LIB(fluidsynth, new_fluid_server, [ac_new_fluid_server="yes"], [ac_new_fluid_server="no"]) + if test "x$ac_new_fluid_server" = "xyes"; then + AC_DEFINE(CONFIG_NEW_FLUID_SERVER, 1, [Define if new_fluid_server is available.]) + fi + fi fi ++++++ fluidsynthv2_overhaul.patch ++++++ ++++ 773 lines (skipped) ++++++ fluidsynthv2_version.patch ++++++ >From cbf63270cfa6f97f606d684843076f81475e8020 Mon Sep 17 00:00:00 2001 From: rncbc <[email protected]> Date: Thu, 20 Sep 2018 09:53:41 +0100 Subject: [PATCH] - Current FluidSynth version information added to command line output (-V, --version). --- src/qsynthOptions.cpp | 2 ++ 1 files changed, 2 insertions(+) diff --git a/src/qsynthOptions.cpp b/src/qsynthOptions.cpp index 20d0983..7ef58ad 100644 --- a/src/qsynthOptions.cpp +++ b/src/qsynthOptions.cpp @@ -382,6 +382,8 @@ bool qsynthOptions::parse_args ( const QStringList& args ) else if (sArg == "-V" || sArg == "--version") { out << QString("Qt: %1\n") .arg(qVersion()); + out << QString("FluidSynth: %1\n") + .arg(::fluid_version_str()); out << QString("%1: %2\n") .arg(QSYNTH_TITLE) .arg(CONFIG_BUILD_VERSION); ++++++ qsynth-0.5.0.tar.gz -> qsynth-0.5.2.tar.gz ++++++ ++++ 3593 lines of diff (skipped)
