Add a new init.d script, cleaned up, without internal changelog. This version fixes bug #154598, as the modules are removed recursively with all the modules depending on the them, and also bug #104441 as the oss files are saved and restored during the respective functions.

(Portage version: 2.1.2-r9)

4 files changed, 357 insertions, 1 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 66dae91e9ad9..09313288e72c 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.192 2007/02/11 23:35:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.193 2007/02/18 02:00:16 flameeyes Exp $
+
+*alsa-utils-1.0.14_rc2-r1 (18 Feb 2007)
+
+  18 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsasound-init-20070218, +alsa-utils-1.0.14_rc2-r1.ebuild:
+  Add a new init.d script, cleaned up, without internal changelog. This
+  version fixes bug #154598, as the modules are removed recursively with all
+  the modules depending on the them, and also bug #104441 as the oss files are
+  saved and restored during the respective functions.
 
   11 Feb 2007; Simon Stelling <blubb@gentoo.org>
   alsa-utils-1.0.14_rc1.ebuild:
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r1.ebuild
new file mode 100644
index 000000000000..63f97b086c8d
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r1.ebuild,v 1.1 2007/02/18 02:00:16 flameeyes Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls midi"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.14_rc1"
+RDEPEND="${DEPEND}
+	virtual/modutils
+	sys-apps/pciutils"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils with midi support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
+	epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch"
+	epatch "${FILESDIR}/${P}-seq.patch"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable midi sequencer) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	newconfd "${FILESDIR}/alsasound.confd" alsasound
+	insinto /etc/modules.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa
+	newinitd "${FILESDIR}/alsasound-init-20070218" alsasound
+}
+
+pkg_postinst() {
+	echo
+	elog "To take advantage of the init script, and automate the process of"
+	elog "loading and unloading the ALSA sound drivers as well as"
+	elog "storing 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"
+	echo
+}
diff --git a/media-sound/alsa-utils/files/alsasound-init-20070218 b/media-sound/alsa-utils/files/alsasound-init-20070218
new file mode 100644
index 000000000000..9be55cb1c556
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound-init-20070218
@@ -0,0 +1,260 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-init-20070218,v 1.1 2007/02/18 02:00:16 flameeyes Exp $
+#
+# Gentoo users: add this script to 'boot' run level.
+# ==================================================
+#
+# alsasound			This shell script takes care of starting and stopping
+#					the ALSA sound driver.
+#
+# Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+#
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	 02111-1307 USA
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+
+opts="${opts} save restore"
+
+depend() {
+	need bootmisc localmount
+	after modules isapnp coldplug hotplug
+}
+
+load_modules() {
+	# List of drivers for each card.
+	local DRIVERS="$(modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | awk '{print $2}')"
+
+	# Fall back on the automated aliases if we don't have ALSA configured properly...
+	if [[ -z "${DRIVERS}" && ! ( -d /proc/asound && -z "$(grep ' no soundcards ' /proc/asound/cards)" ) ]] ; then
+		ewarn "Could not detect custom ALSA settings.  Loading all detected alsa drivers."
+		DRIVERS="$(modprobe -c | grep pci: |  awk '{ print $3 }' | grep snd.* | sort | uniq)"
+		[[ -z "${DRIVERS}" ]] && eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?"
+	fi
+
+	if [[ ${ENABLE_OSS_EMUL} == "yes" ]] && modprobe -c | grep -q "snd.*oss$" ; then
+		# Test for use of OSS
+		local OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")"
+		# Add oss modules to list
+		local i
+		for i in ${OSS}
+		do
+			DRIVERS="${DRIVERS} ${i}"
+		done
+	fi
+
+	# We want to ensure snd-seq is loaded as it is needed for things like
+	# timidity even if we don't use a real sequencer.
+	DRIVERS="${DRIVERS} $(modprobe -l | grep "snd.seq\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
+
+	# We want to ensure snd-ioctl32 is loaded as it is needed for 32bit
+	# compatibility
+	DRIVERS="${DRIVERS} $(modprobe -l | grep "snd.ioctl32\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
+
+	local DRIVER
+	for DRIVER in ${DRIVERS}
+	do
+		if [[ "${DRIVER}" != "off"	&&
+			  -z $(cut -d' ' -f1 /proc/modules | egrep "^${DRIVER}\$") &&
+			  -z $(cut -d' ' -f1 /proc/modules | egrep "^${DRIVER//-/_}\$") ]] ; then
+			ebegin "  Loading: ${DRIVER}"
+			/sbin/modprobe ${DRIVER}
+			eend $?
+		fi
+	done
+
+	sleep 1
+
+	if [[ -f /proc/asound/seq/drivers ]] ; then
+		local SEQUENCERS="$(awk -F, '$2~/^empty$/ {print $1}' /proc/asound/seq/drivers)"
+		local SEQUENCER
+		for SEQUENCER in ${SEQUENCERS}
+		do
+			if [[ -z $(cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER}\$")  &&
+				  -z $(cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER//-/_}\$") ]] ; then
+				ebegin "  Loading: ${SEQUENCER}"
+				/sbin/modprobe ${SEQUENCER}
+				eend $?
+			fi
+		done
+	fi
+
+	for DRIVER in ${DRIVERS}
+	do
+		local TMP=${DRIVER##snd-}
+		TMP=${TMP##snd_}
+		if [[ -x "${alsascrdir}/${TMP}" ]] ; then
+			ebegin "  Running: ${alsascrdir}/${TMP}"
+			${alsascrdir}/${TMP}
+			eend $?
+		fi
+	done
+
+	if [[ ! -d /proc/asound || -n "$(grep ' no soundcards ' /proc/asound/cards)" ]] ; then
+		eerror "ERROR: Failed to load necessary drivers"
+		return 1
+	fi
+}
+
+unload_modules_24() {
+	local LOADED_MODULES="$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')"
+	local MODULE
+	for MODULE in ${LOADED_MODULES}
+	do
+		/sbin/rmmod ${MODULE} >& /dev/null
+	done
+	/sbin/rmmod soundcore >& /dev/null
+	/sbin/rmmod gameport >& /dev/null
+
+	# Return success if the modules are unloaded
+	[[ -z "$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')" ]]
+}
+
+unload_modules_recursive() {
+	local revdeps=$(/sbin/lsmod | egrep "^$1\>" | awk '{ print $4 }')
+
+	for module in ${revdeps//,/ }; do
+		unload_modules_recursive "${module}"
+	done
+
+	/sbin/rmmod --wait "$1"
+}
+
+unload_modules_26() {
+	# First of all, remove the snd module and all the modules depending
+	# on it, this should remove already most of ALSA modules.
+	unload_modules_recursive snd
+
+	# Then find the remaining ones, and handle them too.
+	for module in $(lsmod | egrep '^snd' | awk '{ print $1 }'); do
+		unload_modules_recursive "${module}"
+	done
+
+	if lsmod | egrep -q '^snd'; then
+		return 1
+	else
+		return 0;
+	fi
+}
+
+terminate() {
+	#
+	# Kill processes holding open sound devices
+	#
+	# DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*`
+	local ossdevs="/dev/admmidi? /dev/adsp? /dev/amidi? /dev/audio* /dev/dmfm* \
+			/dev/dmmidi? /dev/dsp* /dev/dspW* /dev/midi0? /dev/mixer? /dev/music \
+			/dev/patmgr? /dev/sequencer* /dev/sndstat"
+	local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*"
+	fuser -k ${ossdevs} ${alsadevs} >& /dev/null
+
+	# remove all sequencer connections if any
+	[[ -f /proc/asound/seq/clients && -n $(type -p aconnect) ]] && aconnect --removeall
+}
+
+restore() {
+	ebegin "Restoring Mixer Levels"
+
+	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="$( awk '/: / { print $1 }' /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 -f "${alsastatedir}/asound.state" restore ${cardnum} \
+			|| ewarn "Errors while restoring defaults, ignoring"
+	done
+
+	push_opts=$(shopt -p nullglob); shopt -s nullglob
+	for ossfile in "${alsastatedir}"/oss/card?_pcm??; do
+		# We use cat because I'm not sure if cp works properly on /proc
+		cat "${ossfile}" > /proc/asound/${ossfile/_/\/}/oss
+	done
+	eval $push_opts
+
+	eend 0
+}
+
+save() {
+	ebegin "Storing ALSA Mixer Levels"
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl -f "${alsastatedir}/asound.state" store; then
+		eerror "Error saving levels."
+
+		eend 1
+		return 1
+	fi
+
+	push_opts=$(shopt -p nullglob); shopt -s nullglob
+	for ossfile in /proc/asound/card?/pcm??/oss; do
+		local device=${ossfile##/proc/asound/}; device=${device%%/oss}; device=${device/\//_}
+
+		mkdir -p "${alsastatedir}/oss/"
+		cp "${ossfile}" "${alsastatedir}/oss/${device}"
+	done
+	eval $push_opts
+
+	eend 0
+}
+
+start() {
+	if [[ -f /proc/modules ]] ; then
+		ebegin "Loading ALSA modules"
+		if load_modules ; then
+			eend 0
+		else
+			eend 1
+			return 1
+		fi
+	fi
+
+	[[ ${RESTORE_ON_START} == "yes" ]] && restore
+}
+
+stop() {
+	if [[ ! -d /proc/asound ]] ; then
+		eerror "ALSA is not loaded"
+		return 0
+	fi
+
+	[[ ${SAVE_ON_STOP} == "yes" ]] && save
+
+	ebegin "Killing processes using ALSA"
+	terminate
+	eend 0
+
+	if [[ -f /proc/modules ]]; then
+		local ver # used to carry the version of kernel used,
+				  # and then to execute the right function.
+		/sbin/rmmod --version | grep -q module-init-tools \
+			&& ver="26" || ver="24"
+
+		ebegin "Unloading ALSA modules"
+		if unload_modules_${ver}; then
+			eend 0
+		else
+			eend 1
+		fi
+	fi
+}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r1 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r1
new file mode 100644
index 000000000000..8db4c3f3529e
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r1
@@ -0,0 +1,3 @@
+MD5 7e9f132b34b7773d2a29b0ff14719a49 alsa-utils-1.0.14rc2.tar.bz2 981123
+RMD160 9975bc5c71df585ad1818647a1abb2be68910403 alsa-utils-1.0.14rc2.tar.bz2 981123
+SHA256 306bd7c4436c1c56a0a499317e23b5b58aea3718df17c138ab0df56fd9bf3e0c alsa-utils-1.0.14rc2.tar.bz2 981123