[alsa] Add version script patch, cleanup (#37505)

Fixes https://github.com/microsoft/vcpkg/issues/37438
This commit is contained in:
Kai Pastor 2024-03-18 22:38:52 +01:00 committed by GitHub
parent 7008c6abcb
commit 65b5ab9db5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 14 deletions

View File

@ -11,6 +11,12 @@ On Alpine:
apk add autoconf automake libtool"
)
vcpkg_download_distfile(ALSA_VERSION_SCRIPT_PATCH
URLS https://github.com/alsa-project/alsa-lib/commit/2a736a0d2543f206fd2653aaae8a08a4c42eb917.diff?full_index=1
FILENAME alsa-version-script-2a736a.patch
SHA512 d3f2c73b8e8fbae36de43c1db6b59489a0a28c1bc7992f13f40e83f64dfcaaee2d6688b7133668f54685e2d92a2cc06ad03b2efdb40c3c1da7f020f9f0a04de7
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alsa-project/alsa-lib
@ -18,17 +24,10 @@ vcpkg_from_github(
SHA512 da9277007dd3b197fcafb748ced4ace89fdb1ab5eafae7596e91935ee9fb410be54fa76aabe86cdd83227e48cd073a7df319e90bdf06fa2da7c97470c085645d
HEAD_REF master
PATCHES
"fix-plugin-dir.patch"
fix-plugin-dir.patch
${ALSA_VERSION_SCRIPT_PATCH}
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(BUILD_OPTS --enable-shared=yes --enable-static=no)
else()
set(BUILD_OPTS --enable-shared=no --enable-static=yes)
endif()
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(ALSA_PLUGIN_DIR "/usr/lib/x86_64-linux-gnu/alsa-lib")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

View File

@ -1,5 +1,4 @@
alsa is compatible with built-in CMake targets:
CMake provides the module target:
find_package("ALSA" MODULE REQUIRED)
target_link_libraries("main" PRIVATE "ALSA::ALSA")
find_package(ALSA REQUIRED)
target_link_libraries(main PRIVATE ALSA::ALSA) # since CMake 3.12

View File

@ -1,6 +1,7 @@
{
"name": "alsa",
"version": "1.2.11",
"port-version": 1,
"description": "The Advanced Linux Sound Architecture (ALSA) - library",
"homepage": "https://www.alsa-project.org/",
"license": "LGPL-2.1-or-later",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "78ad470e54eac71113219036519aa55ff3489294",
"version": "1.2.11",
"port-version": 1
},
{
"git-tree": "1ea8f5d1e2f27c55e80e1bcce24aacc37849074e",
"version": "1.2.11",

View File

@ -94,7 +94,7 @@
},
"alsa": {
"baseline": "1.2.11",
"port-version": 0
"port-version": 1
},
"amd-adl-sdk": {
"baseline": "17.1",