forked from kiss-community/repo
alsa-lib: Fix broken patch. Closes #235
This commit is contained in:
parent
168934d63d
commit
d384f5ef5d
@ -1,2 +1,2 @@
|
||||
f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7
|
||||
e662212525269cc01c56f36328133b98a7f39f144815c3e6e251bd7832d57f96
|
||||
714b2b5653a48a7ce8bc29548488e3ce9dcabb937a61ccbdb000d783c51af5fa
|
||||
|
@ -1,26 +1,29 @@
|
||||
dlmisc.c:95:7: error: 'snd_plugin_dir_set' undeclared (first use in this function)
|
||||
95 | if (!snd_plugin_dir_set) {
|
||||
| ^~~~~~~~~~~~~~~~~~
|
||||
dlmisc.c:95:7: note: each undeclared identifier is reported only once for each function it appears in
|
||||
dlmisc.c:98:4: error: 'snd_plugin_dir' undeclared (first use in this function)
|
||||
98 | snd_plugin_dir = strdup(env);
|
||||
|
|
||||
From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Thu, 22 Oct 2020 20:57:32 +0200
|
||||
Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
|
||||
declared even for \!DL_ORIGIN_AVAILABLE
|
||||
|
||||
Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
|
||||
BugLink: https://github.com/alsa-project/alsa-lib/issues/91
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
src/dlmisc.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/dlmisc.c b/src/dlmisc.c
|
||||
index c9517c55..f20eb593 100644
|
||||
--- a/src/dlmisc.c
|
||||
+++ b/src/dlmisc.c
|
||||
@@ -91,6 +91,7 @@
|
||||
*/
|
||||
int snd_dlpath(char *path, size_t path_len, const char *name)
|
||||
{
|
||||
+#ifdef DL_ORIGIN_AVAILABLE
|
||||
snd_dlpath_lock();
|
||||
if (!snd_plugin_dir_set) {
|
||||
const char *env = getenv("ALSA_PLUGIN_DIR");
|
||||
@@ -104,6 +105,7 @@
|
||||
snprintf(path, path_len, "%s/%s",
|
||||
snd_plugin_dir ? snd_plugin_dir : ALSA_PLUGIN_DIR, name);
|
||||
snd_dlpath_unlock();
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
@@ -42,11 +42,9 @@
|
||||
#ifndef PIC
|
||||
struct snd_dlsym_link *snd_dlsym_start = NULL;
|
||||
#endif
|
||||
-#ifdef DL_ORIGIN_AVAILABLE
|
||||
static int snd_plugin_dir_set = 0;
|
||||
static char *snd_plugin_dir = NULL;
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
#if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
|
||||
static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
Loading…
Reference in New Issue
Block a user