From 0e44f1f76d2aaae4b9a763f03b2a80008bb45158 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Wed, 26 Apr 2023 13:02:10 -0500 Subject: [PATCH 1/7] Add pulseaudio feature for fluidsynth --- ports/fluidsynth/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 3a8c18567fec2c..f5dfb744a9b162 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_check_features( FEATURES buildtools VCPKG_BUILD_MAKE_TABLES sndfile enable-libsndfile + pulseaudio enable-pulseaudio ) # enable platform-specific features, force the build to fail if the required libraries are not found, @@ -23,7 +24,7 @@ set(LINUX_OPTIONS enable-alsa ALSA_FOUND) set(ANDROID_OPTIONS enable-opensles OpenSLES_FOUND) set(IGNORED_OPTIONS enable-coverage enable-dbus enable-floats enable-fpe-check enable-framework enable-jack enable-lash enable-libinstpatch enable-midishare enable-oboe enable-openmp enable-oss enable-pipewire enable-portaudio - enable-profiling enable-pulseaudio enable-readline enable-sdl2 enable-systemd enable-trap-on-fpe enable-ubsan) + enable-profiling enable-readline enable-sdl2 enable-systemd enable-trap-on-fpe enable-ubsan) if(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS_TO_ENABLE ${WINDOWS_OPTIONS}) From 9da64ed5e24b828d05392affee6d5063cb2196ca Mon Sep 17 00:00:00 2001 From: d10sfan Date: Wed, 26 Apr 2023 13:29:18 -0500 Subject: [PATCH 2/7] Add pulseaudio feature definition --- ports/fluidsynth/vcpkg.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 0ffca7da6ee518..2fb5ac54a0e56c 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -43,6 +43,10 @@ ] } ] + }, + "pulseaudio": { + "description": "Build with PulseAudio support", + "supports": "linux" } } } From 3e108d9451601f6f1eec3a138410f8b607655775 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Wed, 26 Apr 2023 13:32:32 -0500 Subject: [PATCH 3/7] Formatting fix --- ports/fluidsynth/vcpkg.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 2fb5ac54a0e56c..8e432126bb1618 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -32,6 +32,10 @@ "buildtools": { "description": "Build tools gentables" }, + "pulseaudio": { + "description": "Build with PulseAudio support", + "supports": "linux" + }, "sndfile": { "description": "Enable rendering to file and SF3 support", "dependencies": [ @@ -43,10 +47,6 @@ ] } ] - }, - "pulseaudio": { - "description": "Build with PulseAudio support", - "supports": "linux" } } } From e0cc36b9b5eeeb63159181e3832ecdc1448c25ab Mon Sep 17 00:00:00 2001 From: d10sfan Date: Wed, 26 Apr 2023 13:33:13 -0500 Subject: [PATCH 4/7] Update version --- ports/fluidsynth/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 8e432126bb1618..2f55fe8c85311b 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fluidsynth", "version": "2.3.2", - "port-version": 1, + "port-version": 2, "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "license": "LGPL-2.1-or-later", From 8a968a14b926853121b7bc73578674fb630fdebf Mon Sep 17 00:00:00 2001 From: d10sfan Date: Wed, 26 Apr 2023 13:33:40 -0500 Subject: [PATCH 5/7] x-add-version run --- versions/baseline.json | 2 +- versions/f-/fluidsynth.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 246fa331d424f2..b1e6cf43903a78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2522,7 +2522,7 @@ }, "fluidsynth": { "baseline": "2.3.2", - "port-version": 1 + "port-version": 2 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 6291c3a5a2e49b..8c69c86f9a4f71 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c402772dcfb4c29941bc61b1709e54d2368f17da", + "version": "2.3.2", + "port-version": 2 + }, { "git-tree": "0deaa03650b97bd28bcaa13d05fb3502f8651e48", "version": "2.3.2", From 9d689f70bb9b8f8deb1e2d5a8a9c5bc3e28aaca2 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 28 Apr 2023 08:13:43 -0500 Subject: [PATCH 6/7] Add pulseaudio feature package manager notice --- ports/fluidsynth/portfile.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index f5dfb744a9b162..cdf2d316071cdc 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -1,3 +1,11 @@ +if("pulseaudio" IN_LIST FEATURES) + message( + "${PORT} with pulseaudio feature currently requires the following from the system package manager: + libpulse-dev pulseaudio + These can be installed on Ubuntu systems via sudo apt install libpulse-dev pulseaudio" + ) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth From 349b142c92383146f35cde4e2b4bea54f74e2ad9 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 28 Apr 2023 08:33:04 -0500 Subject: [PATCH 7/7] vcpkg x-add-version --all --- versions/f-/fluidsynth.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 8c69c86f9a4f71..0a9e45fe3d6eee 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c402772dcfb4c29941bc61b1709e54d2368f17da", + "git-tree": "eb9b815d5af8da59d2cb5a42361a9c88e7d6a1f4", "version": "2.3.2", "port-version": 2 },