summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2020-10-23 20:16:28 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2020-10-23 20:43:12 +0200
commit0b6d0890279c73cb00d9c56d769b13ee4b30afc9 (patch)
tree23329780991b42ef75e983561abcf1be72469464
parent4c5d7a7014bb65277f5dba607503f4061b167e63 (diff)
downloadarbor-0b6d0890279c73cb00d9c56d769b13ee4b30afc9.tar.gz
arbor-0b6d0890279c73cb00d9c56d769b13ee4b30afc9.tar.xz
alsa-lib: Fix build with musl
-rw-r--r--packages/sys-sound/alsa-lib/alsa-lib-1.2.4.exheres-04
-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.patch35
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
+