alsa-lib: update to 1.2.10

This commit is contained in:
cinerea0 2023-09-11 13:06:20 -04:00 committed by Duncan Overbruck
parent b4d9024536
commit 27f08d0bbd
3 changed files with 49 additions and 3 deletions

View file

@ -0,0 +1,31 @@
# Fixes compilation issue on musl
# Upstream: https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c
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
/**

View file

@ -0,0 +1,15 @@
# Fixes ump header detection when used by external programs
# Upstream: https://github.com/alsa-project/alsa-lib/commit/fcce13a6726c52882bd8b7131c61c4eba308792c
diff --git a/include/control.h b/include/control.h
index ab482ba4..e7541d56 100644
--- a/include/control.h
+++ b/include/control.h
@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev);
int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device);
int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info);
int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev);
+#endif
+#ifdef __ALSA_UMP_H
int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device);
int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);

View file

@ -1,6 +1,6 @@
# Template file for 'alsa-lib'
pkgname=alsa-lib
version=1.2.9
version=1.2.10
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libtool"
@ -8,8 +8,8 @@ short_desc="Advanced Linux Sound Architecture (ALSA) library"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
checksum=dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2
distfiles="https://www.alsa-project.org/files/pub/lib/alsa-lib-${version}.tar.bz2"
checksum=c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e
alsa-lib-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"