gentoo auto-resync : 05:05:2023 - 11:30:40

3 files changed, 184 insertions, 0 deletions

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;
+