Use -I option on alsactl restore to avoid aborting unnecessarily, as per Adam Nielsen in bug #281631. libsamplerate is both a build & run time dependency, as per Albert W. Hopkins in bug #403557. Remove unsupported autoload/unload as it breaks with kmod, as per Ulenrich in bug #404535.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

5 files changed, 192 insertions, 13 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index a56720314c62..dc0c67e97b3d 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,16 +1,15 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.315 2012/02/03 12:31:38 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.316 2012/02/20 09:03:53 chainsaw Exp $
 
-*alsa-utils-1.0.25 (03 Feb 2012)
+*alsa-utils-1.0.25-r1 (20 Feb 2012)
 
-  03 Feb 2012; Tony Vroon <chainsaw@gentoo.org> +alsa-utils-1.0.25.ebuild,
-  +files/alsa-utils-1.0.25-separate-usr-var-fs.patch:
-  Version bump. Add missed libsamplerate dependency, closes bug #383263 by
-  Hans. Patch by Martin van Gagern silences warnings when using a separate /usr
-  or /var partition, closes bug #384375. Upstream changes fix build breakage
-  when SED is set in the environment, closes bug #366587 by Nils Kneuper.
-  Automatic module loading & unloading is unsupported and may be removed soon.
+  20 Feb 2012; Tony Vroon <chainsaw@gentoo.org> +alsa-utils-1.0.25-r1.ebuild,
+  +files/alsasound.confd-r4, +files/alsasound.initd-r5:
+  Use -I option on alsactl restore to avoid aborting unnecessarily, as per Adam
+  Nielsen in bug #281631. libsamplerate is both a build & run time dependency,
+  as per Albert W. Hopkins in bug #403557. Remove unsupported autoload/unload
+  as it breaks with kmod, as per Ulenrich in bug #404535.
 
   18 Jan 2012; William Hubbs <williamh@gentoo.org> alsa-utils-1.0.23-r1.ebuild,
   alsa-utils-1.0.24.2-r1.ebuild:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 1481770b1cf3..c1fe032e3b97 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -7,7 +7,9 @@ AUX alsa-utils-1.0.23-alsactl-output2.patch 853 RMD160 e5a3d15f69cbb37f1c0b7adeb
 AUX alsa-utils-1.0.23-modprobe.d.patch 504 RMD160 3af095095834ff8a6578338f7999047783989ce5 SHA1 8c42ea316a26108dff1985867717e81e57496d28 SHA256 3f6116f467f52eba2e2de46df24a08c99231fdf83ab92dd5f0051aabc5aee077
 AUX alsa-utils-1.0.25-separate-usr-var-fs.patch 471 RMD160 6b52120a5cad0d3c768cb6cc5e5070e50c85c063 SHA1 0ce9882286f25884d7507bc92f74330375ebcd8b SHA256 2d92453c9427e46702a5624791dc58da8834c457d6eb6f1b96fd6d4eb651544a
 AUX alsasound.confd-r3 874 RMD160 2e3ea587fd55757ec26c60a3bb86fcd697f48e67 SHA1 9561a56c1a3a1d0ecdef42655ecc1e2c12340852 SHA256 e5d26a6ea993540ca2d67aee4b40f1351b13f2c8023d53cb67c22cb3707e72de
+AUX alsasound.confd-r4 340 RMD160 ce8a76ffa562567051df614edd644f599165ec62 SHA1 8f05e66477df33e65cb2b7802592dfa23884bd2e SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43
 AUX alsasound.initd-r4 6249 RMD160 e1e701faa056c8a45eac17b47e77fab4a2ca3b6e SHA1 407ea14d7a08f70bf00c918425ec1214809e6f69 SHA256 a4421f45d61182095ccd9470857173058ff1af0d92b07f3e3cc3af65d630021d
+AUX alsasound.initd-r5 2099 RMD160 f227789c0e72175815dbd3b86738f350315b150b SHA1 ee51ac1ba42e920044251e4e7d1214d2a6ca055c SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be
 DIST alsa-driver-1.0.23.tar.bz2 3337645 RMD160 bdefa689616bd6b21e75837f4ee4afc4d7bd4583 SHA1 b7d376cd3e664ba13b6dfb8278546f1b61189a14 SHA256 0641da5be2de9ca2fa1b234d479063280238290e253a94492c87c573bf445f22
 DIST alsa-driver-1.0.24.tar.bz2 3609960 RMD160 727c6b78c4f595f20b74649f391db75bb927c66a SHA1 df82fc3d5e2a9248f0214a87ad31a9825bcab9bc SHA256 fe8aa69b209879dd6df820237a28cddcf1bed5417710e53336ec7281b5f48d2b
 DIST alsa-driver-1.0.25.tar.bz2 3861484 RMD160 ad8b8093bf1de78cb0dcbb1b6a82ebb18d7aad6d SHA1 ebda37d18379466ca9d843e7a80d10bb706a6b04 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3
