alsa-lib: bump to 1.2.5

6 files changed, 28 insertions, 35 deletions

diff --git a/extra/alsa-lib/build b/extra/alsa-lib/build
index 2a68c4f5..11cfcd2f 100755
--- a/extra/alsa-lib/build
+++ b/extra/alsa-lib/build
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-patch -p1 < dlo.patch
+patch -p1 < 1.2.5.patch
 
 ./configure \
     --prefix=/usr \
diff --git a/extra/alsa-lib/checksums b/extra/alsa-lib/checksums
index 85338bc8..91346538 100644
--- a/extra/alsa-lib/checksums
+++ b/extra/alsa-lib/checksums
@@ -1,2 +1,2 @@
-f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7  alsa-lib-1.2.4.tar.bz2
-714b2b5653a48a7ce8bc29548488e3ce9dcabb937a61ccbdb000d783c51af5fa  dlo.patch
+9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18  alsa-lib-1.2.5.tar.bz2
+83973a66c3ff3a8fef0ac3c78f834335cb511b2f7886d4919bc11b2dda3debb5  1.2.5.patch
diff --git a/extra/alsa-lib/patches/1.2.5.patch b/extra/alsa-lib/patches/1.2.5.patch
new file mode 100644
index 00000000..bc660803
--- /dev/null
+++ b/extra/alsa-lib/patches/1.2.5.patch
@@ -0,0 +1,22 @@
+diff -ur alsa-lib/aserver/aserver.c alsa-lib-patch/aserver/aserver.c
+--- alsa-lib/aserver/aserver.c	2021-05-28 00:30:16.000000000 +0300
++++ alsa-lib-patch/aserver/aserver.c	2021-06-02 18:18:31.636265488 +0300
+@@ -35,6 +35,7 @@
+ 
+ #include "aserver.h"
+ 
++const char *_snd_module_control_empty;
+ char *command;
+ 
+ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+diff -ur alsa-lib/src/ucm/ucm_exec.c alsa-lib-patch/src/ucm/ucm_exec.c
+--- alsa-lib/src/ucm/ucm_exec.c	2021-05-28 00:30:16.000000000 +0300
++++ alsa-lib-patch/src/ucm/ucm_exec.c	2021-06-02 18:10:31.353590485 +0300
+@@ -31,6 +31,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <dirent.h>
++#include <limits.h>
+ 
+ static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;
+ 
diff --git a/extra/alsa-lib/patches/dlo.patch b/extra/alsa-lib/patches/dlo.patch
deleted file mode 100644
index b88dd3c2..00000000
--- a/extra/alsa-lib/patches/dlo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 54e0232c..0fe4de98 100644
--- a/extra/alsa-lib/sources
+++ b/extra/alsa-lib/sources
@@ -1,2 +1,2 @@
-https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.4.tar.bz2
-patches/dlo.patch
+https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.5.tar.bz2
+patches/1.2.5.patch
diff --git a/extra/alsa-lib/version b/extra/alsa-lib/version
index d66671c6..be660e42 100644
--- a/extra/alsa-lib/version
+++ b/extra/alsa-lib/version
@@ -1 +1 @@
-1.2.4 1
+1.2.5 1