From b9d4212e65295367f7b745ea8e5717a1e377b6e7 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 11 Sep 2023 12:18:53 -0400 Subject: [PATCH 1/3] alsa-lib: update to 1.2.10 --- .../alsa-lib/patches/move-string-macro.patch | 31 +++++++++++++++++++ .../patches/ump-header-detection.patch | 15 +++++++++ srcpkgs/alsa-lib/template | 6 ++-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/alsa-lib/patches/move-string-macro.patch create mode 100644 srcpkgs/alsa-lib/patches/ump-header-detection.patch diff --git a/srcpkgs/alsa-lib/patches/move-string-macro.patch b/srcpkgs/alsa-lib/patches/move-string-macro.patch new file mode 100644 index 0000000000000..98973c1e8a13b --- /dev/null +++ b/srcpkgs/alsa-lib/patches/move-string-macro.patch @@ -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 + /** + diff --git a/srcpkgs/alsa-lib/patches/ump-header-detection.patch b/srcpkgs/alsa-lib/patches/ump-header-detection.patch new file mode 100644 index 0000000000000..efe9909fef912 --- /dev/null +++ b/srcpkgs/alsa-lib/patches/ump-header-detection.patch @@ -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); diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 576745a852198..ce379c317b96f 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -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 " 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}" From cee97f8aff2ded32bdf4d16c2c6128a8d95937f0 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 11 Sep 2023 12:19:20 -0400 Subject: [PATCH 2/3] alsa-utils: update to 1.2.10 --- srcpkgs/alsa-utils/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template index 90cf5e61ec600..4ce3c088da079 100644 --- a/srcpkgs/alsa-utils/template +++ b/srcpkgs/alsa-utils/template @@ -1,6 +1,6 @@ # Template file for 'alsa-utils' pkgname=alsa-utils -version=1.2.9 +version=1.2.10 revision=1 build_style=gnu-configure configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf @@ -13,8 +13,10 @@ short_desc="Advanced Linux Sound Architecture (ALSA) utilities" maintainer="cinerea0 " license="GPL-2.0-only" homepage="http://www.alsa-project.org" -distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2" -checksum=e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd +distfiles="https://www.alsa-project.org/files/pub/utils/alsa-utils-${version}.tar.bz2" +checksum=104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a + +export LC_ALL="C" post_install() { # Install required udev rules file. From b3270c2a1866621aa61752b350a242bed321dcb9 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 11 Sep 2023 12:19:36 -0400 Subject: [PATCH 3/3] alsa-ucm-conf: update to 1.2.10 --- srcpkgs/alsa-ucm-conf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template index a965973cb1dce..d02f228895ef6 100644 --- a/srcpkgs/alsa-ucm-conf/template +++ b/srcpkgs/alsa-ucm-conf/template @@ -1,13 +1,13 @@ # Template file for 'alsa-ucm-conf' pkgname=alsa-ucm-conf -version=1.2.9 +version=1.2.10 revision=1 short_desc="ALSA Use Case Manager topology configurations" maintainer="cinerea0 " license="BSD-3-Clause" homepage="https://github.com/alsa-project/alsa-ucm-conf" -distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz" -checksum=1c40618161bc2738c55aab4dee1d0c82514e257116f296815a799adeaab5e48b +distfiles="https://github.com/alsa-project/alsa-ucm-conf/archive/refs/tags/v${version}.tar.gz" +checksum=00e67c31b60494665f45ce57ca9d2c42421c40fbe0140b5a5648291238e63508 do_install() { vdoc ucm2/README.md