From owner-svn-ports-all@freebsd.org Sat Mar 2 16:47:01 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6D0D1504B00; Sat, 2 Mar 2019 16:47:00 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 886D26F28A; Sat, 2 Mar 2019 16:47:00 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A88477EA; Sat, 2 Mar 2019 16:47:00 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x22Gl0Ao083802; Sat, 2 Mar 2019 16:47:00 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x22GkwkF083783; Sat, 2 Mar 2019 16:46:58 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201903021646.x22GkwkF083783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 2 Mar 2019 16:46:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494417 - in head/audio/fluidsynth: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/audio/fluidsynth: . files X-SVN-Commit-Revision: 494417 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 886D26F28A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Mar 2019 16:47:01 -0000 Author: riggs Date: Sat Mar 2 16:46:58 2019 New Revision: 494417 URL: https://svnweb.freebsd.org/changeset/ports/494417 Log: Update to upstream version 2.0.3 While on it: - Pet portlint PR: 233448 Submitted by: yuri Reviewed by: tobik Added: head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.h (contents, props changed) head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.h (contents, props changed) Deleted: head/audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c head/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c Modified: head/audio/fluidsynth/Makefile head/audio/fluidsynth/distinfo head/audio/fluidsynth/files/fluid_sndio.c head/audio/fluidsynth/files/patch-CMakeLists.txt head/audio/fluidsynth/files/patch-src_CMakeLists.txt head/audio/fluidsynth/files/patch-src_config.cmake head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.c head/audio/fluidsynth/pkg-plist Modified: head/audio/fluidsynth/Makefile ============================================================================== --- head/audio/fluidsynth/Makefile Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/Makefile Sat Mar 2 16:46:58 2019 (r494417) @@ -2,30 +2,33 @@ # $FreeBSD$ PORTNAME= fluidsynth -PORTVERSION= 1.1.11 DISTVERSIONPREFIX= v +DISTVERSION= 2.0.3 CATEGORIES= audio +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 6ac6e5983f4169c7a418866319e5bde424d4434c.patch:-p1 \ + a92ba4528f0a848e355556010dcc9456b54cd705.patch:-p1 + MAINTAINER= multimedia@FreeBSD.org COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE +USES= cmake gnome pkgconfig +USE_GITHUB= yes GH_ACCOUNT= FluidSynth +USE_GNOME= glib20 +USE_LDCONFIG= yes +CMAKE_OFF= enable-midishare +LDFLAGS+= -lpthread + OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO READLINE \ SNDFILE SNDIO OPTIONS_DEFAULT= JACK READLINE -USES= cmake pkgconfig tar:bzip2 -USE_GITHUB= yes -USE_GNOME= glib20 -USE_LDCONFIG= yes -CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ - -Denable-midishare:BOOL=FALSE -LDFLAGS+= -lpthread - JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= enable-jack @@ -59,13 +62,5 @@ SNDIO_CMAKE_BOOL= enable-sndio post-patch: ${CP} ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/ - @${REINPLACE_CMD} -e \ - '/Linux/s|^|#| ; \ - /_init_lib_suffix/s|"64"|""| ; \ - /CMAKE_C_FLAGS_RELEASE/s|-O2|| ; \ - s|enable_midishare|enable-midishare| ; \ - s|$${LIB_INSTALL_DIR}$${LIB_SUFFIX}/pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e \ - 's|share/man|man|' ${WRKSRC}/cmake_admin/DefaultDirs.cmake .include Modified: head/audio/fluidsynth/distinfo ============================================================================== --- head/audio/fluidsynth/distinfo Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/distinfo Sat Mar 2 16:46:58 2019 (r494417) @@ -1,3 +1,7 @@ -TIMESTAMP = 1527888754 -SHA256 (FluidSynth-fluidsynth-v1.1.11_GH0.tar.gz) = da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8 -SIZE (FluidSynth-fluidsynth-v1.1.11_GH0.tar.gz) = 634566 +TIMESTAMP = 1549176844 +SHA256 (FluidSynth-fluidsynth-v2.0.3_GH0.tar.gz) = 12c7ede220f54a6e52a7e7b0b1729c04a4282685569adf18d932a7dd3c10e759 +SIZE (FluidSynth-fluidsynth-v2.0.3_GH0.tar.gz) = 1374835 +SHA256 (6ac6e5983f4169c7a418866319e5bde424d4434c.patch) = fe87f16d9bcb3911e4bb3ac1810a89cea66466d81c9ae6683b17ee9a05878e30 +SIZE (6ac6e5983f4169c7a418866319e5bde424d4434c.patch) = 3311 +SHA256 (a92ba4528f0a848e355556010dcc9456b54cd705.patch) = bc0098e4e4e15a5da6f1c2d1a9ca4135ccd4f4fb630f2234e946a8456cd05792 +SIZE (a92ba4528f0a848e355556010dcc9456b54cd705.patch) = 1787 Modified: head/audio/fluidsynth/files/fluid_sndio.c ============================================================================== --- head/audio/fluidsynth/files/fluid_sndio.c Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/files/fluid_sndio.c Sat Mar 2 16:46:58 2019 (r494417) @@ -66,7 +66,7 @@ typedef struct { fluid_midi_parser_t *parser; } fluid_sndio_midi_driver_t; -int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p); +//void delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p); /* local utilities */ static void* fluid_sndio_audio_run(void* d); @@ -76,7 +76,7 @@ static void* fluid_sndio_audio_run2(void* d); void fluid_sndio_audio_driver_settings(fluid_settings_t* settings) { - fluid_settings_register_str(settings, "audio.sndio.device", "default", 0, NULL, NULL); + fluid_settings_register_str(settings, "audio.sndio.device", "default", 0); } /* @@ -109,7 +109,7 @@ new_fluid_sndio_audio_driver(fluid_settings_t* setting dev->data = NULL; dev->cont = 1; - if (!fluid_settings_getstr(settings, "audio.sndio.device", &devname)) { + if (!fluid_settings_dupstr(settings, "audio.sndio.device", &devname)) { devname = NULL; } @@ -210,7 +210,7 @@ new_fluid_sndio_audio_driver2(fluid_settings_t* settin dev->data = data; dev->cont = 1; - if (!fluid_settings_getstr(settings, "audio.sndio.device", &devname)) { + if (!fluid_settings_dupstr(settings, "audio.sndio.device", &devname)) { devname = NULL; } @@ -286,19 +286,19 @@ error_recovery: /* * delete_fluid_sndio_audio_driver */ -int +void delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p) { fluid_sndio_audio_driver_t* dev = (fluid_sndio_audio_driver_t*) p; if (dev == NULL) { - return FLUID_OK; + return; } dev->cont = 0; if (dev->thread) { if (pthread_join(dev->thread, NULL)) { FLUID_LOG(FLUID_ERR, "Failed to join the audio thread"); - return FLUID_FAILED; + return; } } if (dev->hdl) { @@ -308,7 +308,7 @@ delete_fluid_sndio_audio_driver(fluid_audio_driver_t* FLUID_FREE(dev->buffer); } FLUID_FREE(dev); - return FLUID_OK; + return; } /* @@ -372,17 +372,17 @@ fluid_sndio_audio_run2(void* d) void fluid_sndio_midi_driver_settings(fluid_settings_t* settings) { - fluid_settings_register_str(settings, "midi.sndio.device", "default", 0, NULL, NULL); + fluid_settings_register_str(settings, "midi.sndio.device", "default", 0); } -int +void delete_fluid_sndio_midi_driver(fluid_midi_driver_t *addr) { int err; fluid_sndio_midi_driver_t *dev = (fluid_sndio_midi_driver_t *)addr; if (dev == NULL) { - return FLUID_OK; + return; } dev->status = FLUID_MIDI_DONE; @@ -391,11 +391,11 @@ delete_fluid_sndio_midi_driver(fluid_midi_driver_t *ad err = pthread_cancel(dev->thread); if (err) { FLUID_LOG(FLUID_ERR, "Failed to cancel the midi thread"); - return FLUID_FAILED; + return; } if (pthread_join(dev->thread, NULL)) { FLUID_LOG(FLUID_ERR, "Failed to join the midi thread"); - return FLUID_FAILED; + return; } } if (dev->hdl != NULL) { @@ -405,7 +405,7 @@ delete_fluid_sndio_midi_driver(fluid_midi_driver_t *ad delete_fluid_midi_parser(dev->parser); } FLUID_FREE(dev); - return FLUID_OK; + return; } void * @@ -493,7 +493,7 @@ new_fluid_sndio_midi_driver(fluid_settings_t *settings } /* get the device name. if none is specified, use the default device. */ - if (!fluid_settings_getstr(settings, "midi.sndio.device", &device)) { + if (!fluid_settings_dupstr(settings, "midi.sndio.device", &device)) { device = NULL; } Modified: head/audio/fluidsynth/files/patch-CMakeLists.txt ============================================================================== --- head/audio/fluidsynth/files/patch-CMakeLists.txt Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/files/patch-CMakeLists.txt Sat Mar 2 16:46:58 2019 (r494417) @@ -1,22 +1,22 @@ ---- CMakeLists.txt.orig 2018-05-06 07:05:11 UTC +--- CMakeLists.txt.orig 2019-02-03 07:13:31 UTC +++ CMakeLists.txt -@@ -68,6 +68,7 @@ option ( enable-midishare "compile MidiS - option ( enable-oss "compile OSS support (if it is available)" on ) +@@ -71,6 +71,7 @@ option ( enable-dsound "compile DirectSound support (i + option ( enable-winmidi "compile Windows MIDI support (if it is available)" on ) option ( enable-pkgconfig "use pkg-config to locate fluidsynth's (mostly optional) dependencies" on ) option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on ) +option ( enable-sndio "compile Sndio support (if it is available)" on ) option ( enable-readline "compile readline lib line editing (if it is available)" on ) + option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on ) - # Platform specific options -@@ -358,6 +359,11 @@ else(NOT enable-pkgconfig) +@@ -481,6 +482,11 @@ else(NOT enable-pkgconfig) + else ( enable-pulseaudio ) unset_pkg_config ( PULSE ) endif ( enable-pulseaudio ) - ++ + unset ( SNDIO_SUPPORT CACHE ) + if ( enable-sndio ) + set ( SNDIO_SUPPORT 1 ) + endif ( enable-sndio ) -+ + unset ( ALSA_SUPPORT CACHE ) if ( enable-alsa ) - pkg_check_modules ( ALSA alsa>=0.9.1 ) Modified: head/audio/fluidsynth/files/patch-src_CMakeLists.txt ============================================================================== --- head/audio/fluidsynth/files/patch-src_CMakeLists.txt Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/files/patch-src_CMakeLists.txt Sat Mar 2 16:46:58 2019 (r494417) @@ -1,7 +1,7 @@ ---- src/CMakeLists.txt.orig 2012-08-16 04:01:13 UTC +--- src/CMakeLists.txt.orig 2018-12-30 11:42:00 UTC +++ src/CMakeLists.txt -@@ -47,6 +47,11 @@ if ( PULSE_SUPPORT ) - include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} ) +@@ -50,6 +50,11 @@ if ( PULSE_SUPPORT ) + include_directories ( ${PULSE_INCLUDE_DIRS} ) endif ( PULSE_SUPPORT ) +if ( SNDIO_SUPPORT ) @@ -11,16 +11,16 @@ + if ( ALSA_SUPPORT ) set ( fluid_alsa_SOURCES drivers/fluid_alsa.c ) - include_directories ( ${ALSA_INCLUDEDIR} ${ALSA_INCLUDE_DIRS} ) -@@ -244,6 +249,7 @@ add_library ( libfluidsynth + include_directories ( ${ALSA_INCLUDE_DIRS} ) +@@ -247,6 +252,7 @@ add_library ( libfluidsynth-OBJ OBJECT ${fluid_oss_SOURCES} ${fluid_portaudio_SOURCES} ${fluid_pulse_SOURCES} + ${fluid_sndio_SOURCES} - ${fluid_windows_SOURCES} + ${fluid_dsound_SOURCES} + ${fluid_winmidi_SOURCES} ${libfluidsynth_SOURCES} - ${public_HEADERS} -@@ -286,6 +292,7 @@ target_link_libraries ( libfluidsynth +@@ -314,6 +320,7 @@ target_link_libraries ( libfluidsynth ${JACK_LIBRARIES} ${ALSA_LIBRARIES} ${PULSE_LIBRARIES} Modified: head/audio/fluidsynth/files/patch-src_config.cmake ============================================================================== --- head/audio/fluidsynth/files/patch-src_config.cmake Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/files/patch-src_config.cmake Sat Mar 2 16:46:58 2019 (r494417) @@ -1,8 +1,8 @@ ---- src/config.cmake.orig 2012-08-16 04:01:13 UTC +--- src/config.cmake.orig 2018-12-30 11:42:00 UTC +++ src/config.cmake -@@ -178,6 +178,9 @@ - /* Define to enable PulseAudio driver */ - #cmakedefine PULSE_SUPPORT @PULSE_SUPPORT@ +@@ -199,6 +199,9 @@ + /* Define to enable Windows MIDI driver */ + #cmakedefine WINMIDI_SUPPORT @WINMIDI_SUPPORT@ +/* Define to enable Sndio driver */ +#cmakedefine SNDIO_SUPPORT @SNDIO_SUPPORT@ Modified: head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c ============================================================================== --- head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c Sat Mar 2 16:46:58 2019 (r494417) @@ -1,54 +1,19 @@ ---- src/drivers/fluid_adriver.c.orig 2018-05-06 07:05:11 UTC +--- src/drivers/fluid_adriver.c.orig 2018-12-30 11:42:00 UTC +++ src/drivers/fluid_adriver.c -@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_ - void fluid_oss_audio_driver_settings(fluid_settings_t* settings); - #endif - -+#if SNDIO_SUPPORT -+fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings, -+ fluid_synth_t* synth); -+fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings, -+ fluid_audio_func_t func, void* data); -+int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p); -+void fluid_sndio_audio_driver_settings(fluid_settings_t* settings); -+#endif -+ - #if COREAUDIO_SUPPORT - fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings, - fluid_synth_t* synth); -@@ -122,6 +131,14 @@ int delete_fluid_file_audio_driver(fluid +@@ -39,6 +39,16 @@ struct _fluid_audriver_definition_t /* Available audio drivers, listed in order of preference */ static const fluid_audriver_definition_t fluid_audio_drivers[] = { +#if SNDIO_SUPPORT -+ { "sndio", -+ new_fluid_sndio_audio_driver, -+ new_fluid_sndio_audio_driver2, -+ delete_fluid_sndio_audio_driver, -+ fluid_sndio_audio_driver_settings }, ++ { ++ "sndio", ++ new_fluid_sndio_audio_driver, ++ new_fluid_sndio_audio_driver2, ++ delete_fluid_sndio_audio_driver, ++ fluid_sndio_audio_driver_settings ++ }, +#endif + #if JACK_SUPPORT - { "jack", - new_fluid_jack_audio_driver, -@@ -238,7 +255,9 @@ void fluid_audio_driver_settings(fluid_s - FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL); - - /* Set the default driver */ --#if JACK_SUPPORT -+#if SNDIO_SUPPORT -+ fluid_settings_register_str(settings, "audio.driver", "sndio", 0, NULL, NULL); -+#elif JACK_SUPPORT - fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL); - #elif ALSA_SUPPORT - fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL); -@@ -272,6 +291,9 @@ void fluid_audio_driver_settings(fluid_s - #if OSS_SUPPORT - fluid_settings_add_option(settings, "audio.driver", "oss"); - #endif -+#if SNDIO_SUPPORT -+ fluid_settings_add_option(settings, "audio.driver", "sndio"); -+#endif - #if COREAUDIO_SUPPORT - fluid_settings_add_option(settings, "audio.driver", "coreaudio"); - #endif + { + "jack", Added: head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.h Sat Mar 2 16:46:58 2019 (r494417) @@ -0,0 +1,17 @@ +--- src/drivers/fluid_adriver.h.orig 2019-02-03 07:07:02 UTC ++++ src/drivers/fluid_adriver.h +@@ -90,6 +90,14 @@ fluid_audio_driver_t *new_fluid_portaudio_driver(fluid + void delete_fluid_portaudio_driver(fluid_audio_driver_t *p); + #endif + ++#if SNDIO_SUPPORT ++fluid_audio_driver_t *new_fluid_sndio_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth); ++fluid_audio_driver_t *new_fluid_sndio_audio_driver2(fluid_settings_t *settings, ++ fluid_audio_func_t func, void *data); ++void delete_fluid_sndio_audio_driver(fluid_audio_driver_t *p); ++void fluid_sndio_audio_driver_settings(fluid_settings_t *settings); ++#endif ++ + #if JACK_SUPPORT + fluid_audio_driver_t *new_fluid_jack_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth); + fluid_audio_driver_t *new_fluid_jack_audio_driver2(fluid_settings_t *settings, Modified: head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.c ============================================================================== --- head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.c Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.c Sat Mar 2 16:46:58 2019 (r494417) @@ -1,53 +1,18 @@ $OpenBSD: patch-src_drivers_fluid_mdriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp $ ---- src/drivers/fluid_mdriver.c.orig 2012-08-16 04:01:13 UTC +--- src/drivers/fluid_mdriver.c.orig 2018-12-30 11:42:00 UTC +++ src/drivers/fluid_mdriver.c -@@ -46,6 +46,15 @@ fluid_midi_driver_t *new_fluid_jack_midi - int delete_fluid_jack_midi_driver(fluid_midi_driver_t *p); +@@ -52,6 +52,14 @@ static const fluid_mdriver_definition_t fluid_midi_dri + fluid_alsa_rawmidi_driver_settings + }, #endif - -+/* SNDIO */ +#if SNDIO_SUPPORT -+fluid_midi_driver_t* new_fluid_sndio_midi_driver(fluid_settings_t* settings, -+ handle_midi_event_func_t handler, -+ void* event_handler_data); -+int delete_fluid_sndio_midi_driver(fluid_midi_driver_t* p); -+void fluid_sndio_midi_driver_settings(fluid_settings_t* settings); ++ { ++ "sndio", ++ new_fluid_sndio_midi_driver, ++ delete_fluid_sndio_midi_driver, ++ fluid_sndio_midi_driver_settings ++ }, +#endif -+ - /* OSS */ - #if OSS_SUPPORT - fluid_midi_driver_t* new_fluid_oss_midi_driver(fluid_settings_t* settings, -@@ -96,6 +105,12 @@ struct fluid_mdriver_definition_t { - - - struct fluid_mdriver_definition_t fluid_midi_drivers[] = { -+#if SNDIO_SUPPORT -+ { "sndio", -+ new_fluid_sndio_midi_driver, -+ delete_fluid_sndio_midi_driver, -+ fluid_sndio_midi_driver_settings }, -+#endif #if JACK_SUPPORT - { "jack", - new_fluid_jack_midi_driver, -@@ -149,7 +164,9 @@ void fluid_midi_driver_settings(fluid_se - FLUID_DEFAULT_MIDI_RT_PRIO, 0, 99, 0, NULL, NULL); - - /* Set the default driver */ --#if ALSA_SUPPORT -+#if SNDIO_SUPPORT -+ fluid_settings_register_str(settings, "midi.driver", "sndio", 0, NULL, NULL); -+#elif ALSA_SUPPORT - fluid_settings_register_str(settings, "midi.driver", "alsa_seq", 0, NULL, NULL); - #elif JACK_SUPPORT - fluid_settings_register_str(settings, "midi.driver", "jack", 0, NULL, NULL); -@@ -170,6 +187,9 @@ void fluid_midi_driver_settings(fluid_se - fluid_settings_add_option(settings, "midi.driver", "alsa_seq"); - fluid_settings_add_option(settings, "midi.driver", "alsa_raw"); - #endif -+#if SNDIO_SUPPORT -+ fluid_settings_add_option(settings, "midi.driver", "sndio"); -+#endif - #if JACK_SUPPORT - fluid_settings_add_option(settings, "midi.driver", "jack"); - #endif + { + "jack", Added: head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/fluidsynth/files/patch-src_drivers_fluid__mdriver.h Sat Mar 2 16:46:58 2019 (r494417) @@ -0,0 +1,18 @@ +--- src/drivers/fluid_mdriver.h.orig 2019-02-03 07:13:59 UTC ++++ src/drivers/fluid_mdriver.h +@@ -53,6 +53,15 @@ void delete_fluid_alsa_seq_driver(fluid_midi_driver_t + void fluid_alsa_seq_driver_settings(fluid_settings_t *settings); + #endif + ++/* SNDIO */ ++#if SNDIO_SUPPORT ++void fluid_sndio_midi_driver_settings(fluid_settings_t *settings); ++fluid_midi_driver_t *new_fluid_sndio_midi_driver(fluid_settings_t *settings, ++ handle_midi_event_func_t handler, ++ void *data); ++void delete_fluid_sndio_midi_driver(fluid_midi_driver_t *p); ++#endif ++ + /* JACK */ + #if JACK_SUPPORT + void fluid_jack_midi_driver_settings(fluid_settings_t *settings); Modified: head/audio/fluidsynth/pkg-plist ============================================================================== --- head/audio/fluidsynth/pkg-plist Sat Mar 2 16:09:49 2019 (r494416) +++ head/audio/fluidsynth/pkg-plist Sat Mar 2 16:46:58 2019 (r494417) @@ -3,11 +3,11 @@ include/fluidsynth.h include/fluidsynth/audio.h include/fluidsynth/event.h include/fluidsynth/gen.h +include/fluidsynth/ladspa.h include/fluidsynth/log.h include/fluidsynth/midi.h include/fluidsynth/misc.h include/fluidsynth/mod.h -include/fluidsynth/ramsfont.h include/fluidsynth/seq.h include/fluidsynth/seqbind.h include/fluidsynth/settings.h @@ -18,7 +18,7 @@ include/fluidsynth/types.h include/fluidsynth/version.h include/fluidsynth/voice.h lib/libfluidsynth.so -lib/libfluidsynth.so.1 -lib/libfluidsynth.so.1.7.2 +lib/libfluidsynth.so.2 +lib/libfluidsynth.so.2.1.0 libdata/pkgconfig/fluidsynth.pc man/man1/fluidsynth.1.gz