fluidsynth: Update to 2.1.2

pkgsrc changes:
- Add dbus and ladspa options
- Build with ladspa support on BSD and Linux
- Don't build with SDL2 audio backend on Darwin

Changelog:

- fluidsynth now exits with error when user-provided command-line arguments are out-of-range
- add verbose error logging to opensles and oboe drivers
- fix a memory leak in oboe driver
- fix a NULL dereference in the fluidsynth commandline program

4 files changed, 35 insertions, 13 deletions

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index cffd47cc255..972bbeb5f5d 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2020/04/11 10:59:58 nia Exp $
+# $NetBSD: Makefile,v 1.37 2020/04/12 11:21:10 nia Exp $
 
-DISTNAME=	fluidsynth-2.1.1
-PKGREVISION=	1
+DISTNAME=	fluidsynth-2.1.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=FluidSynth/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -22,7 +21,6 @@ PKGCONFIG_OVERRIDE=	fluidsynth.pc.in
 
 LDFLAGS.SunOS+=		-lsocket
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} != "none"
diff --git a/audio/fluidsynth/PLIST b/audio/fluidsynth/PLIST
index 8c757503fbe..e08885e5138 100644
--- a/audio/fluidsynth/PLIST
+++ b/audio/fluidsynth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/02/18 13:11:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/12 11:21:10 nia Exp $
 bin/fluidsynth
 include/fluidsynth.h
 include/fluidsynth/audio.h
@@ -20,6 +20,6 @@ include/fluidsynth/version.h
 include/fluidsynth/voice.h
 lib/libfluidsynth.so
 lib/libfluidsynth.so.2
-lib/libfluidsynth.so.2.3.1
+lib/libfluidsynth.so.2.3.2
 lib/pkgconfig/fluidsynth.pc
 man/man1/fluidsynth.1
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index 28ff489dbe5..c71c129da23 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2020/02/18 13:11:50 nia Exp $
+$NetBSD: distinfo,v 1.22 2020/04/12 11:21:10 nia Exp $
 
-SHA1 (fluidsynth-2.1.1.tar.gz) = b4140e8123a1ecc8492ef105b9900a4039a205e9
-RMD160 (fluidsynth-2.1.1.tar.gz) = db98dea6d759d04b39640efbd21293f7988b16d5
-SHA512 (fluidsynth-2.1.1.tar.gz) = f8776c59aa0aa4a25fe3c38973c994e8608f8fad8a2e478db0d0232d4c787983dfdcba200c558cd810e892930b50184af4bc4a7f3c98ec5c38e147fd715e51b8
-Size (fluidsynth-2.1.1.tar.gz) = 1359872 bytes
+SHA1 (fluidsynth-2.1.2.tar.gz) = 28c750eab3bef96a5a39d0ef20ad6e58aa8cc88f
+RMD160 (fluidsynth-2.1.2.tar.gz) = a77349e3de6a682ba11d0d2009b92848c7da263c
+SHA512 (fluidsynth-2.1.2.tar.gz) = ece3328ee94731f347a03f555fd39ead0a50cb24fef5d90dbff22e74db8344c9a68bfaccb76b873bd18a8ac68ee1d7802571e51c938bbf98e424267376f47eb8
+Size (fluidsynth-2.1.2.tar.gz) = 1360329 bytes
 SHA1 (patch-CMakeLists.txt) = 79804b84964e9557180c0f86e36d465fac7126fe
 SHA1 (patch-include_fluidsynth_log.h) = 35378120546ca4619e232707de6a0025c6c45ad8
 SHA1 (patch-src_drivers_fluid__alsa.c) = a482764f0bbc15b5cf04e6920374b2f4811760aa
diff --git a/audio/fluidsynth/options.mk b/audio/fluidsynth/options.mk
index 3a07c7c16a4..2624c529060 100644
--- a/audio/fluidsynth/options.mk
+++ b/audio/fluidsynth/options.mk
@@ -1,15 +1,25 @@
-# $NetBSD: options.mk,v 1.3 2019/12/01 12:51:57 nia Exp $
+# $NetBSD: options.mk,v 1.4 2020/04/12 11:21:10 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.fluidsynth
+
+# Audio backends
 PKG_SUPPORTED_OPTIONS=		alsa jack portaudio pulseaudio sdl2
 PKG_SUGGESTED_OPTIONS.Linux=	alsa
+# Misc
+PKG_SUPPORTED_OPTIONS=		dbus ladspa
 
 .include "../../mk/oss.buildlink3.mk"
 
-.if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none"
+# On platforms without a native-ish backend, build the SDL2 backend.
+.if ${OPSYS} != "Linux" && ${OPSYS} != Darwin && ${OSS_TYPE} == "none"
 PKG_SUGGESTED_OPTIONS+=		sdl2
 .endif
 
+# A guess at platforms where ladspa is likely to work...
+.if ${OPSYS} == "Linux" || !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+=		ladspa
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Malsa)
@@ -19,6 +29,13 @@ CMAKE_ARGS+=	-Denable-alsa=ON
 CMAKE_ARGS+=	-Denable-alsa=OFF
 .endif
 
+.if !empty(PKG_OPTIONS:Mdbus)
+CMAKE_ARGS+=	-Denable-dbus=ON
+.include "../../sysutils/dbus/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-Denable-dbus=OFF
+.endif
+
 .if !empty(PKG_OPTIONS:Mjack)
 CMAKE_ARGS+=	-Denable-jack=ON
 .include "../../audio/jack/buildlink3.mk"
@@ -46,3 +63,10 @@ CMAKE_ARGS+=	-Denable-sdl2=ON
 .else
 CMAKE_ARGS+=	-Denable-sdl2=OFF
 .endif
+
+.if !empty(PKG_OPTIONS:Mladspa)
+CMAKE_ARGS+=	-Denable-ladspa=ON
+.include "../../audio/ladspa/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-Denable-ladspa=OFF
+.endif