8 files changed, 279 insertions, 2 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ce117ee74567..2ff67d8acfb2 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 4912c002b962..d8f7ac1b46fc 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,4 +1,6 @@
+AUX alsa-tools-1.2.5-hdspmixer-crash.patch 761 BLAKE2B a2290baa6b4436a2d1cfdfd12039b42ee83017a991b7f05bb8118e27942c7b60bdb0a5636a0859d035290472069a485c2c1d6d45491c9b560b56cd80c36a859e SHA512 220fc805687d04e43914ae13ebfd6f9cfcf4415f7e9a25b0f9d57ee399656a5cc0aa17d75b8e27ee634dd3d66e88bb93fe8caed84b37c0e90bb154f086b3b71f
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
+EBUILD alsa-tools-1.2.5-r1.ebuild 3521 BLAKE2B 4bcf862897f0c3d037643bb19481b018ecf9af0b2ded3bd0deb45cae86be435508733fc4fdb58539b870e8b74b1cc633f5b1f667955cb79470fac93343c27374 SHA512 53cc1f9ba6786a0f29d7ee82dea842ca6bb71345250894742f40e4a71e8ee5dcd3f34b3830e9f02bdeefbab02c708b2f4fb4bf3eb62bb9960e8620737460568f
 EBUILD alsa-tools-1.2.5.ebuild 3434 BLAKE2B a87004f9e64483af2ff4f5ce67d923f5e566d026d4bdb89a889eba0d31ecce97c51dd4f043aec4d24742a8c9565f98c22a95f7c00a74417400baaa210f8ec0e7 SHA512 68c2eeefaf39675582f76cc11f0d562481fa867235cc6a2917cf986a523b104495343ba26b2ff0563b5cdc86fd6b9b775eb6ae979ead469a2232105886be471b
 MISC metadata.xml 310 BLAKE2B 1e82b52e947ac2e811104c837f168f7020c2864c5ece3b1da5e06578a3e63b39b06bdb4993ac7d5cbd90d5e359df63c49aba4a4f309bf8f9c003190942b0d9b3 SHA512 45fc98227626d78099dfae8b44df697c436d1df13e61e6e05bbd29ec63218961aadc5124c813c6d076f29da6617f2c901b73ff8a021817973d13a809d0240f4d
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..7d92d8a908ac
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool xdg
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+# bug #468294
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		dev-libs/gobject-introspection
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+	)
+"
+# bug #456114
+RDEPEND="
+	${DEPEND}
+	gtk? ( media-fonts/font-misc-misc )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/envy24control-config-dir.patch
+	"${FILESDIR}"/${PN}-1.2.5-hdspmixer-crash.patch
+)
+
+pkg_setup() {
+	ALSA_TOOLS=(
+		seq/sbiload
+		us428control
+		hwmixvolume
+		hda-verb
+		$(usev alsa_cards_mixart mixartloader)
+		$(usev alsa_cards_vx222 vxloader)
+		$(usev alsa_cards_usb-usx2y usx2yloader)
+		$(usev alsa_cards_pcxhr pcxhrloader)
+		$(usev alsa_cards_sscape sscape_ctl)
+	)
+
+	if use gtk; then
+		ALSA_TOOLS+=(
+			echomixer
+			hdajackretask
+			$(usev alsa_cards_ice1712 envy24control)
+		)
+		# Perhaps a typo the following && logic?
+		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
+			ALSA_TOOLS+=( rmedigicontrol )
+		fi
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
+		ALSA_TOOLS+=(
+			hdsploader
+			$(usev fltk 'hdspconf hdspmixer')
+		)
+	fi
+
+	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
+		ALSA_TOOLS+=( sb16_csp )
+	fi
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS+=( as10k1 ld10k1 )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null || die
+		eautoreconf
+		popd &> /dev/null || die
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null || die
+		eautoreconf
+		popd &> /dev/null || die
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+			;;
+			* )
+				econf
+			;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		# Install the main stuff
+		cd "${S}/${f}" || die
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch b/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch
new file mode 100644
index 000000000000..c80e3f7e47bb
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-1.2.5-hdspmixer-crash.patch
@@ -0,0 +1,23 @@
+https://github.com/alsa-project/alsa-tools/commit/8c8d6941f21ea68894ce7fd13e92b3ac9f16dc8a
+
+From 8c8d6941f21ea68894ce7fd13e92b3ac9f16dc8a Mon Sep 17 00:00:00 2001
+From: wynnfeng <wynnfeng@tencent.com>
+Date: Sun, 29 Jan 2023 20:47:53 +0800
+Subject: [PATCH] hdspmixer: fix core dump
+
+Initialize the name pointer to NULL.
+
+Fixes: https://github.com/alsa-project/alsa-tools/pull/14
+Signed-off-by: wynnfeng <wynnfeng@tencent.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/hdspmixer/src/hdspmixer.cxx
++++ b/hdspmixer/src/hdspmixer.cxx
+@@ -39,7 +39,7 @@ int main(int argc, char **argv)
+ {
+     HDSPMixerWindow *window;
+     HDSPMixerCard *hdsp_cards[3];
+-    char *name, *shortname;
++    char *name = NULL, *shortname;
+     int card;
+     int cards = 0;
+ 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 48fb2f2885b1..bdce017d0393 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -3,5 +3,7 @@ AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.8.tar.bz2 1560162 BLAKE2B 4b9676957e775be51076b4798dfd384db4eea440c682899024034d3dd593ba24f1d42b8d742c312e041a37f0dbbc12b16635d79f6e6633a3459cc21f80739b5e SHA512 882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b
+DIST alsa-utils-1.2.9.tar.bz2 1598424 BLAKE2B 9d75f63c7ff8b0d7ee835a1ad8fc242dee9b59770b1ad0ff9cd233caf50ac844323fb2ebb8e649f03a0a30a161ec72cba472ac79e390c3f0eb6e2a184d8f576c SHA512 f46e13fd57ed05ee38d3fa655e57b14335ecf0664dbe03275808383d87d28df153a81151e2e9d8786625f09929c567c89e145508a706a70eeb91ac1b11fb2fd4
 EBUILD alsa-utils-1.2.8-r2.ebuild 2496 BLAKE2B f897dbb5d0363e643efde8b228e205a7b57ef14498937e4f58bcd584f816b76ef974eac6bf8fc12ffa6af1e1c0446f1516b86a9074f9bd6c54ef49c04f06abb3 SHA512 06f9bca8bf127107fdebf1d044e88579d0bca24047fea0b1c1888e60981960ff0e0ed0bdb30ec08e4805c527bb696e53cf89f800fbe8daec1a34ef670cedd00d
+EBUILD alsa-utils-1.2.9.ebuild 2505 BLAKE2B 11547055f297c57f9634779294fa6046ad24028e40e3a25db681a587c712918e560d0bdcc823bdf089e01c1925e5f5434cb8f32be2babe288e9be468ac1d112b SHA512 a687a6c35e9907f7172817f698d6acf250fb17ce4fdf8e9cd9204d4a0ed267439601d6be2d2d6eb6196d000ed794cd84d04c019c113696f70e44f7d343d4de57
 MISC metadata.xml 630 BLAKE2B 297896d48e1b947e3d8fdb0e8508846ac5f11740101a80d1d492e8fdd6bb042d629c654583d3262c00a0e33d31ecf3b6f4b3c07c73ede339b4ed168d4c5deae0 SHA512 1e26d146329b58c509ee8a9e6683bd0bc15651d942a7d400383106d3e61df0d3148322bedf0d10e445db74109ee1ee759310eb72c5e3fb1ae4ec258892d378b2
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild
new file mode 100644
index 000000000000..67972bd4c49e
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 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 ~ia64 ~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
+)
+
+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/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 515fcae45278..0220190bd992 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-2.3.1.tar.gz 1758632 BLAKE2B a1501303e02b3ea64d87be5cff08d5f2f2be170b38faedc8e6bc4fd18c0dafe268fa6110708664ef0659df9f0e9680551ac483d30364977e768af60dfdff7e83 SHA512 1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22
 DIST fluidsynth-2.3.2.tar.gz 1773755 BLAKE2B 2d88e52223ff9c6bc5bcbcd8b15f30abb12632202b9a5c5eecc5eb95620aeaa2d7d9b80b76e6b26eef95ca92521bdc9e6d539f8235d90ca0429b12bb72db1a6f SHA512 21798b5a80a7edd8ef02b983d9b230af45cc66b98b32d593228e12dbec15b12c6cf6c0f3692c12af66de1ba2049fa9d6ad2b68c7d1579347eec14d24870b0025
 EBUILD fluidsynth-2.3.1.ebuild 3452 BLAKE2B ad87e841d41bace7720904372f33ec26da9685a68e8ac6849db841e3c73606c9335d885ac8ceb629b98ef83c806f032dc284441bc8caa7b83bc30924193f4dd5 SHA512 ac76893a9282bea3dbbaa5299dfc3e3a3f1fbb2660f69b298f09a504317a303c4ea9b6416d13493339a04b9c2a650b82a644cd0bf01144133f0913d4c3b13ad1
