gentoo auto-resync : 29:12:2024 - 06:30:44

5 files changed, 168 insertions, 0 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5e83c152d43e..229c6292e70d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index bfd601293e29..5bf25f8bf21c 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,4 +1,6 @@
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
+AUX alsa-utils-1.2.13-amdgpu-restore.patch 1451 BLAKE2B 75b8a5c996a665dc860ef8ee1072d7cf695ea44d368456af20e1e7ab8fd651d25bf4319784fa86ea85881028b6bbb136bcc9c3bb47316c0e1c5bd1505450c277 SHA512 b2de75ef50627916ebb7771ee0dcfdb94b1db93bea569f24e57e50ce07a9286a03e878c9976af3290a26c0275cfb6b533030d2fd1383a9117209ad4273c56769
+AUX alsa-utils-1.2.13-udev-restore.patch 1655 BLAKE2B 455fe73f1af11743a1e3620a24fbb51ce806bf316f4535a2ccf3a7ed0d567bbcbe24bf1633dcaa84c068e3c5d2327ade5ff2576837e454ca6d720ced673ed2c8 SHA512 a3a93d926e91c33e419099c4596eeafaecc90e59630409b08312c5d50e84f993c5fa1b01afec2176c3fb30108498030cfde2a85e0d126913ee67bbdaa92ac3f5
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.11.tar.bz2 1627148 BLAKE2B dcf96705f9e3f1b4abaa7e1f107d1154a05500bf1cd07c821e0fe8c4ba7d7f08de0cf126be8c9c8dda3980d85c144318c12ffc8a95d5da4e98c49a6e9c2ee8ef SHA512 5ce76807b53357584bfb4ace5acfdac4db9168ffaf5cdd1e499738eec046c36112bf84a99970f66368063a9baf73bad93af2d439630572f3eba5c9321071172d
@@ -6,5 +8,6 @@ DIST alsa-utils-1.2.12.tar.bz2 1631895 BLAKE2B 3b049af3f829c475e0d9a58fbd8adb727
 DIST alsa-utils-1.2.13.tar.bz2 1642028 BLAKE2B 9bc2bf8e21fb9308c2eabc6612da0848f9ddba45acb8bf8453d9cff7f73fa0267495430a150ea53b28fab8afb69a51e487e8b253dc7501e17d77ea3f6e90bcf7 SHA512 0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78
 EBUILD alsa-utils-1.2.11.ebuild 2491 BLAKE2B aa500869e4cc1fca8cc8959e187c872dbee6aa75467f03b2158453b2c1f23d1348780295c64d311c3c9414139d70054476d60bd29e71aa2bc589cb4ff8d750d4 SHA512 fa7448a47b875989fa47be1d86561c7def4b3a7164d844633ac7c06d4d318f12068f9e4fb5d5a8aa40329f07a216ee99bf6dfef7dd582e8085a929442ebce11b
 EBUILD alsa-utils-1.2.12.ebuild 2491 BLAKE2B aa500869e4cc1fca8cc8959e187c872dbee6aa75467f03b2158453b2c1f23d1348780295c64d311c3c9414139d70054476d60bd29e71aa2bc589cb4ff8d750d4 SHA512 fa7448a47b875989fa47be1d86561c7def4b3a7164d844633ac7c06d4d318f12068f9e4fb5d5a8aa40329f07a216ee99bf6dfef7dd582e8085a929442ebce11b
