diff --git a/ports/pulseaudio/vcpkg.json b/ports/pulseaudio/vcpkg.json index e4b1e962e2..fc70062660 100644 --- a/ports/pulseaudio/vcpkg.json +++ b/ports/pulseaudio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pulseaudio", "version": "17.0", - "port-version": 1, + "port-version": 2, "description": "PulseAudio is a sound server, originally created to overcome the limitations of the Enlightened Sound Daemon (EsounD)", "homepage": "https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Community/", "license": null, @@ -27,12 +27,18 @@ "jack2", "libatomic-ops", "libiconv", + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + }, { "name": "openssl", "default-features": false }, "orc", - "sndfile", "soxr", "speex", { diff --git a/ports/sndfile/portfile.cmake b/ports/sndfile/portfile.cmake deleted file mode 100644 index d3910bb2c4..0000000000 --- a/ports/sndfile/portfile.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -message(WARNING "The sndfile port is deprecated, using libsndfile instead") diff --git a/ports/sndfile/vcpkg.json b/ports/sndfile/vcpkg.json deleted file mode 100644 index 2005e6331b..0000000000 --- a/ports/sndfile/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "sndfile", - "version": "0", - "port-version": 2, - "description": "x Library to read, write and manipulate many soundfile types.", - "dependencies": [ - "libsndfile" - ], - "default-features": [ - "external-libs" - ], - "features": { - "external-libs": { - "description": "Support Ogg Vorbis and FLAC audio files", - "dependencies": [ - { - "name": "libsndfile", - "features": [ - "external-libs" - ] - } - ] - } - } -} diff --git a/versions/baseline.json b/versions/baseline.json index 3d18524e1a..a7765c7e2f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7238,7 +7238,7 @@ }, "pulseaudio": { "baseline": "17.0", - "port-version": 1 + "port-version": 2 }, "pulzed-mini": { "baseline": "0.9.14", @@ -8396,10 +8396,6 @@ "baseline": "1.2.1", "port-version": 0 }, - "sndfile": { - "baseline": "0", - "port-version": 2 - }, "snitch": { "baseline": "1.2.5", "port-version": 0 diff --git a/versions/p-/pulseaudio.json b/versions/p-/pulseaudio.json index a02982b181..a5c2a4918e 100644 --- a/versions/p-/pulseaudio.json +++ b/versions/p-/pulseaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "498d6911a860d3f86ec25caabd0f63f5180782a2", + "version": "17.0", + "port-version": 2 + }, { "git-tree": "cb9160ce88d38cfeb2a6b49a91620a3e53b368f8", "version": "17.0",