diff --git a/ports/pulseaudio/portfile.cmake b/ports/pulseaudio/portfile.cmake index f20c4b3660..45f6150106 100644 --- a/ports/pulseaudio/portfile.cmake +++ b/ports/pulseaudio/portfile.cmake @@ -24,6 +24,11 @@ else() -Doss-output=disabled ) endif() +if("gstreamer" IN_LIST FEATURES) + list(APPEND opts -Dgstreamer=enabled) +else() + list(APPEND opts -Dgstreamer=disabled) +endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" @@ -41,27 +46,24 @@ vcpkg_configure_meson( -Dasyncns=disabled # requires port? -Davahi=disabled -Dbluez5=disabled - -Dbluez5-native-headset=false - -Dbluez5-ofono-headset=false -Dconsolekit=disabled -Ddbus=enabled -Delogind=disabled -Dfftw=enabled -Dglib=enabled -Dgsettings=disabled - -Dgstreamer=enabled -Dgtk=disabled -Dhal-compat=false -Dipv6=true - -Dopenssl=enabled -Djack=enabled # jack2? -Dlirc=enabled # does this need a port? - -Dorc=enabled # does this need a port? "orc" ? + -Dopenssl=enabled + -Dorc=disabled # not port orc -Dsoxr=enabled -Dspeex=enabled -Dsystemd=disabled - -Dtcpwrap=enabled # dito + -Dtcpwrap=disabled -Dudev=disabled # port ? -Dvalgrind=disabled -Dx11=disabled @@ -89,7 +91,6 @@ if(NOT VCPKG_BUILD_TYPE) endif() vcpkg_copy_tools(TOOL_NAMES pacat pactl padsp pa-info pamon AUTO_CLEAN) -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pulseaudio/vcpkg.json b/ports/pulseaudio/vcpkg.json index fc70062660..1662511500 100644 --- a/ports/pulseaudio/vcpkg.json +++ b/ports/pulseaudio/vcpkg.json @@ -1,11 +1,11 @@ { "name": "pulseaudio", "version": "17.0", - "port-version": 2, + "port-version": 3, "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, - "supports": "!windows & !osx", + "supports": "!android & !osx & !windows", "dependencies": [ { "name": "alsa", @@ -20,10 +20,6 @@ "name": "glib", "default-features": false }, - { - "name": "gstreamer", - "default-features": false - }, "jack2", "libatomic-ops", "libiconv", @@ -38,7 +34,6 @@ "name": "openssl", "default-features": false }, - "orc", "soxr", "speex", { @@ -49,5 +44,19 @@ "name": "vcpkg-tool-meson", "host": true } - ] + ], + "features": { + "gstreamer": { + "description": [ + "Use GStreamer media-related functionality.", + "This feauture may cause dependency cycles with other libs used by gstreamer." + ], + "dependencies": [ + { + "name": "gstreamer", + "default-features": false + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index f9d89e28cb..2321fb4ebb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7514,7 +7514,7 @@ }, "pulseaudio": { "baseline": "17.0", - "port-version": 2 + "port-version": 3 }, "pulzed-mini": { "baseline": "0.9.18", diff --git a/versions/p-/pulseaudio.json b/versions/p-/pulseaudio.json index a5c2a4918e..d1aab93e40 100644 --- a/versions/p-/pulseaudio.json +++ b/versions/p-/pulseaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fbc8a0a9d91a869f066c9f07dd5d684e8392a71", + "version": "17.0", + "port-version": 3 + }, { "git-tree": "498d6911a860d3f86ec25caabd0f63f5180782a2", "version": "17.0",