aboutsummaryrefslogtreecommitdiff
path: root/repos
diff options
context:
space:
mode:
authoremmett1 <emmett1.2miligrams@protonmail.com>2024-07-08 09:56:58 +0800
committeremmett1 <emmett1.2miligrams@protonmail.com>2024-07-08 09:56:58 +0800
commit7e135f167d54107dee9b6286cd3029fdab459361 (patch)
treee447ebee81bf7858e4a710f761baa3be8b29d764 /repos
parentd76fd2b7195fce446bcf778fc75c2d76f206bb2e (diff)
downloadalicelinux-7e135f167d54107dee9b6286cd3029fdab459361.tar.gz
alicelinux-7e135f167d54107dee9b6286cd3029fdab459361.zip
alsa-lib: updated to 1.2.12
Diffstat (limited to 'repos')
-rw-r--r--repos/extra/alsa-lib/abuild5
-rw-r--r--repos/extra/alsa-lib/musl-string.patch40
2 files changed, 2 insertions, 43 deletions
diff --git a/repos/extra/alsa-lib/abuild b/repos/extra/alsa-lib/abuild
index 660e7650..0a70148a 100644
--- a/repos/extra/alsa-lib/abuild
+++ b/repos/extra/alsa-lib/abuild
@@ -1,5 +1,4 @@
name=alsa-lib
-version=1.2.10
+version=1.2.12
release=1
-source="https://www.alsa-project.org/files/pub/lib/$name-$version.tar.bz2
- musl-string.patch"
+source="https://www.alsa-project.org/files/pub/lib/$name-$version.tar.bz2"
diff --git a/repos/extra/alsa-lib/musl-string.patch b/repos/extra/alsa-lib/musl-string.patch
deleted file mode 100644
index 49747dcf..00000000
--- a/repos/extra/alsa-lib/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
- /**