alsa-utils(-scripts): upgrade 1.2.4 -> 1.2.5

See changelog at [1]

[1] https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5

(From OE-Core rev: 1caf952dc651ab39258fbad98ced5bfa7a7841bf)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 40 insertions, 2 deletions

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb
index 048fef68a5..048fef68a5 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-utils.inc b/meta/recipes-multimedia/alsa/alsa-utils.inc
index f2e8133d2c..a017b02faf 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils.inc
+++ b/meta/recipes-multimedia/alsa/alsa-utils.inc
@@ -23,8 +23,9 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
-SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426"
+SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \
+           file://0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch"
+SRC_URI[sha256sum] = "09970af05838b30001ca93ba27cb85b24c45056c70a80066c3ece6abe5a19997"
 
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb
index 3430288da4..3430288da4 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb
diff --git a/meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch b/meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch
new file mode 100644
index 0000000000..445f3ecade
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch
@@ -0,0 +1,37 @@
+From b20cb6ef5e3f331181b93e39293602ad2c774af8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 3 Jun 2021 16:07:10 +0200
+Subject: [PATCH] utils.c: Include limits.h explicitly to fix build on musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+| ../../alsa-utils-1.2.5/alsactl/utils.c: In function 'snd_card_clean_cfgdir':
+| ../../alsa-utils-1.2.5/alsactl/utils.c:309:19: error: 'PATH_MAX' undeclared (first use in this function)
+|   309 |         char path[PATH_MAX];
+|       |                   ^~~~~~~~
+| ../../alsa-utils-1.2.5/alsactl/utils.c:309:19: note: each undeclared identifier is reported only once for each function it appears in
+
+Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/92]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ alsactl/utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alsactl/utils.c b/alsactl/utils.c
+index 881b505..1a4896b 100644
+--- a/alsactl/utils.c
++++ b/alsactl/utils.c
+@@ -30,6 +30,7 @@
+ #include <syslog.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include <limits.h>
+ #include "alsactl.h"
+ 
+ int file_map(const char *filename, char **buf, size_t *bufsize)
+-- 
+2.31.1
+