aboutsummaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rwxr-xr-xextra/alsa-lib/build2
-rw-r--r--extra/alsa-lib/checksums3
-rw-r--r--extra/alsa-lib/patches/dlo.patch29
-rw-r--r--extra/alsa-lib/sources3
-rw-r--r--extra/alsa-lib/version2
5 files changed, 36 insertions, 3 deletions
diff --git a/extra/alsa-lib/build b/extra/alsa-lib/build
index edc209ad..2a68c4f5 100755
--- a/extra/alsa-lib/build
+++ b/extra/alsa-lib/build
@@ -1,5 +1,7 @@
#!/bin/sh -e
+patch -p1 < dlo.patch
+
./configure \
--prefix=/usr \
--without-debug
diff --git a/extra/alsa-lib/checksums b/extra/alsa-lib/checksums
index 8ae07fc6..85338bc8 100644
--- a/extra/alsa-lib/checksums
+++ b/extra/alsa-lib/checksums
@@ -1 +1,2 @@
-e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15 alsa-lib-1.2.3.2.tar.bz2
+f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 alsa-lib-1.2.4.tar.bz2
+714b2b5653a48a7ce8bc29548488e3ce9dcabb937a61ccbdb000d783c51af5fa dlo.patch
diff --git a/extra/alsa-lib/patches/dlo.patch b/extra/alsa-lib/patches/dlo.patch
new file mode 100644
index 00000000..b88dd3c2
--- /dev/null
+++ b/extra/alsa-lib/patches/dlo.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;
diff --git a/extra/alsa-lib/sources b/extra/alsa-lib/sources
index 7f36acfd..54e0232c 100644
--- a/extra/alsa-lib/sources
+++ b/extra/alsa-lib/sources
@@ -1 +1,2 @@
-https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.3.2.tar.bz2
+https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.4.tar.bz2
+patches/dlo.patch
diff --git a/extra/alsa-lib/version b/extra/alsa-lib/version
index 84be1255..d66671c6 100644
--- a/extra/alsa-lib/version
+++ b/extra/alsa-lib/version
@@ -1 +1 @@
-1.2.3.2 1
+1.2.4 1