diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 06bd4adbc0a8..e9bdb2d4939d 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -1,71 +1,71 @@ PORTNAME= fluidsynth DISTVERSIONPREFIX= v -DISTVERSION= 2.3.1 +DISTVERSION= 2.3.2 CATEGORIES= audio MAINTAINER= multimedia@FreeBSD.org COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications WWW= https://www.fluidsynth.org/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake cpe gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= FluidSynth USE_GNOME= glib20 USE_LDCONFIG= yes # would require unreleased libinstpatch >= 1.1.0 CMAKE_OFF= enable-libinstpatch enable-midishare LDFLAGS+= -lpthread OPTIONS_DEFINE= ALSA DBUS JACK LADSPA LASH PIPEWIRE PORTAUDIO \ PULSEAUDIO READLINE SDL SNDFILE SNDIO OPTIONS_DEFAULT= JACK READLINE PIPEWIRE_DESC= PipeWire support JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= enable-jack ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= enable-alsa DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= enable-dbus LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_USES= localbase LADSPA_CMAKE_BOOL= enable-ladspa LASH_LIB_DEPENDS= liblash.so:audio/lash LASH_CMAKE_BOOL= enable-lash PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_CMAKE_BOOL= enable-pipewire PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= enable-portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= enable-pulseaudio READLINE_USES= readline READLINE_CMAKE_BOOL= enable-readline SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_CMAKE_BOOL= enable-sdl2 SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile SNDFILE_CMAKE_BOOL= enable-libsndfile SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= enable-sndio post-patch: ${CP} ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/ .include diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo index 87d0738a0804..199bc9b87e2e 100644 --- a/audio/fluidsynth/distinfo +++ b/audio/fluidsynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672385297 -SHA256 (FluidSynth-fluidsynth-v2.3.1_GH0.tar.gz) = d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 -SIZE (FluidSynth-fluidsynth-v2.3.1_GH0.tar.gz) = 1758632 +TIMESTAMP = 1681659827 +SHA256 (FluidSynth-fluidsynth-v2.3.2_GH0.tar.gz) = cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7 +SIZE (FluidSynth-fluidsynth-v2.3.2_GH0.tar.gz) = 1773755 diff --git a/audio/fluidsynth/files/patch-src_CMakeLists.txt b/audio/fluidsynth/files/patch-src_CMakeLists.txt index c1de696660a8..86b7a19d9a72 100644 --- a/audio/fluidsynth/files/patch-src_CMakeLists.txt +++ b/audio/fluidsynth/files/patch-src_CMakeLists.txt @@ -1,33 +1,33 @@ ---- src/CMakeLists.txt.orig 2022-12-28 11:43:59 UTC +--- src/CMakeLists.txt.orig 2023-04-02 15:54:17 UTC +++ src/CMakeLists.txt @@ -25,6 +25,11 @@ if ( PULSE_SUPPORT ) set ( fluid_pulse_SOURCES drivers/fluid_pulse.c ) endif ( PULSE_SUPPORT ) +if ( SNDIO_SUPPORT ) + set ( fluid_sndio_SOURCES drivers/fluid_sndio.c ) + set ( SNDIO_LIBRARIES sndio ) +endif ( SNDIO_SUPPORT ) + if ( ALSA_SUPPORT ) set ( fluid_alsa_SOURCES drivers/fluid_alsa.c ) endif ( ALSA_SUPPORT ) -@@ -245,6 +250,7 @@ add_library ( libfluidsynth-OBJ OBJECT +@@ -244,6 +249,7 @@ add_library ( libfluidsynth-OBJ OBJECT ${fluid_oss_SOURCES} ${fluid_portaudio_SOURCES} ${fluid_pulse_SOURCES} + ${fluid_sndio_SOURCES} ${fluid_dsound_SOURCES} ${fluid_wasapi_SOURCES} ${fluid_waveout_SOURCES} -@@ -360,6 +366,10 @@ endif() - - if ( TARGET PkgConfig::PULSE AND PULSE_SUPPORT ) - target_link_libraries ( libfluidsynth-OBJ PUBLIC PkgConfig::PULSE ) +@@ -362,6 +368,10 @@ endif() + if ( PULSE_SUPPORT ) + target_include_directories( libfluidsynth-OBJ PRIVATE ${PULSEAUDIO_INCLUDE_DIRS} ) + target_link_libraries ( libfluidsynth-OBJ PUBLIC ${PULSEAUDIO_LIBRARIES} ) +endif() + +if ( SNDIO_SUPPORT) + target_link_libraries ( libfluidsynth-OBJ PUBLIC ${SNDIO_LIBRARIES} ) endif() - if ( ALSA_SUPPORT ) + if ( TARGET ALSA::ALSA AND ALSA_SUPPORT ) diff --git a/audio/fluidsynth/pkg-plist b/audio/fluidsynth/pkg-plist index 55c988f54edd..4b684cf7ac8a 100644 --- a/audio/fluidsynth/pkg-plist +++ b/audio/fluidsynth/pkg-plist @@ -1,28 +1,28 @@ bin/fluidsynth 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/seq.h include/fluidsynth/seqbind.h include/fluidsynth/settings.h include/fluidsynth/sfont.h include/fluidsynth/shell.h include/fluidsynth/synth.h include/fluidsynth/types.h include/fluidsynth/version.h include/fluidsynth/voice.h lib/cmake/fluidsynth/FluidSynthConfig.cmake lib/cmake/fluidsynth/FluidSynthConfigVersion.cmake lib/cmake/fluidsynth/FluidSynthTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/fluidsynth/FluidSynthTargets.cmake lib/libfluidsynth.so lib/libfluidsynth.so.3 -lib/libfluidsynth.so.3.1.4 +lib/libfluidsynth.so.3.2.0 libdata/pkgconfig/fluidsynth.pc share/man/man1/fluidsynth.1.gz