fluidsynth: update to 2.2.0.

This release breaks ABI compatibility! Refer to the API docs for details.

A C++98 compliant compiler is now required to build fluidsynth (mailing list thread)

New features

    Support loading SoundFonts >2GiB on Windows (#629)
    Major overhaul of the sequencer and its event queue (#604)
        Overlapping notes can be handled (#637)
        Performance improvement, since the event queue no longer blocks the rendering thread
        Time scale is not limited to 1000 anymore and can therefore be used for tempo changes
    The following audio drivers have gained multi-channel support
        DSound (#667, thanks to @jjceresa)
        WaveOut (#667, thanks to @jjceresa)
    The WinMIDI driver supports multiple devices (#677, thanks to @jjceresa)
    Handle GS DT1 SysEx messages for setting whether a channel is used for rhythm part (#708, thanks to @chirs241097)
    Support use of UTF-8 filenames under Windows (#718, thanks to @getraid-gg)
    Improved support for overriding tempo of the MIDI player (#711, #713, thanks to @jjceresa)
    Handle settings-related commands in user command file before initializing other objects (#739)
    SoundFont loading has been parallelized (#746, #812, requires openMP)
    The Oboe driver has gained a lower latency and other updates (#740, #741, #747)
    WASAPI driver has been added (#754, thanks to @chirs241097)

General

    Fix race condition in fluid_player_callback (#783, thanks to @arcln)
    Improvements to LADSPA subsystem (#795, thanks to @mawe42)

5 files changed, 18 insertions, 17 deletions

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 151512c6fc8..8b9ffcbd2da 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2021/03/19 10:25:19 nia Exp $
+# $NetBSD: Makefile,v 1.49 2021/04/05 10:54:15 wiz Exp $
 
-DISTNAME=	fluidsynth-2.1.8
+DISTNAME=	fluidsynth-2.2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=FluidSynth/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -11,6 +11,7 @@ COMMENT=	Software synthesizer based on SoundFont2
 LICENSE=	gnu-lgpl-v2
 
 USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}/man1
diff --git a/audio/fluidsynth/PLIST b/audio/fluidsynth/PLIST
index f9e9cfcc024..f6563ea34a2 100644
--- a/audio/fluidsynth/PLIST
+++ b/audio/fluidsynth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2021/03/19 10:25:19 nia Exp $
+@comment $NetBSD: PLIST,v 1.14 2021/04/05 10:54:15 wiz Exp $
 bin/fluidsynth
 include/fluidsynth.h
 include/fluidsynth/audio.h
@@ -19,7 +19,7 @@ include/fluidsynth/types.h
 include/fluidsynth/version.h
 include/fluidsynth/voice.h
 lib/libfluidsynth.so
-lib/libfluidsynth.so.2
-lib/libfluidsynth.so.2.3.8
+lib/libfluidsynth.so.3
+lib/libfluidsynth.so.3.0.0
 lib/pkgconfig/fluidsynth.pc
 man/man1/fluidsynth.1
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
index 04cd5c00786..ecfe06ac970 100644
--- a/audio/fluidsynth/buildlink3.mk
+++ b/audio/fluidsynth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2020/03/08 16:47:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2021/04/05 10:54:15 wiz Exp $
 
 BUILDLINK_TREE+=	fluidsynth
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	fluidsynth
 FLUIDSYNTH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.fluidsynth+=	fluidsynth>=1.0.5
-BUILDLINK_ABI_DEPENDS.fluidsynth+=	fluidsynth>=2.1.1nb1
+BUILDLINK_ABI_DEPENDS.fluidsynth+=	fluidsynth>=2.2.0
 BUILDLINK_PKGSRCDIR.fluidsynth?=	../../audio/fluidsynth
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index 9e222dcdd3c..dffa3a0804b 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2021/03/19 10:25:19 nia Exp $
+$NetBSD: distinfo,v 1.29 2021/04/05 10:54:15 wiz Exp $
 
-SHA1 (fluidsynth-2.1.8.tar.gz) = 8d632b60fcbd213ee7c3c602cad3b2a3da3345bf
-RMD160 (fluidsynth-2.1.8.tar.gz) = c6220036e609827ab90ce7d9cda98a38591030ec
-SHA512 (fluidsynth-2.1.8.tar.gz) = 34f87ea1577b1e89146a1589c67771262961bb18d0c8b21aaa9a1315e18dffc984f18f21cc8a96cc52dca9e94fcad1bdec2b62678c5f2f3434a4faba713854a6
-Size (fluidsynth-2.1.8.tar.gz) = 1369567 bytes
+SHA1 (fluidsynth-2.2.0.tar.gz) = cb233fbee00be65f4319cda939b9133abbaccbab
+RMD160 (fluidsynth-2.2.0.tar.gz) = 9381e9d21f325d7d19da5e2bddd9614c64cce562
+SHA512 (fluidsynth-2.2.0.tar.gz) = fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
+Size (fluidsynth-2.2.0.tar.gz) = 1507709 bytes
 SHA1 (patch-CMakeLists.txt) = 79804b84964e9557180c0f86e36d465fac7126fe
-SHA1 (patch-include_fluidsynth_log.h) = 35378120546ca4619e232707de6a0025c6c45ad8
+SHA1 (patch-include_fluidsynth_log.h) = cfc4e180f53e6cac03bea90a0c91d6fd75e39459
 SHA1 (patch-src_drivers_fluid__alsa.c) = a482764f0bbc15b5cf04e6920374b2f4811760aa
diff --git a/audio/fluidsynth/patches/patch-include_fluidsynth_log.h b/audio/fluidsynth/patches/patch-include_fluidsynth_log.h
index 7980bc82b29..4925131c3e2 100644
--- a/audio/fluidsynth/patches/patch-include_fluidsynth_log.h
+++ b/audio/fluidsynth/patches/patch-include_fluidsynth_log.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_fluidsynth_log.h,v 1.1 2019/12/19 23:59:56 joerg Exp $
+$NetBSD: patch-include_fluidsynth_log.h,v 1.2 2021/04/05 10:54:16 wiz Exp $
 
 Use the protected form to avoid conflicts with printf macros.
 
---- include/fluidsynth/log.h.orig	2019-12-19 23:29:25.082934836 +0000
+--- include/fluidsynth/log.h.orig	2021-03-27 17:35:00.000000000 +0000
 +++ include/fluidsynth/log.h
-@@ -79,7 +79,7 @@ FLUIDSYNTH_API void fluid_default_log_fu
+@@ -85,7 +85,7 @@ FLUIDSYNTH_API void fluid_default_log_fu
  
  FLUIDSYNTH_API int fluid_log(int level, const char *fmt, ...)
  #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
@@ -12,4 +12,4 @@ Use the protected form to avoid conflicts with printf macros.
 +__attribute__ ((__format__ (__printf__, 2, 3)))
  #endif
  ;
- 
+ /* @} */