Include upstreamized patch for "hctl element search" wrt #468690 by William Throwe and Jaroslav Kysela

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 123 insertions, 9 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 0c8c85ac4da5..ed90d0f4f1c7 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.350 2013/05/27 13:59:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.351 2013/05/27 14:55:22 ssuominen Exp $
+
+*alsa-utils-1.0.27.1-r1 (27 May 2013)
+
+  27 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +alsa-utils-1.0.27.1-r1.ebuild,
+  +files/alsa-utils-1.0.27.1-hctl_elem_search.patch:
+  Include upstreamized patch for "hctl element search" wrt #468690 by William
+  Throwe and Jaroslav Kysela
 
 *alsa-utils-1.0.27.1 (27 May 2013)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index f629e85dc7fa..9b47c84c0bd7 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -8,6 +8,7 @@ AUX alsa-utils-1.0.26-kmod.patch 460 SHA256 65c9e14813d3da1fde93cfde1f926df65fa4
 AUX alsa-utils-1.0.27-alsactl.patch 808 SHA256 874cb5935b2b03da90af07d52eb4e84b16cc912c64c4182a79e37fa0ab8341dc SHA512 03b7ef375945390a78ff761c5cb5bd84e555af1f3f5a629915accae36308dc9703366c898f9a72176e679e76d9000506d57459c314ba608f1b7a03bb35b16b2a WHIRLPOOL b5fff86b968686ec0eb4583e7ead3b1e61987aa8c1fcfd1663502bac867ebecadbfafef306016f3638f73ca408b31306ebe7fece0962b6337f1c7dc1bb7bf018
 AUX alsa-utils-1.0.27-arecord.patch 704 SHA256 cacd8317c0039fc68feda0159c69ac71a30ad362dca79c8ec584f20a8307cbf9 SHA512 6075f9dbba9365073aa017037e5ebc190cef0a3de6623524d4383e3e50847b93bbd8329a841d0e87097b5ad64c1268db3eee7cc028cf3e110382242af576a0cc WHIRLPOOL d72fc88efbedf521cd1112c4de26adeea6337585146ba02cef3f20bdcf905a3ec0ff36e310eac4b86726cd3d7310a72c2e32b8019607f591aab5ef54c8bbd5f1
 AUX alsa-utils-1.0.27-service.patch 322 SHA256 a5eb871b8a31df65bd2e81fc294859acaba267cfd4fa61f857c272d5770f6caa SHA512 ef83ed8212143658360da27c2e7eaa830f95ac61265dead383e5499f840b72e0b9f4bd58186ca2399fc0afe13e949abe2b916f76ce240a81cb96243de32d8417 WHIRLPOOL 38e64494de1d2944385d3fdb1bf442ef074743fd1f45fcaf86feef00050f27765515f8e3d6c0297961baef4614fb48c03311f0064f3b0f6fdcd55bf3a9060804
+AUX alsa-utils-1.0.27.1-hctl_elem_search.patch 771 SHA256 6cdf9fd6015116e2b001be2cbe9150c1c9f37b6e77c42ffa4daba937c182475b SHA512 984764363032364803d7da516e5c46210f2a93eb46dfe6e5705a676b3829d79fa5df3acf3949f0aa07422f0daad3b0ece2ac5ea789f127c4caad6526cc3f2973 WHIRLPOOL 282d847f1a0b38767de25e34f74051dcae1d51d5ff1513645a8a644162da60e5bee4ee0cf185eabc06681ae5de57fda76b96ab4c9945fc40c5118076408a5a6c
 AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
 AUX alsasound.initd-r5 2099 SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be SHA512 3b1399afd10551516545677fd6d8ef676e1eaaca5d76580563b9906b2de86854b8afef864b92dead342d41f3c3c342bff1bc6bd704f932677a524ba4e585a405 WHIRLPOOL 862d943d7d0742c00de9e02cff9b3fe159805880b3e0ea70e50c8c449e8b8c1cfa47d26286bd0807840b1f24c9c9c8cbaef890d71dab43644b52105efb2e7fae
 DIST alsa-driver-1.0.25.tar.bz2 3861484 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3 SHA512 51164c5f1c6e40e188be8e544ddc610b56ffb7d696bc925a0a30e6819d6cbd90a7f9f33c379d411d0e7a172a3ed1cf15b59c27654d63db1a9bad2051331d3017 WHIRLPOOL b70a3614baf72cc2762a2b8a65e07af0204c8550aa140aa01f7d5ee998a8cdf54f43600cfb61c2cb4773d55813afd9aef845f4219d955fbf0f3bc085cf003c7d