+EBUILD alsa-utils-1.2.13-r1.ebuild 2579 BLAKE2B bbf2b44d307fa0759544362a468fa176d8f3c19ef98138ac9958e0fb0b545678f1861cdf7844cf60325cee009096c5037a3ddf135c578028cd9516115136c5e3 SHA512 2d3663b5c6cb23ad47f0e46a587dd29d7545113b12bb113f6211950853461786dcdd947f7781eb2f6a7d9c896c3ab701d9830632c5e381c134b89bcb53e6ee89
 EBUILD alsa-utils-1.2.13.ebuild 2499 BLAKE2B b2c56ffd157b411bfe73580fd3e0a0976880859f6bb2ece20192247a72fb0edeab6d88e4e91a66287a769e82310cde4ae0c5f18e554d02eb5a50d2e978aa12e6 SHA512 788ac75cd5b954afb906ee62474ad422b9a8bb7362047c207652081d38a5104ca629beb38b3c245626a891f8f1cc73b4d9f74a76b88abe7075e32a06b5954f56
 MISC metadata.xml 637 BLAKE2B 30aefc9f4259b4f3c7b37196fd59bb4af4dd2e72d140da885a698ebe5e09a44b7bfbd456417d2d29a670adf2b2c65ba7038f29050606d02dc0d50e20f419e4bc SHA512 e5f7739365c0e4f9472ddca00e5de53454875b5bf562c00236dc8540c4c3b0040f69355d4f389ac5fbe4e726a3bbb43dfe34480ce72f69b872d0a0ee7e3641a5
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.13-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.13-r1.ebuild
new file mode 100644
index 000000000000..58f1ef8f2bbe
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.13-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
+
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ieee1394? ( media-libs/libffado )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:= )
+	bat? ( sci-libs/fftw:= )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-alsa )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+	"${FILESDIR}"/${P}-udev-restore.patch
+	"${FILESDIR}"/${P}-amdgpu-restore.patch
+)
+
+src_configure() {
+	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
+
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod, bug #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usev !doc '--disable-xmlto')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.13-amdgpu-restore.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.13-amdgpu-restore.patch
new file mode 100644
index 000000000000..da5576267195
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.13-amdgpu-restore.patch
@@ -0,0 +1,32 @@
+https://github.com/alsa-project/alsa-utils/commit/6f7ce73159c02b726a6f0fe0acff961c95e337a8
+
+From 6f7ce73159c02b726a6f0fe0acff961c95e337a8 Mon Sep 17 00:00:00 2001
+From: Aaron Ma <aaron.ma@canonical.com>
+Date: Wed, 20 Nov 2024 15:55:02 +0800
+Subject: [PATCH] alsactl: 90-alsa-restore.rules - fix AMD acp-pdm-mach link
+
+The link name of AMD ACP digital microphones driver acp-pdm-mach
+is acp-dmic-codec. Fix it to make UCM initialize it again.
+
+Closes: https://github.com/alsa-project/alsa-utils/pull/281
+Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone")
+Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ alsactl/90-alsa-restore.rules.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
+index dae2ed8c..5db6080b 100644
+--- a/alsactl/90-alsa-restore.rules.in
++++ b/alsactl/90-alsa-restore.rules.in
+@@ -14,7 +14,7 @@ DRIVERS=="snd_hda_intel", TEST=="device/pcmC$env{ALSA_CARD_NUMBER}D0p", RUN+="/b
+ TEST=="device/device/acp3x-dmic-capture", GOTO="alsa_hda_analog"
+ TEST=="device/device/acp6x-dmic-capture", GOTO="alsa_hda_analog"
+ TEST=="device/device/acp63-dmic-capture", GOTO="alsa_hda_analog"
+-TEST=="device/device/acp-pdm-dmic", GOTO="alsa_hda_analog"
++TEST=="device/device/acp-dmic-codec", GOTO="alsa_hda_analog"
+ GOTO="alsa_restore_std"
+ 
+ LABEL="alsa_hda_analog"
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.13-udev-restore.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.13-udev-restore.patch
new file mode 100644
index 000000000000..ba306bb8d702
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.13-udev-restore.patch
@@ -0,0 +1,40 @@
+https://github.com/alsa-project/alsa-utils/commit/f90124c73edd050b24961197a4abcf17e53b41a8
+
+From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 14 Nov 2024 09:38:49 +0100
+Subject: [PATCH] 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 <perex@perex.cz>
+---
+ alsactl/90-alsa-restore.rules.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
+index 85f0b15f..dae2ed8c 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}"
+ 
+