diff options
| -rw-r--r-- | packages/sys-sound/alsa-lib/alsa-lib-1.2.4.exheres-0 | 4 | ||||
| -rw-r--r-- | packages/sys-sound/alsa-lib/files/alsa-lib-1.2.4-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch | 35 |
2 files changed, 39 insertions, 0 deletions
diff --git a/packages/sys-sound/alsa-lib/alsa-lib-1.2.4.exheres-0 b/packages/sys-sound/alsa-lib/alsa-lib-1.2.4.exheres-0 index 171b87a03..337e83140 100644 --- a/packages/sys-sound/alsa-lib/alsa-lib-1.2.4.exheres-0 +++ b/packages/sys-sound/alsa-lib/alsa-lib-1.2.4.exheres-0 @@ -28,6 +28,10 @@ DEPENDENCIES=" ]] " +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PNV}-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch +) + DEFAULT_SRC_INSTALL_EXTRA_DOCS=( MEMORY-LEAK ) src_configure() { diff --git a/packages/sys-sound/alsa-lib/files/alsa-lib-1.2.4-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/packages/sys-sound/alsa-lib/files/alsa-lib-1.2.4-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch new file mode 100644 index 000000000..3400b9017 --- /dev/null +++ b/packages/sys-sound/alsa-lib/files/alsa-lib-1.2.4-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch @@ -0,0 +1,35 @@ +Upstream: yes +Reason: Fix build with musl + +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; +-- +2.29.0 + |