Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[alsa] Fix issue #26161 (#28090)

This commit is contained in:
nfarid 2022-12-02 17:16:18 +00:00 committed by GitHub
parent eaa6e7215d
commit 2b53da5e1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/alsa/fix-plugin-dir.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/dlmisc.c b/src/dlmisc.c
index 1dd91356..19ee9cfa 100644
--- a/src/dlmisc.c
+++ b/src/dlmisc.c
@@ -95,7 +95,7 @@ int snd_dlpath(char *path, size_t path_len, const char *name)
if (env) {
snd_plugin_dir = strdup(env);
} else {
- snd_dlinfo_origin(path, path_len);
+ snd_plugin_dir = strdup(ALSA_PLUGIN_DIR);
}
snd_plugin_dir_set = 1;
}

18
ports/alsa/portfile.cmake
View File

@ -14,6 +14,8 @@ vcpkg_from_github(
REF v1.2.6.1
SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47
HEAD_REF master
PATCHES
"fix-plugin-dir.patch"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -22,12 +24,26 @@ else()
set(BUILD_OPTS --enable-shared=no --enable-static=yes)
endif()
set(ARCH64 "x64;arm64")
set(ARCH32 "x86;arm")
if( (VCPKG_TARGET_ARCHITECTURE IN_LIST ARCH64) AND (EXISTS "/usr/lib64/alsa-lib") )
set(ALSA_PLUGIN_DIR "/usr/lib64/alsa-lib")
elseif( (VCPKG_TARGET_ARCHITECTURE IN_LIST ARCH32) AND (EXISTS "/usr/lib32/alsa-lib") )
set(ALSA_PLUGIN_DIR "/usr/lib32/alsa-lib")
else()
set(ALSA_PLUGIN_DIR "/usr/lib/alsa-lib")
endif()
set(ALSA_CONFIG_DIR "/usr/share/alsa")
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
OPTIONS
${BUILD_OPTS}
--disable-python
"--with-configdir=${ALSA_CONFIG_DIR}"
"--with-plugindir=${ALSA_PLUGIN_DIR}"
)
vcpkg_install_make()
@ -38,3 +54,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug")
configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

5
ports/alsa/usage Normal file
View File

@ -0,0 +1,5 @@
CMake provides the module target:
find_package("ALSA" MODULE REQUIRED)
target_link_libraries("main" PRIVATE "ALSA::ALSA")

1
ports/alsa/vcpkg.json
View File

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

5
versions/a-/alsa.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "66750ac0b1a786a2fec12e88ca0e110b3f41d75e",
"version": "1.2.6.1",
"port-version": 1
},
{
"git-tree": "1ce0c3410e25de5357b707dc0f800cf7c3a7f213",
"version": "1.2.6.1",

2
versions/baseline.json
View File

@ -78,7 +78,7 @@
},
"alsa": {
"baseline": "1.2.6.1",
"port-version": 0
"port-version": 1
},
"ampl-asl": {
"baseline": "2020-11-11",