@@ -16,17 +17,18 @@ DIST alsa-utils-1.0.27.1.tar.bz2 1142802 SHA256 3de65a2fae0ce679027be24cf477935d
 DIST alsa-utils-1.0.27.tar.bz2 1142833 SHA256 6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef SHA512 1bcfcce0cee2c9e72458525f8424abab4a0be93bceda0a90f0113be315ff0f1d956309b535bfd0cc9ce70f031718718301e8dc91f2d16cd91b34ebeb95693625 WHIRLPOOL e13a7a57d7dcc2f323dfdc1a9f6976adcb4a038d159ae6a5641eebebbfcc44e7ed2b833f2e7d8f324a28f9daa355f55ff4def7d0d820f61790e40733d8bd1cbe
 EBUILD alsa-utils-1.0.26-r2.ebuild 2350 SHA256 6bc96fce2ba3fad5ced306b691201e267e4f7bcb70ba0e11900db219c9e64927 SHA512 2ccba1fc4444d8626b5811de5b2b3f79b4c28a4cafbbc3a83d5466624b765033092e93e7d59b8377e634bcfc54e38090da7e2ea6c850ee0880395ec80c947f39 WHIRLPOOL d438a717250ed7066342bc797fbeca15276ea29de665cc945297cef54c3399bb4194c2fe9cf38cbe95f83807a0fea0a05fb2dfa99fdadc34834425e2a8f61e97
 EBUILD alsa-utils-1.0.27-r1.ebuild 2566 SHA256 bd253c6a3f3fe9fc2c40fe43a4591ade25288c23bd905d7392c4f761d2fff293 SHA512 431293385759db28071ce26cf53ab302489b3b86a29a034a1270c9dc9b66c98ec97dd7820a1cdf9d0ae71cca10922b8cd458f1bfea9d947ab53c26c903701229 WHIRLPOOL ffe798e244a276711e0e04a7befc7da972c59c1de6e51696d1246b82b6dbbab9e71d6ee924fd06c431b85f1632041efc22449bf9d4ea726fb1f51b6eea597990
+EBUILD alsa-utils-1.0.27.1-r1.ebuild 2475 SHA256 968e9e6aad6274777e843b04084f6f2759c3aaaa7ee7e86e37e75a6e9bf5a80e SHA512 9399f85a429ebf1c961032b2638de0b9eae51eec2cb836675fadd76513563851a823ddd3eead6db06a0d77db7afb20b52cf3d7673ae70bb1e5e37966ccd4736a WHIRLPOOL 8e967a9f3d07840affc600ed9d7e23cf41643000aa03e4f8633b6ea50a40c72ce5dd28218c2bfbf4585af3bb92a25b85a161e9fffee0dafd329ffc62aef37ab4
 EBUILD alsa-utils-1.0.27.1.ebuild 2422 SHA256 6958bff0ee7665aeb5b3251b56b7121b99f52462b386aed09bf2b8c0a2ba52a8 SHA512 8d315c3200079def30cae5d2b981a3ed86e78b3683a7427564ac8795847c1ab4e3cb19354117bf138914c2c716e4fb63f2cd8669035a2c39ee5cd3ba3dfe1680 WHIRLPOOL 50fd52599546a1a658a13d9b4548e13c0cabd4c4f789e9cf68c005b4b97e54a077dbc1bb08643b5b0493d50c4ed5914e6f2ebb55054ca119bbed2fe876e572e3
