From 353bf3e1c4f93c6c13abbcc61478d8a1ed772978 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Wed, 21 Oct 2020 17:46:31 +0300
Subject: [PATCH] alsa-lib: 1.2.4

---
 extra/alsa-lib/build                 |  2 ++
 extra/alsa-lib/checksums             |  3 ++-
 extra/alsa-lib/patches/fix-dlo.patch | 26 ++++++++++++++++++++++++++
 extra/alsa-lib/sources               |  3 ++-
 extra/alsa-lib/version               |  2 +-
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 extra/alsa-lib/patches/fix-dlo.patch

diff --git a/extra/alsa-lib/build b/extra/alsa-lib/build
index d6f70b3d..01c3be20 100755
--- a/extra/alsa-lib/build
+++ b/extra/alsa-lib/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+patch -p1 < fix-dlo.patch
+
 ./configure \
     --without-debug \
     --prefix=/usr
diff --git a/extra/alsa-lib/checksums b/extra/alsa-lib/checksums
index 8ae07fc6..65c80e6c 100644
--- a/extra/alsa-lib/checksums
+++ b/extra/alsa-lib/checksums
@@ -1 +1,2 @@
-e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15  alsa-lib-1.2.3.2.tar.bz2
+f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7
+e662212525269cc01c56f36328133b98a7f39f144815c3e6e251bd7832d57f96
diff --git a/extra/alsa-lib/patches/fix-dlo.patch b/extra/alsa-lib/patches/fix-dlo.patch
new file mode 100644
index 00000000..97edc5f9
--- /dev/null
+++ b/extra/alsa-lib/patches/fix-dlo.patch
@@ -0,0 +1,26 @@
+dlmisc.c:95:7: error: 'snd_plugin_dir_set' undeclared (first use in this function)
+   95 |  if (!snd_plugin_dir_set) {
+      |       ^~~~~~~~~~~~~~~~~~
+dlmisc.c:95:7: note: each undeclared identifier is reported only once for each function it appears in
+dlmisc.c:98:4: error: 'snd_plugin_dir' undeclared (first use in this function)
+   98 |    snd_plugin_dir = strdup(env);
+      |
+
+--- a/src/dlmisc.c
++++ b/src/dlmisc.c
+@@ -91,6 +91,7 @@
+  */
+ int snd_dlpath(char *path, size_t path_len, const char *name)
+ {
++#ifdef DL_ORIGIN_AVAILABLE
+ 	snd_dlpath_lock();
+ 	if (!snd_plugin_dir_set) {
+ 		const char *env = getenv("ALSA_PLUGIN_DIR");
+@@ -104,6 +105,7 @@
+ 	snprintf(path, path_len, "%s/%s",
+ 		 snd_plugin_dir ? snd_plugin_dir : ALSA_PLUGIN_DIR, name);
+ 	snd_dlpath_unlock();
++#endif
+ 	return 0;
+ }
+ 
diff --git a/extra/alsa-lib/sources b/extra/alsa-lib/sources
index 7f36acfd..fd80bd57 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/fix-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