diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-25 22:35:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-25 22:35:03 +0000 |
| commit | 5dd8aee9a87d9444564e81e3e57c914e8ffcf40e (patch) | |
| tree | ba6a7f589fa25090fcbd5243800feec16cefd24c /user/alsa-lib/dlmisc_c.patch | |
| parent | d6ff5308eceebf680b5b952abf2a47a6ad620b94 (diff) | |
| parent | ed563b2d4204e2e0abc18f7656e402f899c68404 (diff) | |
| download | packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.tar.gz packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.tar.bz2 packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.tar.xz packages-5dd8aee9a87d9444564e81e3e57c914e8ffcf40e.zip | |
Merge branch 'alsa-utils' into 'master'
user/alsa-utils: Upgrade to 1.2.4
See merge request adelie/packages!514
Diffstat (limited to 'user/alsa-lib/dlmisc_c.patch')
| -rw-r--r-- | user/alsa-lib/dlmisc_c.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/user/alsa-lib/dlmisc_c.patch b/user/alsa-lib/dlmisc_c.patch new file mode 100644 index 000000000..b88dd3c29 --- /dev/null +++ b/user/alsa-lib/dlmisc_c.patch @@ -0,0 +1,29 @@ +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 +@@ -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; |