@@ -16,13 +18,14 @@ DIST alsa-utils-1.0.24.2.tar.bz2 1130734 RMD160 afebeca198cf64d16cd45007cccbd57a
 DIST alsa-utils-1.0.25.tar.bz2 1132780 RMD160 8b1dc5c28d1fa6d9e0a79e029b6d69530f493e1d SHA1 c02eb4a3b9649950b803628371a840fb96ed6370 SHA256 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c
 EBUILD alsa-utils-1.0.23-r1.ebuild 3210 RMD160 bd961bc5590b87990c87850550001fb6f805530c SHA1 fd4d31c7e2062b0fa4bbd9c83eadc5a301fdd02a SHA256 0dd8fb6adff11d18696e1d7fa7dd9f02a6d65f7337996b177cab1d916cc90c31
 EBUILD alsa-utils-1.0.24.2-r1.ebuild 2891 RMD160 6d9140742ac014fcede63dc50906b30de1f39328 SHA1 de545afa552811f631e866e9b9eb858aefa94dd2 SHA256 35b824183a1a03c77359440a8ae4527cd05859a1814df39e539cd325aace09c7
+EBUILD alsa-utils-1.0.25-r1.ebuild 2235 RMD160 d2dde208b3108f85a1321c811660ab6bfea7ca5e SHA1 273ae8747bf022a5362313dd3c4005926194d148 SHA256 c4126c18d408addde4859c7fd6cd9a911b74f21d81fec9c127a02e90d2406610
 EBUILD alsa-utils-1.0.25.ebuild 2839 RMD160 86a86e89911e2ceb0a0626602d0db26b82959030 SHA1 a0e1b0666dc6f01a0f759ddc07913aa4ab3c11e7 SHA256 4e2795d7e943c11eaa64b823781079385a35770e25177ff9519d415216249152
-MISC ChangeLog 48594 RMD160 e86c01e9019d39addd5fd3f5a94c3bd1b7ed11c4 SHA1 1ee521456659813039aadde7b96bf5ce4c618814 SHA256 db3ef75c29c99ebf4a49df9ac440920983c1f36bd02bc278e12bb45c6dda31c3
+MISC ChangeLog 48512 RMD160 acd8336adb53180ee54805a6cfadb97ed089e0ce SHA1 6a95a459e642aec1cd4125b5f6ab86f3a3a46be6 SHA256 ad44d30bab3691c9d27e8f306f243cd1256f71ff227ef2172d68bfb56630f924
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8r068ACgkQp5vW4rUFj5qnaACePrYxmGS+faYufBHgwRLfiv92
-fjAAn1FE5hQoEh1eTpzOw6LpTQglBdA2
-=lJK7
+iEYEARECAAYFAk9CDIAACgkQp5vW4rUFj5rroACdGyA04h0aBR0HCrpVaSzwbLEW
+UUsAnRCeeyI98daV242nMreZtBJThoEi
+=dnsU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
new file mode 100644
index 000000000000..3d6c623df5f9
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 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.25-r1.ebuild,v 1.1 2012/02/20 09:03:53 chainsaw Exp $
+
+EAPI=4
+inherit base systemd
+
+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
+	mirror://alsaproject/driver/alsa-driver-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc nls minimal"
+
+COMMON_DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.25
+	media-libs/libsamplerate"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( sys-apps/pciutils )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+"${FILESDIR}/${PN}-1.0.23-modprobe.d.patch"
+"${FILESDIR}/${P}-separate-usr-var-fs.patch"
+)
+
+src_configure() {
+	local myconf=""
+	use doc || myconf="--disable-xmlto"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ${ALSA_UTILS_DOCS} || die
+
+	newbin "${WORKDIR}/alsa-driver-${PV}/utils/alsa-info.sh" \
+		alsa-info
+
+	newinitd "${FILESDIR}/alsasound.initd-r5" alsasound
+	newconfd "${FILESDIR}/alsasound.confd-r4" alsasound
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf
+
+	keepdir /var/lib/alsa
+}
+
+pkg_postinst() {
+	echo
+	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"
+	echo
+	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."
+	echo
+	if use minimal; then
+		ewarn "The minimal use flag disables the dependency on pciutils that"
+		ewarn "is needed by alsaconf at runtime."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsasound.confd-r4 b/media-sound/alsa-utils/files/alsasound.confd-r4
new file mode 100644
index 000000000000..6fec8f5938da
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.confd-r4
@@ -0,0 +1,15 @@
+# RESTORE_ON_START:
+# Do you want to restore your mixer settings?  If not, your cards will be
+# muted.
+# no - Do not restore state
+# yes - Restore state
+
+RESTORE_ON_START="yes"
+
+# SAVE_ON_STOP:
+# Do you want to save changes made to your mixer volumes when alsasound
+# stops? 
+# no - Do not save state
+# yes - Save state
+
+SAVE_ON_STOP="yes"
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r5 b/media-sound/alsa-utils/files/alsasound.initd-r5
new file mode 100644
index 000000000000..e3c8dd90099f
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r5
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r5,v 1.1 2012/02/20 09:03:53 chainsaw Exp $
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+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="$(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 -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"
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl -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
+}