From 28939644f9bb68cb6484d4e72fe724e30c8d7b06 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 3 Jun 2024 08:18:08 +0200 Subject: [PATCH] [pulseaudio] Misc fixes (#39065) Fixes: ~~~ CMake Warning (dev) at ports/pulseaudio/portfile.cmake:85: Syntax Warning in cmake code at column 96 Argument not separated from preceding token by whitespace. ~~~ --- ports/pulseaudio/portfile.cmake | 10 +++++----- ports/pulseaudio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pulseaudio.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/pulseaudio/portfile.cmake b/ports/pulseaudio/portfile.cmake index aa3432b944..f20c4b3660 100644 --- a/ports/pulseaudio/portfile.cmake +++ b/ports/pulseaudio/portfile.cmake @@ -14,12 +14,12 @@ vcpkg_replace_string ("${SOURCE_PATH}/meson.build" set(opts "") if(VCPKG_TARGET_IS_LINUX) - set(opts + list(APPEND opts -Dalsa=enabled -Doss-output=enabled ) else() - set(opts + list(APPEND opts -Dalsa=disabled -Doss-output=disabled ) @@ -38,7 +38,7 @@ vcpkg_configure_meson( -Dbashcompletiondir=no -Dzshcompletiondir=no - -Dasyncns=disabled # rerquires port? + -Dasyncns=disabled # requires port? -Davahi=disabled -Dbluez5=disabled -Dbluez5-native-headset=false @@ -80,9 +80,9 @@ endif() vcpkg_install_meson() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(PACKAGE_NAME PulseAudio CONFIG_PATH "lib/cmake/PulseAudio") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/PulseAudio") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/padsp" "${CURRENT_PACKAGES_DIR}" "$(dirname "$0")/../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/padsp" "${CURRENT_PACKAGES_DIR}" [[$(dirname "$0")/../..]]) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/pulse/client.conf" "${CURRENT_PACKAGES_DIR}" "") if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/etc/pulse/client.conf" "${CURRENT_PACKAGES_DIR}" "") diff --git a/ports/pulseaudio/vcpkg.json b/ports/pulseaudio/vcpkg.json index 070dca0b24..e4b1e962e2 100644 --- a/ports/pulseaudio/vcpkg.json +++ b/ports/pulseaudio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pulseaudio", "version": "17.0", + "port-version": 1, "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, diff --git a/versions/baseline.json b/versions/baseline.json index 7a6e4b0b7e..d5f1324e24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7062,7 +7062,7 @@ }, "pulseaudio": { "baseline": "17.0", - "port-version": 0 + "port-version": 1 }, "pulzed-mini": { "baseline": "0.9.14", diff --git a/versions/p-/pulseaudio.json b/versions/p-/pulseaudio.json index 86534ea56a..a02982b181 100644 --- a/versions/p-/pulseaudio.json +++ b/versions/p-/pulseaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb9160ce88d38cfeb2a6b49a91620a3e53b368f8", + "version": "17.0", + "port-version": 1 + }, { "git-tree": "26c834504f848ba81304aacc552a16bac2c4dece", "version": "17.0",