[-- Attachment #1: Type: text/plain, Size: 1786 bytes --] There is a new pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages alsa https://github.com/void-linux/void-packages/pull/31286 [NOMERGE] alsa-lib: update to 1.2.5. Doesn't even build on musl yet, opening PR to prevent others from updating. See https://github.com/alsa-project/alsa-lib/issues/143 and https://github.com/alsa-project/alsa-lib/issues/142 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/31286.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-alsa-31286.patch --] [-- Type: text/x-diff, Size: 3479 bytes --] From f3b3297923673ac5a38e27b8669e4a09cbb610c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> Date: Fri, 4 Jun 2021 12:16:35 -0300 Subject: [PATCH] alsa-lib: update to 1.2.5. --- ...lugin_dir_set-snd_plugin_dir-must-be.patch | 32 ------------------- srcpkgs/alsa-lib/patches/stdint_compat.patch | 14 -------- srcpkgs/alsa-lib/template | 6 ++-- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch delete mode 100644 srcpkgs/alsa-lib/patches/stdint_compat.patch diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch deleted file mode 100644 index a89f8587bb1d..000000000000 --- a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Thu, 22 Oct 2020 20:57:32 +0200 -Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be - declared even for \!DL_ORIGIN_AVAILABLE - -Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") -BugLink: https://github.com/alsa-project/alsa-lib/issues/91 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - src/dlmisc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index c9517c55..f20eb593 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -42,11 +42,9 @@ - #ifndef PIC - struct snd_dlsym_link *snd_dlsym_start = NULL; - #endif --#ifdef DL_ORIGIN_AVAILABLE - static int snd_plugin_dir_set = 0; - static char *snd_plugin_dir = NULL; - #endif --#endif - - #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) - static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; --- -2.29.0 - diff --git a/srcpkgs/alsa-lib/patches/stdint_compat.patch b/srcpkgs/alsa-lib/patches/stdint_compat.patch deleted file mode 100644 index 0ff7b4124765..000000000000 --- a/srcpkgs/alsa-lib/patches/stdint_compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t -for compatibility with musl libc - ---- a/include/pcm.h 2015-02-26 13:34:52.000000000 +0100 -+++ a/include/pcm.h 2015-07-28 13:44:32.423885625 +0200 -@@ -29,6 +29,8 @@ - #ifndef __ALSA_PCM_H - #define __ALSA_PCM_H - -+#include <stdint.h> /* uint_ types */ -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 7a6a58a8c5ea..dc87955b86a4 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,7 +1,7 @@ # Template file for 'alsa-lib' pkgname=alsa-lib -version=1.2.4 -revision=2 +version=1.2.5 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config libtool" short_desc="Advanced Linux Sound Architecture (ALSA) library" @@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.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=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 +checksum=9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18 patch_args="-Np1" alsa-lib-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 853 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-859574866 Comment: today I noticed, for the first time, running this for a while on x86_64 ``` ALSA lib conf.c:5560:(snd_config_expand) Parse arguments error: Invalid argument ALSA lib confmisc.c:1369:(snd_func_refer) Unable to find definition 'cards.USB-A udio.pcm.default_playback_dmix_yes:CARD=1cards.USB-Audio.pcm.default_playback_dm ix_yes:CARD=1' ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5576:(snd_config_expand) Evaluate error: No such file or directo ``` and dmix broke, think restart will resolve it for now..
[-- Attachment #1: Type: text/plain, Size: 859 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-859574866 Comment: today I noticed, for the first time, running this for a while on x86_64_glibc ``` ALSA lib conf.c:5560:(snd_config_expand) Parse arguments error: Invalid argument ALSA lib confmisc.c:1369:(snd_func_refer) Unable to find definition 'cards.USB-A udio.pcm.default_playback_dmix_yes:CARD=1cards.USB-Audio.pcm.default_playback_dm ix_yes:CARD=1' ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5576:(snd_config_expand) Evaluate error: No such file or directo ``` and dmix broke, think restart will resolve it for now..
[-- Attachment #1: Type: text/plain, Size: 1409 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-859574866 Comment: today I noticed, for the first time, running this for a while on x86_64_glibc ``` ALSA lib conf.c:5560:(snd_config_expand) Parse arguments error: Invalid argument ALSA lib confmisc.c:1369:(snd_func_refer) Unable to find definition 'cards.USB-A udio.pcm.default_playback_dmix_yes:CARD=1cards.USB-Audio.pcm.default_playback_dm ix_yes:CARD=1' ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5576:(snd_config_expand) Evaluate error: No such file or directo ``` and dmix broke, think restart will resolve it for now.. EDIT: # alsactl restore yealds ``` No state is present for card VMini alsa-lib parser.c:2372:(load_toplevel_config) Unable to find the top-level configuration file '/usr/share/alsa/ucm2/ucm.conf'. alsa-lib main.c:1402:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -2 Found hardware: "USB-Audio" "USB Mixer" "USB13b2:00a2" "" "" Hardware is initialized using a generic method No state is present for card VMini ``` on the fly it seems related to < i did not do the alsa-ucm-conf update >, invalid post so far.
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-859574866 Comment: today I noticed, for the first time, running this for a while on x86_64_glibc ``` ALSA lib conf.c:5560:(snd_config_expand) Parse arguments error: Invalid argument ALSA lib confmisc.c:1369:(snd_func_refer) Unable to find definition 'cards.USB-A udio.pcm.default_playback_dmix_yes:CARD=1cards.USB-Audio.pcm.default_playback_dm ix_yes:CARD=1' ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5576:(snd_config_expand) Evaluate error: No such file or directo ``` and dmix broke, think restart will resolve it for now.. EDIT: # alsactl restore yealds ``` No state is present for card VMini alsa-lib parser.c:2372:(load_toplevel_config) Unable to find the top-level configuration file '/usr/share/alsa/ucm2/ucm.conf'. alsa-lib main.c:1402:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -2 Found hardware: "USB-Audio" "USB Mixer" "USB13b2:00a2" "" "" Hardware is initialized using a generic method No state is present for card VMini ``` nope, dmix suddently broke out of nowhere
[-- Attachment #1: Type: text/plain, Size: 1397 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-859574866 Comment: today I noticed, for the first time, running this for a while on x86_64_glibc ``` ALSA lib conf.c:5560:(snd_config_expand) Parse arguments error: Invalid argument ALSA lib confmisc.c:1369:(snd_func_refer) Unable to find definition 'cards.USB-A udio.pcm.default_playback_dmix_yes:CARD=1cards.USB-Audio.pcm.default_playback_dm ix_yes:CARD=1' ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5088:(_snd_config_evaluate) function snd_func_refer returned err or: No such file or directory ALSA lib conf.c:5576:(snd_config_expand) Evaluate error: No such file or directo ``` and dmix broke, think restart will resolve it for now.. EDIT: # alsactl restore yealds ``` No state is present for card VMini alsa-lib parser.c:2372:(load_toplevel_config) Unable to find the top-level configuration file '/usr/share/alsa/ucm2/ucm.conf'. alsa-lib main.c:1402:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -2 Found hardware: "USB-Audio" "USB Mixer" "USB13b2:00a2" "" "" Hardware is initialized using a generic method No state is present for card VMini ``` nope, dmix suddently broke out of nowhere, and I thought alsa-ucm-conf is optional
[-- Attachment #1: Type: text/plain, Size: 302 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-860119856 Comment: @biopsin Do you think that if you installed alsa-ucm-conf 1.2.5 (my PR for that: https://github.com/void-linux/void-packages/pull/31262) it would fix the issue?
[-- Attachment #1: Type: text/plain, Size: 294 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-860173533 Comment: @cinerea0 I assume so, but I don't think its related to the dmix dropout. I downgraded to resolve the problem for now, as reloading alsa did not fix it.
[-- Attachment #1: Type: text/plain, Size: 360 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-861490012 Comment: @ericonr try bump to 1.2.5.1 as of https://github.com/alsa-project/alsa-lib/commit/abe805ed6c7f38e48002e575535afd1f673b9bcd it's ready to go and local x86_64-musl build is successfull :) Hopefully dmix is resolved too
[-- Attachment #1: Type: text/plain, Size: 258 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-861509636 Comment: Will import https://github.com/alsa-project/alsa-lib/commit/f4c061f349188c548497607efd4622c6e6a43270 as well. Thanks.
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages alsa https://github.com/void-linux/void-packages/pull/31286 [NOMERGE] alsa-lib: update to 1.2.5. Doesn't even build on musl yet, opening PR to prevent others from updating. See https://github.com/alsa-project/alsa-lib/issues/143 and https://github.com/alsa-project/alsa-lib/issues/142 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/31286.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-alsa-31286.patch --] [-- Type: text/x-diff, Size: 3483 bytes --] From 1b8066d6c1f4683ec5baa44ae38d6d957274ac3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> Date: Fri, 4 Jun 2021 12:16:35 -0300 Subject: [PATCH] alsa-lib: update to 1.2.5.1. --- ...lugin_dir_set-snd_plugin_dir-must-be.patch | 32 ------------------- srcpkgs/alsa-lib/patches/stdint_compat.patch | 14 -------- srcpkgs/alsa-lib/template | 6 ++-- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch delete mode 100644 srcpkgs/alsa-lib/patches/stdint_compat.patch diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch deleted file mode 100644 index a89f8587bb1d..000000000000 --- a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Thu, 22 Oct 2020 20:57:32 +0200 -Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be - declared even for \!DL_ORIGIN_AVAILABLE - -Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") -BugLink: https://github.com/alsa-project/alsa-lib/issues/91 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - src/dlmisc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index c9517c55..f20eb593 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -42,11 +42,9 @@ - #ifndef PIC - struct snd_dlsym_link *snd_dlsym_start = NULL; - #endif --#ifdef DL_ORIGIN_AVAILABLE - static int snd_plugin_dir_set = 0; - static char *snd_plugin_dir = NULL; - #endif --#endif - - #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) - static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; --- -2.29.0 - diff --git a/srcpkgs/alsa-lib/patches/stdint_compat.patch b/srcpkgs/alsa-lib/patches/stdint_compat.patch deleted file mode 100644 index 0ff7b4124765..000000000000 --- a/srcpkgs/alsa-lib/patches/stdint_compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t -for compatibility with musl libc - ---- a/include/pcm.h 2015-02-26 13:34:52.000000000 +0100 -+++ a/include/pcm.h 2015-07-28 13:44:32.423885625 +0200 -@@ -29,6 +29,8 @@ - #ifndef __ALSA_PCM_H - #define __ALSA_PCM_H - -+#include <stdint.h> /* uint_ types */ -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 7a6a58a8c5ea..8003625d8078 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,7 +1,7 @@ # Template file for 'alsa-lib' pkgname=alsa-lib -version=1.2.4 -revision=2 +version=1.2.5.1 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config libtool" short_desc="Advanced Linux Sound Architecture (ALSA) library" @@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.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=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 +checksum=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e patch_args="-Np1" alsa-lib-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages alsa https://github.com/void-linux/void-packages/pull/31286 [NOMERGE] alsa-lib: update to 1.2.5. Doesn't even build on musl yet, opening PR to prevent others from updating. See https://github.com/alsa-project/alsa-lib/issues/143 and https://github.com/alsa-project/alsa-lib/issues/142 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/31286.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-alsa-31286.patch --] [-- Type: text/x-diff, Size: 3483 bytes --] From af137472659647e904cf2ab6e06b52d4644e322d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> Date: Fri, 4 Jun 2021 12:16:35 -0300 Subject: [PATCH] alsa-lib: update to 1.2.5.1. --- ...lugin_dir_set-snd_plugin_dir-must-be.patch | 32 ------------------- srcpkgs/alsa-lib/patches/stdint_compat.patch | 14 -------- srcpkgs/alsa-lib/template | 6 ++-- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch delete mode 100644 srcpkgs/alsa-lib/patches/stdint_compat.patch diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch deleted file mode 100644 index a89f8587bb1d..000000000000 --- a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Thu, 22 Oct 2020 20:57:32 +0200 -Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be - declared even for \!DL_ORIGIN_AVAILABLE - -Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") -BugLink: https://github.com/alsa-project/alsa-lib/issues/91 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - src/dlmisc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index c9517c55..f20eb593 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -42,11 +42,9 @@ - #ifndef PIC - struct snd_dlsym_link *snd_dlsym_start = NULL; - #endif --#ifdef DL_ORIGIN_AVAILABLE - static int snd_plugin_dir_set = 0; - static char *snd_plugin_dir = NULL; - #endif --#endif - - #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) - static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; --- -2.29.0 - diff --git a/srcpkgs/alsa-lib/patches/stdint_compat.patch b/srcpkgs/alsa-lib/patches/stdint_compat.patch deleted file mode 100644 index 0ff7b4124765..000000000000 --- a/srcpkgs/alsa-lib/patches/stdint_compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t -for compatibility with musl libc - ---- a/include/pcm.h 2015-02-26 13:34:52.000000000 +0100 -+++ a/include/pcm.h 2015-07-28 13:44:32.423885625 +0200 -@@ -29,6 +29,8 @@ - #ifndef __ALSA_PCM_H - #define __ALSA_PCM_H - -+#include <stdint.h> /* uint_ types */ -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 7a6a58a8c5ea..8003625d8078 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,7 +1,7 @@ # Template file for 'alsa-lib' pkgname=alsa-lib -version=1.2.4 -revision=2 +version=1.2.5.1 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config libtool" short_desc="Advanced Linux Sound Architecture (ALSA) library" @@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.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=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 +checksum=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e patch_args="-Np1" alsa-lib-devel_package() {
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages alsa https://github.com/void-linux/void-packages/pull/31286 [NOMERGE] alsa-lib: update to 1.2.5. Doesn't even build on musl yet, opening PR to prevent others from updating. See https://github.com/alsa-project/alsa-lib/issues/143 and https://github.com/alsa-project/alsa-lib/issues/142 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/31286.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-alsa-31286.patch --] [-- Type: text/x-diff, Size: 3513 bytes --] From e43aeeedb64ce57cc4d3fd1db29aed54d9e27fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> Date: Fri, 4 Jun 2021 12:16:35 -0300 Subject: [PATCH] alsa-lib: update to 1.2.5.1. --- ...lugin_dir_set-snd_plugin_dir-must-be.patch | 32 ------------------- srcpkgs/alsa-lib/patches/stdint_compat.patch | 14 -------- srcpkgs/alsa-lib/template | 6 ++-- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch delete mode 100644 srcpkgs/alsa-lib/patches/stdint_compat.patch diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch deleted file mode 100644 index a89f8587bb1d..000000000000 --- a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Thu, 22 Oct 2020 20:57:32 +0200 -Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be - declared even for \!DL_ORIGIN_AVAILABLE - -Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") -BugLink: https://github.com/alsa-project/alsa-lib/issues/91 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - src/dlmisc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index c9517c55..f20eb593 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -42,11 +42,9 @@ - #ifndef PIC - struct snd_dlsym_link *snd_dlsym_start = NULL; - #endif --#ifdef DL_ORIGIN_AVAILABLE - static int snd_plugin_dir_set = 0; - static char *snd_plugin_dir = NULL; - #endif --#endif - - #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) - static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; --- -2.29.0 - diff --git a/srcpkgs/alsa-lib/patches/stdint_compat.patch b/srcpkgs/alsa-lib/patches/stdint_compat.patch deleted file mode 100644 index 0ff7b4124765..000000000000 --- a/srcpkgs/alsa-lib/patches/stdint_compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t -for compatibility with musl libc - ---- a/include/pcm.h 2015-02-26 13:34:52.000000000 +0100 -+++ a/include/pcm.h 2015-07-28 13:44:32.423885625 +0200 -@@ -29,6 +29,8 @@ - #ifndef __ALSA_PCM_H - #define __ALSA_PCM_H - -+#include <stdint.h> /* uint_ types */ -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 454ede71606e..b687456db813 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,7 +1,7 @@ # Template file for 'alsa-lib' pkgname=alsa-lib -version=1.2.4 -revision=2 +version=1.2.5.1 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config libtool" short_desc="Advanced Linux Sound Architecture (ALSA) library" @@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.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=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7 +checksum=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e alsa-lib-devel_package() { depends="${sourcepkg}>=${version}_${revision}"
[-- Attachment #1: Type: text/plain, Size: 198 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-872648434 Comment: @ericonr Have you tested this since updating to 1.2.5.1?
[-- Attachment #1: Type: text/plain, Size: 254 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-872696020 Comment: @cinerea0 I'm running it locally, yes. Do you think it's good to merge? I haven't looked for further bug reports.
[-- Attachment #1: Type: text/plain, Size: 318 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-872969705 Comment: @ericonr I was going to test this PR today with my alsa-ucm-conf PR, but I can't seem to get the tarball to download. If you haven't had any more bug reports it should be fine.
[-- Attachment #1: Type: text/plain, Size: 493 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-872969705 Comment: @ericonr I was going to test this PR today with my alsa-ucm-conf PR, but I can't seem to get the tarball to download. If you haven't had any more bug reports it should be fine. Actually, this has been a persistent problem for me with packages whose source tarballs come from alsa-project.org. Should we consider switching them to their GitHub sources?
[-- Attachment #1: Type: text/plain, Size: 227 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-873278059 Comment: This update breaks pipewire until it's updated to 0.3.31, so we should wait for #31549
[-- Attachment #1: Type: text/plain, Size: 246 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-879761647 Comment: Also I'm experiencing more and frequent underruns in Reaper with this. Downgradet again and issue solved.
[-- Attachment #1: Type: text/plain, Size: 255 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-879761647 Comment: Also I'm experiencing more and frequent underruns in Reaper with this 1.2.5.1. Downgraded again and issue solved.
[-- Attachment #1: Type: text/plain, Size: 374 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-879761647 Comment: Also I'm experiencing more and frequent underruns in Reaper with this 1.2.5.1. Downgraded again and ~~issue solved.~~ Edit: well not quite, the underruns count is much more present now then before, might be tied to kernel updates
[-- Attachment #1: Type: text/plain, Size: 251 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-880233214 Comment: @ericonr Now that the pipewire PR has been merged, should this and the `alsa-ucm-conf` PRs be merged as well?
[-- Attachment #1: Type: text/plain, Size: 453 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-879761647 Comment: Also I'm experiencing more and frequent underruns in Reaper with this 1.2.5.1. Downgraded again and ~~issue solved.~~ Edit: well not quite, the underruns count is much more present now then before, might be tied to kernel updates.. Edit2: currently building 5.4.132, as there are some alsa:usb-audio fixes..
[-- Attachment #1: Type: text/plain, Size: 736 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-879761647 Comment: Also I'm experiencing more and frequent underruns in Reaper with this 1.2.5.1. Downgraded again and ~~issue solved.~~ Edit: well not quite, the underruns count is much more present now then before, might be tied to kernel updates.. Edit2: currently building 5.4.132, as there are some alsa:usb-audio fixes.. Edit3: unable to track this down, my only assumtion is fixes in ext4, as I mostly diskstream from a sata3 10,000 RPM disk. Temporary solution changing buffersize from 128ms to 512ms which is utterly crap for recording, and I will look somewhere else for help.. Im fine for merge.
[-- Attachment #1: Type: text/plain, Size: 164 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-880728790 Comment: Probably should, yes...
[-- Attachment #1: Type: text/plain, Size: 187 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-901427187 Comment: Are there any bug reports remaining for this?
[-- Attachment #1: Type: text/plain, Size: 455 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-901893342 Comment: This update breaks audio for me: pipewire gives the warning `[W][02053.586348][ policy-node.c: 910 rescan_node()] no node found for 38` while for `Card: PipeWire`, alsamixer says `This sound device does not have any controls.` The issue is solved with `xdowngrade /var/cache/xbps/alsa-lib-1.2.4_2.x86_64-musl.xbps`
[-- Attachment #1: Type: text/plain, Size: 288 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-901960428 Comment: @dkwo if its relevant, try maybe debug with > Can you killall pipwire-media-session then run: > `PIPEWIRE_DEBUG=4 pipewire-media-session 2>log`
[-- Attachment #1: Type: text/plain, Size: 190 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/31286#issuecomment-902544651 Comment: @biopsin Your other alsa pr solved my issue, thanks.