From 8ef55c36187c2e0065232f7ccb3d914afbb322c0 Mon Sep 17 00:00:00 2001 From: kth5 Date: Sat, 7 Dec 2024 19:55:24 +0100 Subject: [PATCH] * update alsa-utils to 1.2.13-2 --- alsa-utils/.SRCINFO | 16 +++++---- ...estore.rules-fix-alsa_restore_go-std.patch | 35 +++++++++++++++++++ alsa-utils/PKGBUILD | 16 ++++----- 3 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch diff --git a/alsa-utils/.SRCINFO b/alsa-utils/.SRCINFO index bdefea01af..feaaeea37a 100644 --- a/alsa-utils/.SRCINFO +++ b/alsa-utils/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = alsa-utils pkgdesc = Advanced Linux Sound Architecture - Utilities - pkgver = 1.2.12 - pkgrel = 1.1 + pkgver = 1.2.13 + pkgrel = 2 url = https://www.alsa-project.org arch = x86_64 arch = powerpc64le @@ -23,16 +23,18 @@ pkgbase = alsa-utils depends = psmisc optdepends = bash: for alsa-info.sh and alsabat-test.sh optdepends = fftw: for alsabat - options = emptydirs - source = https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.12.tar.bz2 - source = https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.12.tar.bz2.sig + source = https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.13.tar.bz2 + source = https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.13.tar.bz2.sig + source = 0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch source = alsa-utils.tmpfiles validpgpkeys = F04DF50737AC1A884C4B3D718380596DA6E59C91 - sha512sums = 6631f9f8e32fbb1f7b06af086cdfb8349c2d70188c4509ab46fa105024fbde9985985d9cc738c7b5a743cacaaeae7a7006f8ef92f66a50762f7df5d714bf548b + sha512sums = 0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78 sha512sums = SKIP + sha512sums = 1b47353970c9a80a7a41e2ff0faf0491b0b90ad1be59593a15a8ead22c43353f7a4bad6b509dade50617c31c06517e0333cc1ddbecfc78f51ec306472d4a9d84 sha512sums = 17ca2d760f383c02ccd00073d4fe73d6687ee58eb0ab5e458ad9d09845be7891cfe389e365bef00c7885e8afad45ea9ebf2925950f8d3fd8157feb818f986990 - b2sums = 3b049af3f829c475e0d9a58fbd8adb7278f0a7a84d404d1141ac8c8639f8d66594efe9e7da239a2b7a54f788639df1bbade127b5fde9912de5227e2b959a9b4d + b2sums = 9bc2bf8e21fb9308c2eabc6612da0848f9ddba45acb8bf8453d9cff7f73fa0267495430a150ea53b28fab8afb69a51e487e8b253dc7501e17d77ea3f6e90bcf7 b2sums = SKIP + b2sums = f6b58f928352b62360a600c441b2c949eac9bf6582d58f39f332b28042f4ab25394a031b59fef470195ef81f3e734bc1675bc604616d5925874392c596d9c69b b2sums = 24b8e44833c7e8b142162878a837b10e1c2a862568280f2ce16fcb81ecc1383802654dbe88930f2cc13c345635c5003cbc3712e121e589dffc2e25c540749ee3 pkgname = alsa-utils diff --git a/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch b/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch new file mode 100644 index 0000000000..f9b9f6d3a8 --- /dev/null +++ b/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch @@ -0,0 +1,35 @@ +commit f90124c73edd050b24961197a4abcf17e53b41a8 +Author: Jaroslav Kysela +Date: Thu Nov 14 09:38:49 2024 +0100 + + alsactl: 90-alsa-restore.rules - fix alsa_restore_go/std + + Fix the label mismatch which was introduced in the transition from the + temporary test rules. + + Closes: https://github.com/alsa-project/alsa-utils/issues/280 + Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone") + Signed-off-by: Jaroslav Kysela + +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +index 85f0b15..dae2ed8 100644 +--- a/alsactl/90-alsa-restore.rules.in ++++ b/alsactl/90-alsa-restore.rules.in +@@ -3,6 +3,8 @@ + ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*",@extratest@ GOTO="alsa_restore_go" + GOTO="alsa_restore_end" + ++LABEL="alsa_restore_go" ++ + ENV{ALSA_CARD_NUMBER}="$attr{device/number}" + + # mark HDA analog card; HDMI/DP card does not have capture devices +@@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", GOTO="alsa_restore_std" + IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card" + ENV{ALSA_CARD_HDA_ANALOG}!="", ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}" + +-LABEL="alsa_restore_go" ++LABEL="alsa_restore_std" + TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore $env{ALSA_CARD_NUMBER}" + TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore $env{ALSA_CARD_NUMBER}" + diff --git a/alsa-utils/PKGBUILD b/alsa-utils/PKGBUILD index e8618de2d2..83dd38fc2e 100644 --- a/alsa-utils/PKGBUILD +++ b/alsa-utils/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: judd pkgname=alsa-utils -pkgver=1.2.12 -pkgrel=1.1 +pkgver=1.2.13 +pkgrel=2 pkgdesc="Advanced Linux Sound Architecture - Utilities" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.alsa-project.org" @@ -30,22 +30,24 @@ optdepends=( 'bash: for alsa-info.sh and alsabat-test.sh' 'fftw: for alsabat' ) -# we require /var/lib/alsa for state file -options=(emptydirs) source=( $url/files/pub/utils/$pkgname-$pkgver.tar.bz2{,.sig} + 0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch $pkgname.tmpfiles ) -sha512sums=('6631f9f8e32fbb1f7b06af086cdfb8349c2d70188c4509ab46fa105024fbde9985985d9cc738c7b5a743cacaaeae7a7006f8ef92f66a50762f7df5d714bf548b' +sha512sums=('0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78' 'SKIP' + '1b47353970c9a80a7a41e2ff0faf0491b0b90ad1be59593a15a8ead22c43353f7a4bad6b509dade50617c31c06517e0333cc1ddbecfc78f51ec306472d4a9d84' '17ca2d760f383c02ccd00073d4fe73d6687ee58eb0ab5e458ad9d09845be7891cfe389e365bef00c7885e8afad45ea9ebf2925950f8d3fd8157feb818f986990') -b2sums=('3b049af3f829c475e0d9a58fbd8adb7278f0a7a84d404d1141ac8c8639f8d66594efe9e7da239a2b7a54f788639df1bbade127b5fde9912de5227e2b959a9b4d' +b2sums=('9bc2bf8e21fb9308c2eabc6612da0848f9ddba45acb8bf8453d9cff7f73fa0267495430a150ea53b28fab8afb69a51e487e8b253dc7501e17d77ea3f6e90bcf7' 'SKIP' + 'f6b58f928352b62360a600c441b2c949eac9bf6582d58f39f332b28042f4ab25394a031b59fef470195ef81f3e734bc1675bc604616d5925874392c596d9c69b' '24b8e44833c7e8b142162878a837b10e1c2a862568280f2ce16fcb81ecc1383802654dbe88930f2cc13c345635c5003cbc3712e121e589dffc2e25c540749ee3') validpgpkeys=('F04DF50737AC1A884C4B3D718380596DA6E59C91') # ALSA Release Team (Package Signing Key v1) prepare() { cd $pkgname-$pkgver + patch -Np1 < ../0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-std.patch autoreconf -fiv } @@ -79,7 +81,5 @@ package() { make DESTDIR="$pkgdir" install -C $pkgname-$pkgver install -vDm 644 $pkgname-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/" - # dir for ALSA state - install -vdm 755 "$pkgdir/var/lib/alsa/" install -vDm 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" }