Upgraded alsa-lib from 1.2.9 to 1.2.10

build-scripts/alsa-lib.build

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-# ALSA Library 
-# Source: https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.9.tar.bz2
+# ALSA Library
+# Source: https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.10.tar.bz2 
 #
 # $BUILD = Directory to temporarily install
 # $PKGS  = Directory to store built packages
@@ -17,10 +17,14 @@ export CFLAGS+="-O3 -falign-functions=32 -fno-lto "
 export CFLAGS+="-fno-math-errno -fno-semantic-interposition -fno-trapping-math "
 #export LDFLAGS="-flto=4 -Wl,-O2 -Wl,--as-needed "
 
+# Apply fixes from Chimera Linux
+patch -Np1 -i ../patches/alsa-lib-chimera/10bd599970acc71c92f85eb08943eb8d3d702a9c.patch
+patch -Np1 -i ../patches/alsa-lib-chimera/overflow.patch 
+patch -Np1 -i ../patches/alsa-lib-chimera/test-oldapi.patch 
+
+autoreconf -vfi
+
 ./configure --prefix=/usr \
-		--disable-python \
-		--disable-static \
-		--disable-resmgr \
 		--enable-rawmidi \
 		--enable-seq \
 		--enable-aload $BUILDTRUPLE &&
@@ -51,5 +55,5 @@ alsa-lib:
 alsa-lib:
 EOF
 sudo -S mv -v /tmp/slack-desc install/ &&
-sudo -S makepkg -l y -c n $PKGS/alsa-lib-1.2.9-$PSUFFIX &&
+sudo -S makepkg -l y -c n $PKGS/alsa-lib-1.2.10-$PSUFFIX &&
 sudo -S rm -rf ${BUILD}/*

patches/alsa-lib-chimera/10bd599970acc71c92f85eb08943eb8d3d702a9c.patch

@@ -0,0 +1,46 @@
+From 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>
+---
+ include/global.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/global.h b/include/global.h
+index dfe9bc2b..3ecaeee8 100644
+--- 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
+ /**

patches/alsa-lib-chimera/overflow.patch

@@ -0,0 +1,19 @@
+commit 68aaf69a38e767a07c7ebedfe816e6425ea42f7d
+Author: q66 <q66@chimera-linux.org>
+Date:   Thu Sep 7 17:16:06 2023 +0200
+
+    fix signed int overflow in pcm_softvol
+
+diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
+index 75f2aa0..38c6367 100644
+--- a/src/pcm/pcm_softvol.c
++++ b/src/pcm/pcm_softvol.c
+@@ -113,7 +113,7 @@ static inline int MULTI_DIV_32x16(int a, unsigned short b)
+ 	y.i = 0;
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ 	x.i = (unsigned short)v.s[0];
+-	x.i *= b;
++	x.i *= (unsigned int)b;
+ 	y.s[0] = x.s[1];
+ 	y.i += (int)v.s[1] * b;
+ #else

patches/alsa-lib-chimera/test-oldapi.patch

@@ -0,0 +1,21 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 99c2c4f..ac7bae1 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS=. lsb
+ 
+ check_PROGRAMS=control pcm pcm_min latency seq \
+ 	       playmidi1 timer rawmidi midiloop \
+-	       oldapi queue_timer namehint client_event_filter \
++	       queue_timer namehint client_event_filter \
+ 	       chmap audio_time user-ctl-element-set pcm-multi-thread
+ 
+ control_LDADD=../src/libasound.la
+@@ -16,7 +16,6 @@ playmidi1_LDADD=../src/libasound.la
+ timer_LDADD=../src/libasound.la
+ rawmidi_LDADD=../src/libasound.la
+ midiloop_LDADD=../src/libasound.la
+-oldapi_LDADD=../src/libasound.la
+ queue_timer_LDADD=../src/libasound.la
+ namehint_LDADD=../src/libasound.la
+ client_event_filter_LDADD=../src/libasound.la