From 5ee10c1c6f4ac16521ddb58108e02b320cf1f82b Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Thu, 1 Feb 2024 23:46:53 -0600
Subject: [PATCH] alsa-lib: 1.2.11

---
 extra/alsa-lib/build                     |  2 --
 extra/alsa-lib/checksums                 |  3 +-
 extra/alsa-lib/patches/musl-string.patch | 40 ------------------------
 extra/alsa-lib/sources                   |  3 +-
 extra/alsa-lib/version                   |  2 +-
 5 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 extra/alsa-lib/patches/musl-string.patch

diff --git a/extra/alsa-lib/build b/extra/alsa-lib/build
index 5d847b2c..d6f70b3d 100755
--- a/extra/alsa-lib/build
+++ b/extra/alsa-lib/build
@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-patch -p1 < musl-string.patch
-
 ./configure \
     --without-debug \
     --prefix=/usr
diff --git a/extra/alsa-lib/checksums b/extra/alsa-lib/checksums
index 5425cf67..71516d1f 100644
--- a/extra/alsa-lib/checksums
+++ b/extra/alsa-lib/checksums
@@ -1,2 +1 @@
-2b4135a78ec571bc2c03cc816f606241192ca695a808a30a4b59f2c01a197b370f
-87d72a868cd73f26e4794bf4430e16a866dc5c63649d27edbbcf43b7b02d936470
+1cc87493edeaeab743b549c4641e3d9a03f06f92a9b63d5a389153da1ae9fe5c56
diff --git a/extra/alsa-lib/patches/musl-string.patch b/extra/alsa-lib/patches/musl-string.patch
deleted file mode 100644
index 49747dcf..00000000
--- a/extra/alsa-lib/patches/musl-string.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 6 Sep 2023 15:16:44 +0200
-Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
-
-It solves the musl libc compilation issue.
-
-control.c: In function 'snd_ctl_open_conf':
-../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio]
-   98 | #define SND_DLSYM_VERSION(version) __STRING(version)
-      |                                    ^~~~~~~~
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/350
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/include/global.h
-+++ b/include/global.h
-@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
- #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
- #endif
- 
-+#ifndef __STRING
-+/** \brief Return 'x' argument as string */
-+#define __STRING(x)     #x
-+#endif
-+
- #ifdef PIC /* dynamic build */
- 
- /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
-@@ -71,11 +76,6 @@ struct snd_dlsym_link {
- 
- extern struct snd_dlsym_link *snd_dlsym_start;
- 
--#ifndef __STRING
--/** \brief Return 'x' argument as string */
--#define __STRING(x)     #x
--#endif
--
- /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
- #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
- /**
diff --git a/extra/alsa-lib/sources b/extra/alsa-lib/sources
index 61a824ff..ecc21dcc 100644
--- a/extra/alsa-lib/sources
+++ b/extra/alsa-lib/sources
@@ -1,2 +1 @@
-https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.10.tar.bz2
-patches/musl-string.patch
+https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.11.tar.bz2
diff --git a/extra/alsa-lib/version b/extra/alsa-lib/version
index 610f0a11..90288038 100644
--- a/extra/alsa-lib/version
+++ b/extra/alsa-lib/version
@@ -1 +1 @@
-1.2.10 1
+1.2.11 1