Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 audio-drivers/alsa-utils/HISTORY                              |    4 +
 audio-drivers/alsa-utils/PRE_BUILD                            |    4 -
 audio-drivers/alsa-utils/patches-stable/0001-glibc-2.38.patch |   39 
++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 307d34b2a839f1a309d82b7fbc30093d77b48128
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    audio-drivers/alsa-utils: fixed compilation with glibc 2.38

diff --git a/audio-drivers/alsa-utils/HISTORY 
b/audio-drivers/alsa-utils/HISTORY
index f9d7725..8886051 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,7 @@
+2023-08-04 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD, patches-stable/0001-glibc-2.38.patch: added upstream 
patch to
+         fix compilation with glibc 2.38
+
 2023-05-14 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.2.9
 
diff --git a/audio-drivers/alsa-utils/PRE_BUILD 
b/audio-drivers/alsa-utils/PRE_BUILD
index 5162c16..ee5d2ac 100755
--- a/audio-drivers/alsa-utils/PRE_BUILD
+++ b/audio-drivers/alsa-utils/PRE_BUILD
@@ -19,4 +19,6 @@ if [[ $ALSA_UTILS_BRANCH == scm ]]; then
   automake --foreign --copy --add-missing &&
   touch depcomp &&
   autoconf
-fi
+fi &&
+
+apply_patch_dir "patches-${ALSA_UTILS_BRANCH}"
diff --git a/audio-drivers/alsa-utils/patches-stable/0001-glibc-2.38.patch 
b/audio-drivers/alsa-utils/patches-stable/0001-glibc-2.38.patch
new file mode 100644
index 0000000..9580759
--- /dev/null
+++ b/audio-drivers/alsa-utils/patches-stable/0001-glibc-2.38.patch
@@ -0,0 +1,39 @@
+From d6a71bfbde9e1710743d3a446c6ea3b41c45234e Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi AT heitbaum.com>
+Date: Sat, 22 Jul 2023 15:36:09 +0000
+Subject: [PATCH] alsactl: add define to compile with glibc 2.38
+
+strlcat and strlcpy have been added to glibc 2.38.
+update the defines to use the glibc versions, and not conflict with
+string.h.
+
+ref:
+- 
https://sourceware.org/git/?p=glibc.git;a=commit;h=454a20c8756c9c1d55419153255fc7692b3d2199
+
+Fixes: https://github.com/alsa-project/alsa-utils/pull/225
+Signed-off-by: Jaroslav Kysela <perex AT perex.cz>
+---
+ alsactl/init_sysdeps.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/alsactl/init_sysdeps.c b/alsactl/init_sysdeps.c
+index 3aca1b4..f09b1ae 100644
+--- a/alsactl/init_sysdeps.c
++++ b/alsactl/init_sysdeps.c
+@@ -18,6 +18,7 @@
+  */
+ 
+ #if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
++#if !(__GLIBC_PREREQ(2, 38))
+ static size_t strlcpy(char *dst, const char *src, size_t size)
+ {
+       size_t bytes = 0;
+@@ -60,4 +61,5 @@ static size_t strlcat(char *dst, const char *src, size_t 
size)
+       *q = '\0';
+       return bytes;
+ }
++#endif /* !(__GLIBC_PREREQ(2, 38)) */
+ #endif /* __GLIBC__ */
+-- 
+2.39.1
+