-MISC ChangeLog 54360 SHA256 b6766e390798e71ac58aa0625c632f7fe095bdc3f2432011e4b4e194109da46a SHA512 a9381d358d27bfd5a71ee0c0ec72dde21ef83436f57821e7754b8294cd93c0ac88736781f5a3e4ad7c6db42643c0013599f7fd9d7b9dc4a31cfb389051ffebf2 WHIRLPOOL d81a30a3145849c2354ee71ece4eeaeeee4b5eeff66902de9c03a5f24013b0108421f59614888e92444d1f0250ae96a1dcb84fe2864bf6f19ccd7b853cffedf6
+MISC ChangeLog 54648 SHA256 6706217d0837729fdf9c5b61544e7da7a0df938dd33853402b810420d3ade271 SHA512 fad35df8d1385ebd25aa3eeebd8a1947a7d53f9052944b3b960d9af102dc6bf26a38fbac52f948ffd884556c20aaefeb4d0e11d88432de0fb696a0cc6b6e2126 WHIRLPOOL e900b4a55810791afb5bdd413c1dd1abfb1ca9f895444a1565b22013fdb1d456fc22c3c3c922f973f8b05cd64eda0871675a5f67d958cf265a1d1d1cbdd9cfc8
 MISC metadata.xml 519 SHA256 c95261699625faf6df725dc2c7468b8464cfb415125711f893ca27fa9f42631c SHA512 0abb84b0570ecc8eaa7cfc61fbc53dba85a7faeee77c3f5e7761ca53596bdcba24015fe51025b4cf1a0e9c7cdd2f56cb4ecfb2ffa5912c782ac6c0bfc14e2c05 WHIRLPOOL 44ad8f3192836559aebf278528b3315e5e85a02854a97893d3a3b910e3e4e1371254e2caaa2171bb0c304afc77e9cbb04c1f5dbde67f053c9c1b580932cf06ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRo2ZLAAoJEEdUh39IaPFNEB4H/3JF3t13PQ6T492syPdHGjOV
-wTMIMwFmtFu484BUZrJGJagZeoaeExZlkCUroUl3dGIjfShQUY+1BRIle2/s9oc8
-nbzL8JdS9JWcpiX9owYzw6rTdR6V0cDA+NoBG9tE91NIRmk7oHkKJ75i/OJSXVa5
-dzlfWRuahzzA+LPMV0H3uEROkdlRhop1DsGCOr5ckXiBi/OzrIuJluO9cQOHyHbh
-xBF5i0HAcz6CnNDhMqLlqAQ55mC+OqY0U8o2GjC39IyYyIqBdNQ7LdRBrMXBYbiV
-KuU33OwJTC9fACyX/jYjaLcC9Bb8i7u4oIy1S7PZljZ3kzQtqKDxgneXPMrD7D0=
-=XtdZ
+iQEcBAEBCAAGBQJRo3NmAAoJEEdUh39IaPFNNKkH/RFv0au679TxygPM7eV+F6hU
+nfmJasFhefeYQtKz1CKP0577f0BIFOkwCxmeZaDuoseAVKGi4ZuIMYWz4gcJA7Kg
+wqeOWeSBHoyqKVoepYuDOmdFdGA8qwVdvKIdPvK5w2Jk0tf8XSoRYL2FgHKJTYVA
+GqtnpTzl01mIpFSqwUrk+fAYXi6E4wnfHXjIYIc3aL8XhSagIZXdspMUrQsZkwj+
+5vrs1mcB29o9RbsUODAbT9x/vGgxBF201LES6mgaCmp9d5dW+mzqXNIlaf3BpZxP
+wOsZ/N/yAygsRccrj0hy+noQH1V2wWz4XQERiWCyKwx9ikwL/7nh1WnkboDnj30=
+=0a6F
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.27.1-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.27.1-r1.ebuild
new file mode 100644
index 000000000000..3b6c982a5d27
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.27.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 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.27.1-r1.ebuild,v 1.1 2013/05/27 14:55:22 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
+	mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+RDEPEND=">=media-libs/alsa-lib-1.0.27-r2
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
+	selinux? ( sec-policy/selinux-alsa )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-hctl_elem_search.patch
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use doc || myconf='--disable-xmlto'
+
+	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README TODO seq/*/README.*
+
+	newbin "${WORKDIR}"/alsa-driver-*/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
+
+	# 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
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; 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
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27.1-hctl_elem_search.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27.1-hctl_elem_search.patch
new file mode 100644
index 000000000000..6cff1d5576d7
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27.1-hctl_elem_search.patch
@@ -0,0 +1,25 @@
+From d61924fd247c2cf0280391e076c439c9427732aa Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 27 May 2013 16:40:26 +0200
+Subject: [PATCH] amixer: Fix the hctl elem search bug
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ amixer/amixer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/amixer/amixer.c b/amixer/amixer.c
+index 2f1521b..92b0f83 100644
+--- a/amixer/amixer.c
++++ b/amixer/amixer.c
+@@ -1105,6 +1105,7 @@ static int cset(int argc, char *argv[], int roflag, int keep_handle)
+ 		}
+ 		return err;
+ 	}
++	snd_ctl_elem_info_get_id(info, id);     /* FIXME: Remove it when hctl find works ok !!! */
+ 	if (!roflag) {
+ 		snd_ctl_elem_value_set_id(control, id);
+ 		if ((err = snd_ctl_elem_read(handle, control)) < 0) {
+-- 
+1.7.11.7
+