-EBUILD fluidsynth-2.3.2.ebuild 3455 BLAKE2B 3c30720725e805ddd880d72a744c0dd1b3bcd8b1f54a110cc13b8f7bdf8e1716fcc7b42774aeef3ed35aad04197c9ed55567282bd49a07a5de3702d2b5d5a021 SHA512 02e98fec646dc5238b2bca2344e267cef5672e47801ed37ec609a0ffae788c816bc14bf8ec48be877997d1e851692c77e37cb70aa7ed1a813ee14d23f8ea4769
+EBUILD fluidsynth-2.3.2.ebuild 3454 BLAKE2B 629018f4cb334ad7963932f848e6eca273d9294321b732aa5c7a581d506c4ba83d201bcc9b30a1921c32751ccb67b2162b2dfe19830e8885cc7590bae76d00cd SHA512 ffe40ef484ed6f0fc578c29926f624e9c6e973dcb064be8295b2a6dbb329ecf57f2a9cf17d20696d9976114b8a7fed4ad4205c61d2b52c4e1ed364ca675dcb22
 MISC metadata.xml 509 BLAKE2B f94b91d9486a14757aa47e69269d6321fb330556f24ac0d2d47d7734bc28164d9cff5d7ff7728aa6d59606006bc4bfa090662b9dd087a6bf36ae23660604938a SHA512 7bf5aeb69570ef736dc6a1a3d652449b0142978ee5e6ed9902d4f851deea87c8fb94bee821ee9ae93bc529411f336288021718490e86c2815de5d30111bd3b28
diff --git a/media-sound/fluidsynth/fluidsynth-2.3.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.2.ebuild
index 8cfb823f9cd5..e809faa2505a 100644
--- a/media-sound/fluidsynth/fluidsynth-2.3.2.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="