From nobody Fri Dec 30 16:15:51 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nk9NR39v2z2kxgX; Fri, 30 Dec 2022 16:15:51 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nk9NR2Ksxz4MPr; Fri, 30 Dec 2022 16:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672416951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HTsjhmeJ5KJW/8jYinfzq3bW24tRBnfd2jb4A5cWQSU=; b=juVavVRsuqCzB/OdacYeM+ooJ2ugAE+nxVQ/LwPLraZ28cXRXG9E09eo1dFjrJr6Si/9MW aQrhFGS2S/UTyHt3kT38SrEyHl44D9fehpLtX15APuhAdqQKPd3UKH+q7mIMfjnuGhiXaw nam5cyGU+LHke73lubbiErkO+0l+QBHYB86BeUBul6Bt/vzQeCvv/rBlI6RaojVMCTW/n3 a7sOVpxpZrUQRdGijyvirnKEnWs9ebFXHfAwTwJ/tauVPn9QOo0IvOoPknC/awPBxxArH0 NkEnBdiGjgMoLjG0iLiNR6o3kn3cDkLoIaL4aOeK/VOCXyHCRIFcRHSeOjeFzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672416951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HTsjhmeJ5KJW/8jYinfzq3bW24tRBnfd2jb4A5cWQSU=; b=QiJrijMIUqCyXexKdNr3O5luF40sWak/q4OfTMj6pNEFd7YEQAErblpkcxOBmTn3aF23cM mxiW2MP/dGhm1h6XwgDmSH98bm3B50QJsalmDq2U6i94NCl0w7MycV0JR5GtD8KyVFWdFz spOPRwA7xb0ZfIEwScLpQm0fN2+yzI7yqyccMsfuWT9QPczg6sDNEDl5ADfGa54Udm98mH F9jH71epcPMnjZTFHNtB2WcRC3Kbjb5U8YpnpUtVLta0em/SQX4mJNXlyGa43XEqK6+5sO DP8v5pPz57EOMLxvbqvY9se2llnVM1Epyw/9GVnUpBDNUVjjpqHCyiwEAOjV4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672416951; a=rsa-sha256; cv=none; b=b6ySOOrWS6fdoPbyXakJp6jH59i7y1sCnhkyHM4HjjkxkCJFcQm2Bige9KGhXNrEJqElSy 8+/vXAqARiyjdZR1uaFoSDjDik0B3myNfu3ySZrjw7W9fvVW+jcra0diYs4e2xQh0OQJ9z iNBfpQP5SL7dGF0asOStxQcgjdGUwbnWvJF9Qaa95OlBfAHxJUYKjkHgFBJGxsCgWgT94G C9C0acsGo3w8BCPiji8FplrKVj+MRSe8EMbyX88IWK7cVwr0bUAnBY7HDxIebDQAx3QCpp SQ/oNu67J0+eorE+jyGuKt7F+4iSC4fqrLbRd4x6VVcUOkl/xbE6W1A4JjG8Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nk9NR1N60zFLx; Fri, 30 Dec 2022 16:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BUGFpif031734; Fri, 30 Dec 2022 16:15:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BUGFp5a031733; Fri, 30 Dec 2022 16:15:51 GMT (envelope-from git) Date: Fri, 30 Dec 2022 16:15:51 GMT Message-Id: <202212301615.2BUGFp5a031733@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: 641bf33cd9b6 - main - audio/fluidsynth: Update to upstream version 2.3.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 641bf33cd9b6d821a4a114079ea2ce9340fb3cc7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=641bf33cd9b6d821a4a114079ea2ce9340fb3cc7 commit 641bf33cd9b6d821a4a114079ea2ce9340fb3cc7 Author: Thomas Zander AuthorDate: 2022-12-30 16:00:34 +0000 Commit: Thomas Zander CommitDate: 2022-12-30 16:15:48 +0000 audio/fluidsynth: Update to upstream version 2.3.1 Details: - Update to new upstream version 2.3.1 - Add non-default PIPEWIRE OPTION --- audio/fluidsynth/Makefile | 11 ++++++--- audio/fluidsynth/distinfo | 6 ++--- audio/fluidsynth/files/patch-CMakeLists.txt | 28 ++++++++++----------- audio/fluidsynth/files/patch-src_CMakeLists.txt | 33 ++++++++++++++----------- audio/fluidsynth/pkg-plist | 8 ++++-- 5 files changed, 49 insertions(+), 37 deletions(-) diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 46da480b9457..06bd4adbc0a8 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -1,6 +1,6 @@ PORTNAME= fluidsynth DISTVERSIONPREFIX= v -DISTVERSION= 2.2.8 +DISTVERSION= 2.3.1 CATEGORIES= audio MAINTAINER= multimedia@FreeBSD.org @@ -20,10 +20,12 @@ USE_LDCONFIG= yes CMAKE_OFF= enable-libinstpatch enable-midishare LDFLAGS+= -lpthread -OPTIONS_DEFINE= ALSA DBUS JACK LADSPA LASH PORTAUDIO PULSEAUDIO \ - READLINE SDL SNDFILE SNDIO +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 @@ -41,6 +43,9 @@ 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 diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo index 737098f6852c..87d0738a0804 100644 --- a/audio/fluidsynth/distinfo +++ b/audio/fluidsynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658525753 -SHA256 (FluidSynth-fluidsynth-v2.2.8_GH0.tar.gz) = 7c29a5cb7a2755c8012d941d1335da7bda957bbb0a86b7c59215d26773bb51fe -SIZE (FluidSynth-fluidsynth-v2.2.8_GH0.tar.gz) = 1751615 +TIMESTAMP = 1672385297 +SHA256 (FluidSynth-fluidsynth-v2.3.1_GH0.tar.gz) = d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 +SIZE (FluidSynth-fluidsynth-v2.3.1_GH0.tar.gz) = 1758632 diff --git a/audio/fluidsynth/files/patch-CMakeLists.txt b/audio/fluidsynth/files/patch-CMakeLists.txt index f9197d1ca637..f9c26aca644e 100644 --- a/audio/fluidsynth/files/patch-CMakeLists.txt +++ b/audio/fluidsynth/files/patch-CMakeLists.txt @@ -1,22 +1,22 @@ ---- CMakeLists.txt.orig 2019-02-03 07:13:31 UTC +--- CMakeLists.txt.orig 2022-12-28 11:43:59 UTC +++ CMakeLists.txt -@@ -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 ) +@@ -90,6 +90,7 @@ option ( enable-winmidi "compile Windows MIDI support + option ( enable-sdl2 "compile SDL2 audio support (if it is available)" on ) option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on ) + option ( enable-pipewire "compile PipeWire 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 ) - -@@ -481,6 +482,11 @@ else(NOT enable-pkgconfig) - else ( enable-pulseaudio ) + option ( enable-openmp "enable OpenMP support (parallelization of soundfont decoding, vectorization of voice mixing, etc.)" on ) +@@ -530,6 +531,11 @@ if ( enable-pulseaudio ) + else ( enable-pulseaudio ) unset_pkg_config ( PULSE ) - endif ( enable-pulseaudio ) + endif ( enable-pulseaudio ) + -+ unset ( SNDIO_SUPPORT CACHE ) -+ if ( enable-sndio ) -+ set ( SNDIO_SUPPORT 1 ) -+ endif ( enable-sndio ) ++unset ( SNDIO_SUPPORT CACHE ) ++if ( enable-sndio ) ++ set ( SNDIO_SUPPORT 1 ) ++endif ( enable-sndio ) - unset ( ALSA_SUPPORT CACHE ) - if ( enable-alsa ) + unset ( ALSA_SUPPORT CACHE ) + if ( enable-alsa ) diff --git a/audio/fluidsynth/files/patch-src_CMakeLists.txt b/audio/fluidsynth/files/patch-src_CMakeLists.txt index c668618bc7e9..c1de696660a8 100644 --- a/audio/fluidsynth/files/patch-src_CMakeLists.txt +++ b/audio/fluidsynth/files/patch-src_CMakeLists.txt @@ -1,7 +1,7 @@ ---- src/CMakeLists.txt.orig 2018-12-30 11:42:00 UTC +--- src/CMakeLists.txt.orig 2022-12-28 11:43:59 UTC +++ src/CMakeLists.txt -@@ -50,6 +50,11 @@ if ( PULSE_SUPPORT ) - include_directories ( ${PULSE_INCLUDE_DIRS} ) +@@ -25,6 +25,11 @@ if ( PULSE_SUPPORT ) + set ( fluid_pulse_SOURCES drivers/fluid_pulse.c ) endif ( PULSE_SUPPORT ) +if ( SNDIO_SUPPORT ) @@ -11,20 +11,23 @@ + if ( ALSA_SUPPORT ) set ( fluid_alsa_SOURCES drivers/fluid_alsa.c ) - include_directories ( ${ALSA_INCLUDE_DIRS} ) -@@ -247,6 +252,7 @@ add_library ( libfluidsynth-OBJ OBJECT + endif ( ALSA_SUPPORT ) +@@ -245,6 +250,7 @@ add_library ( libfluidsynth-OBJ OBJECT ${fluid_oss_SOURCES} ${fluid_portaudio_SOURCES} ${fluid_pulse_SOURCES} + ${fluid_sndio_SOURCES} ${fluid_dsound_SOURCES} - ${fluid_winmidi_SOURCES} - ${libfluidsynth_SOURCES} -@@ -314,6 +320,7 @@ target_link_libraries ( libfluidsynth - ${JACK_LIBRARIES} - ${ALSA_LIBRARIES} - ${PULSE_LIBRARIES} -+ ${SNDIO_LIBRARIES} - ${PORTAUDIO_LIBRARIES} - ${LIBSNDFILE_LIBRARIES} - ${DBUS_LIBRARIES} + ${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 ) ++endif() ++ ++if ( SNDIO_SUPPORT) ++ target_link_libraries ( libfluidsynth-OBJ PUBLIC ${SNDIO_LIBRARIES} ) + endif() + + if ( ALSA_SUPPORT ) diff --git a/audio/fluidsynth/pkg-plist b/audio/fluidsynth/pkg-plist index 34e0ce7a667b..55c988f54edd 100644 --- a/audio/fluidsynth/pkg-plist +++ b/audio/fluidsynth/pkg-plist @@ -17,8 +17,12 @@ 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.1 +lib/libfluidsynth.so.3.1.4 libdata/pkgconfig/fluidsynth.pc -man/man1/fluidsynth.1.gz +share/man/man1/fluidsynth.1.gz