[gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/

[Aaron Bauman]

commit:     00fb339a89da3994417edde531726a38d8ea68b8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 17 14:10:46 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:49:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fb339a

media-sound/alsa-utils: remove unused file

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16292
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 media-sound/alsa-utils/files/alsasound.initd-r7 | 87 -------------------------
 1 file changed, 87 deletions(-)

diff --git a/media-sound/alsa-utils/files/alsasound.initd-r7 b/media-sound/alsa-utils/files/alsasound.initd-r7
deleted file mode 100644
index da2d5b349b8..00000000000
--- a/media-sound/alsa-utils/files/alsasound.initd-r7
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-alsastatedir=/var/lib/alsa
-alsascrdir=/etc/alsa.d
-alsahomedir=/var/run/alsasound
-
-extra_commands="save restore"
-
-depend() {
-	need localmount
-	after bootmisc modules isapnp coldplug hotplug
-}
-
-restore() {
-	ebegin "Restoring Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	if [ ! -r "${alsastatedir}/asound.state" ] ; then
-		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
-		eend 0
-		return 0
-	fi
-
-	local cards="$(sed -n -e 's/^ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
-	local CARDNUM
-	for cardnum in ${cards}; do
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
-			|| ewarn "Errors while restoring defaults, ignoring"
-	done
-
-	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
-		[ -e "${ossfile}" ] || continue
-		# We use cat because I'm not sure if cp works properly on /proc
-		local procfile=${ossfile##${alsastatedir}/oss}
-		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
-		if [ -e /proc/asound/"${procfile}"/oss ] ; then
-		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
-		fi
-	done
-
-	eend 0
-}
-
-save() {
-	ebegin "Storing ALSA Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	mkdir -p "${alsastatedir}"
-	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
-		eerror "Error saving levels."
-		eend 1
-		return 1
-	fi
-
-	for ossfile in /proc/asound/card*/pcm*/oss; do
-		[ -e "${ossfile}" ] || continue
-		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
-		device="$(echo "${device}" | sed -e 's,/,_,g')"
-		mkdir -p "${alsastatedir}/oss/"
-		cp "${ossfile}" "${alsastatedir}/oss/${device}"
-	done
-
-	eend 0
-}
-
-start() {
-	if [ "${RESTORE_ON_START}" = "yes" ]; then
-		restore
-	fi
-
-	return 0
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ]; then
-		save
-	fi
-	return 0
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/

[Jakov Smolić]

commit:     6c1fb9bc3660d5dd2626f5ca2dadb7539847dfe5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Nov  5 15:27:58 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 09:30:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1fb9bc

media-sound/alsa-utils: remove unused patches

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22828
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 ....5-fix-potential-null-pointer-from-strchr.patch | 49 ----------------------
 ...alsa-utils-1.2.5-fix-the-nested-iteration.patch | 28 -------------
 2 files changed, 77 deletions(-)

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
deleted file mode 100644
index f06756a8af9..00000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001
-From: Chao Song <chao.song@linux.intel.com>
-Date: Mon, 31 May 2021 10:29:57 +0800
-Subject: [PATCH] topology: fix potential null pointer from strchr
-
-This patch adds check to the return pointer from strchr,
-because it may be null and cause segment fault, if component
-is not properly constructed.
-
-Fixes: https://github.com/alsa-project/alsa-utils/pull/91
-Signed-off-by: Chao Song <chao.song@linux.intel.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- topology/pre-process-dapm.c   | 5 +++++
- topology/pre-process-object.c | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c
-index 450ca717..dbaf2f11 100644
---- a/topology/pre-process-dapm.c
-+++ b/topology/pre-process-dapm.c
-@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp,
-
- 	/* get class name */
- 	args = strchr(string, '.');
-+	if (!args) {
-+		SNDERR("Error getting class name for %s\n", string);
-+		return -EINVAL;
-+	}
-+
- 	class_name = calloc(1, strlen(string) - strlen(args) + 1);
- 	if (!class_name)
- 		return -ENOMEM;
-diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
-index 09aa3758..ac8caeca 100644
---- a/topology/pre-process-object.c
-+++ b/topology/pre-process-object.c
-@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp,
- 	}
-
- 	type = strchr(token_ref, '.');
-+	if(!type) {
-+		SNDERR("Error getting type for %s\n", token_ref);
-+		return -EINVAL;
-+	}
-+
- 	token = calloc(1, strlen(token_ref) - strlen(type) + 1);
- 	if (!token)
- 		return -ENOMEM;

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
deleted file mode 100644
index e175287a559..00000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 1 Jun 2021 17:47:42 +0200
-Subject: [PATCH] alsactl: fix the nested iteration
-
-There may be nested iterations for hw: card names.
-Handle this card name in snd_card_iterator_sinit().
-
-BugLink: https://github.com/alsa-project/alsa-lib/issues/142
-Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- alsactl/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/alsactl/utils.c b/alsactl/utils.c
-index c79fd951..881b5053 100644
---- a/alsactl/utils.c
-+++ b/alsactl/utils.c
-@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname
- 	int cardno = -1;
- 
- 	if (cardname) {
-+		if (strncmp(cardname, "hw:", 3) == 0)
-+			cardname += 3;
- 		cardno = snd_card_get_index(cardname);
- 		if (cardno < 0) {
- 			error("Cannot find soundcard '%s'...", cardname);

[gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/

[Conrad Kostecki]

commit:     6e0703da322eaff6ad3c4c9ef7988ef578ab0741
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May  6 14:40:06 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May  8 18:40:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0703da

media-sound/alsa-utils: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30894
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-sound/alsa-utils/files/alsa-modules.conf-rc | 38 -----------------------
 1 file changed, 38 deletions(-)

diff --git a/media-sound/alsa-utils/files/alsa-modules.conf-rc b/media-sound/alsa-utils/files/alsa-modules.conf-rc
deleted file mode 100644
index 40e99df8d3f4..000000000000
--- a/media-sound/alsa-utils/files/alsa-modules.conf-rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# Alsa kernel modules' configuration file.
-
-# ALSA portion
-alias char-major-116 snd
-# OSS/Free portion
-alias char-major-14 soundcore
-
-##
-## IMPORTANT:
-## You need to customise this section for your specific sound card(s)
-## and then run `update-modules' command.
-## Read alsa-driver's INSTALL file in /usr/share/doc for more info.
-##
-##  ALSA portion
-## alias snd-card-0 snd-interwave
-## alias snd-card-1 snd-ens1371
-##  OSS/Free portion
-## alias sound-slot-0 snd-card-0
-## alias sound-slot-1 snd-card-1
-##
-
-# OSS/Free portion - card #1
-alias sound-service-0-0 snd-mixer-oss
-alias sound-service-0-1 snd-seq-oss
-alias sound-service-0-3 snd-pcm-oss
-alias sound-service-0-8 snd-seq-oss
-alias sound-service-0-12 snd-pcm-oss
-##  OSS/Free portion - card #2
-## alias sound-service-1-0 snd-mixer-oss
-## alias sound-service-1-3 snd-pcm-oss
-## alias sound-service-1-12 snd-pcm-oss
-
-alias /dev/mixer snd-mixer-oss
-alias /dev/dsp snd-pcm-oss
-alias /dev/midi snd-seq-oss
-
-# Set this to the correct number of cards.
-options snd cards_limit=1