From c97b4cc35b769db4bb955f388dd0265ac8fd1d22 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 30 Dec 2024 08:36:48 +0100 Subject: [PATCH 1/2] [alsa] Fix multiple find_package(ALSA REQUIRED) --- ports/alsa/vcpkg-cmake-wrapper.cmake | 5 +---- ports/alsa/vcpkg.json | 1 + versions/a-/alsa.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/alsa/vcpkg-cmake-wrapper.cmake b/ports/alsa/vcpkg-cmake-wrapper.cmake index ae3b078abeb6a4..490d45dc9f079c 100644 --- a/ports/alsa/vcpkg-cmake-wrapper.cmake +++ b/ports/alsa/vcpkg-cmake-wrapper.cmake @@ -22,10 +22,7 @@ find_library( include(SelectLibraryConfigurations) select_library_configurations(ALSA) unset(ALSA_FOUND) - -if(NOT ALSA_INCLUDE_DIR OR NOT ALSA_LIBRARY) - message(FATAL_ERROR "Broken installation of the alsa vcpkg port") -endif() +set(ALSA_LIBRARY "${ALSA_LIBRARY}" CACHE INTERNAL "") _find_package(${ARGS}) diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json index fd8be7f78fc719..6edb1f4f65f3fb 100644 --- a/ports/alsa/vcpkg.json +++ b/ports/alsa/vcpkg.json @@ -1,6 +1,7 @@ { "name": "alsa", "version": "1.2.13", + "port-version": 1, "description": "The Advanced Linux Sound Architecture (ALSA) - library", "homepage": "https://www.alsa-project.org/", "license": "LGPL-2.1-or-later", diff --git a/versions/a-/alsa.json b/versions/a-/alsa.json index 82b78716fbbfa4..1d8cdb75b208c4 100644 --- a/versions/a-/alsa.json +++ b/versions/a-/alsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c80dafc2416d968c6f9060a12de375b70457fb57", + "version": "1.2.13", + "port-version": 1 + }, { "git-tree": "5dd0d76c964da48ce085c9a66ad00463c0607916", "version": "1.2.13", diff --git a/versions/baseline.json b/versions/baseline.json index fd13fea6c4b5a1..12671c8a846da9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -98,7 +98,7 @@ }, "alsa": { "baseline": "1.2.13", - "port-version": 0 + "port-version": 1 }, "amd-adl-sdk": { "baseline": "17.1", From 558e52b749d4cda09fec64a856443f785fa27e46 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 30 Dec 2024 08:43:30 +0100 Subject: [PATCH 2/2] [cmake-user] Test ALSA --- scripts/test_ports/cmake-user/vcpkg.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index 241a18bcb54680..88374df612576e 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -22,6 +22,11 @@ "find-package": { "description": "Ports to be tested via find_package($package)", "dependencies": [ + { + "$package": "ALSA", + "name": "alsa", + "platform": "linux" + }, { "$package": "Boost", "name": "boost",