# ChangeLog for media-sound/alsa-utils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.377 2014/11/08 18:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.378 2014/11/19 19:16:08 vapier Exp $
+
+*alsa-utils-1.0.28-r1 (19 Nov 2014)
+
+ 19 Nov 2014; Mike Frysinger <vapier@gentoo.org> +alsa-utils-1.0.28-r1.ebuild,
+ +files/alsa-utils-1.0.28-aplay-return.patch,
+ +files/alsa-utils-1.0.28-mixer-proto.patch,
+ +files/alsa-utils-1.0.28-monitor-proto.patch,
+ +files/alsa-utils-1.0.28-va-end.patch:
+ Add various fixes from upstream.
08 Nov 2014; Samuli Suominen <ssuominen@gentoo.org> alsa-utils-1.0.28.ebuild:
ppc/ppc64 stable wrt #522038
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX alsa-modules.conf-rc 1028 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757 WHIRLPOOL 75fdfe4802af6a020bc6a4d46da7872b3481657f13d92e30c9fa61d5accdd8cd19b14a0c813c454d2ca89fa655f5ad375c0163fa4f947342ee759ab80a4700e4
+AUX alsa-utils-1.0.28-aplay-return.patch 1308 SHA256 16afc2631807ade33767cd840e1b0246a2cb32b501191314f00e09213999175c SHA512 0d448b5bb86350c31085efb0985fd902da4ad18800bc6ad371664d57ae0768f3be3a184340e929f3fc88b103c3cd02edae63c68b84c5b676e0c1e4a72e43fc17 WHIRLPOOL 299d6fe6cdc0bed76b8b14b14405d713e980b1fba888fa6b132861dac897642dbbf39948e0a1c2167a1368168f8d35586f1f5ea719fa935a99340600c2db8130
+AUX alsa-utils-1.0.28-mixer-proto.patch 624 SHA256 39de9e4a07586a04a7e29cea94c7096cf908a4e7ffc954c34475bece4877b2ef SHA512 ccc0ce28eee029ac4365321bb224ce4c60131151a5b29aa8b960a26cf81e671044a57d10224be9845285fc7614df2d75fd94ae1d7ce7bb9485384a99101f1a11 WHIRLPOOL c685b557fb763123166123aba5cc03378dd68a14f8aaf585ffa612e828e2e11c47be826e48f1c8d8de46eeee8cfd237cbb7fca3a43fcd39247bf6bb8c76f39c2
+AUX alsa-utils-1.0.28-monitor-proto.patch 830 SHA256 936d7b5beaba3730632a778ba232d51b7337f2b9380419ab4d252bd2235ed6ab SHA512 63561fd000974ccf6d237caef4125ea3d7a1d0aa24578441a69bbb7e582ba46fbba385cb29da3f7b7b4d0f8b9acf7b668dc40efa6adc8155fe2dfe5fc7f7cc03 WHIRLPOOL b59f18027f45399d37e3b4462f07b1d8fb60a551febd1c1eb66747817fa1dd62cf021834c968e27174d964a079c832d01417f4e02b84880b49004ae8424a3a32
+AUX alsa-utils-1.0.28-va-end.patch 1149 SHA256 3384d94245d4f75b035904f9b7d885f288236c6cc32ab77532b7e10a9ac836cd SHA512 ad6aca80839b5cb3a6e6ffcc3d05e5dc14fb599c8d657f375c6802d26cf1b8eb58f30577373e986db3fd1f8769ebef6a8b54a25558cf85c0776284e6c75b6549 WHIRLPOOL bdf0afcf36597a41855bb2662d7aaf7dc3c2004aa2c1b4c01f9d9a1d81c7fbed5b538f70c81dba0ee174793d38212c3d0c953ba6277d68e1db5b23806012f891
AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
AUX alsasound.initd-r5 2099 SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be SHA512 3b1399afd10551516545677fd6d8ef676e1eaaca5d76580563b9906b2de86854b8afef864b92dead342d41f3c3c342bff1bc6bd704f932677a524ba4e585a405 WHIRLPOOL 862d943d7d0742c00de9e02cff9b3fe159805880b3e0ea70e50c8c449e8b8c1cfa47d26286bd0807840b1f24c9c9c8cbaef890d71dab43644b52105efb2e7fae
AUX alsasound.initd-r6 2313 SHA256 5fdcb0212bf8a4be74f410534534fdda6dd8d57df0d2a6c4a158464f705fed18 SHA512 a0997f5934c6680cae250133bc51633487492d367f9031cb39850520e1685c47571a432976dda09d3c2f574b839011284ee413d3dbef6866ceaa8e3feaca522e WHIRLPOOL 258070418f10866f0ea37714ee385dc81dda25dcb8e1e4eb4e1a4f16e32a8c89da402501e02da43b2ecb2c98c7c1f5dec53da24e676c6615569b4d1b5845236e
DIST alsa-utils-1.0.27.2.tar.bz2 1143802 SHA256 02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea SHA512 c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6 WHIRLPOOL 9e95c37f307498bb9a7829fd721bf54888f3fe9ec78f014702cc26493e81369a44b571f1f5e65b3e32dbde926f97ab1152e22cf66fdff17be209e61ae34d9d46
DIST alsa-utils-1.0.28.tar.bz2 1146887 SHA256 f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc SHA512 faa5abf3f066106c80d019944efa2298e2d3157469c1c7bc52deb9aa1bcd5f5439a2e22b04ad9210e292fcef97bdacc27aa75fc275d0d7cae2c2f88729c84786 WHIRLPOOL d58587d9f302f3f1a7ab4de45c3889ce82e5be782e4aa9a953c39a908a4693e99c8ea9aeeb5669f0f606d980983beb7d5fc53e4c76ce1bb76500c7c2bcb45013
EBUILD alsa-utils-1.0.27.2.ebuild 2309 SHA256 8c9f5f6575c898477858600bd09d413da2d5fbfbee2c6b0c337b8ed9d576dc16 SHA512 ef2d293a0b18456fdfba956753d5cc0867d96df2dea2562a3daf428f60cd770e5385bf94bdf9edd03dc8dec1af7c590ead959b2982b35c4975468be1b01baae4 WHIRLPOOL 9e86a49fd16209ff01f65de20f185eac15524274f3237baf0ec873e74b0ff26b19751ca239c40dd1db95f0170d431938fc055cf5774f6f990b6c47334e3784e2
+EBUILD alsa-utils-1.0.28-r1.ebuild 2414 SHA256 88824840447545a770477d82942f4573eb7ebeb8c99c92b6f580ca070efa66a5 SHA512 ca80127514ad0fb7b158cc2cad53ced2e7259056d4018525b217e15694dc9c069b59e900f97f860139850b8f88bc54890aa54528e41820e2f0e2c97aa2cfd245 WHIRLPOOL a655a1991f3b7b4023109aa5f7e2ce85b6cbc0bcbf314a7ddfda691103ae6b3724020874e8e787742c177ed75cd1fab020c3613910e650b0d961137f5418eeec
EBUILD alsa-utils-1.0.28.ebuild 2310 SHA256 c29b7e33472e5e1740354fc94c5252645bcf3dd87b9419bbc9afa3a375d90c1d SHA512 1e87151fdbc10459df3b0a5090d2392ca34aa5b35f787873c3544cdf88f4e7d8bd550d227ff210cf2f4a5503827d23bb2284612683f51508dc33713ab02a1a00 WHIRLPOOL 91b27a20c9539587b0803d064cb0503a9e2912a3855202f814e2afa709ca3d853f3f44248b2dc9fc3c6f0eafb5d9360e7ce0ee687130de0b425316a0c790d8d4
-MISC ChangeLog 58202 SHA256 40a0f4322935fe0cd6ba8b7aa8273aa5dcefe38198dbf703ad6d35595629711c SHA512 4ba0e0ee5ef9872681e3ae0c5fdc31f5e6d96064266b4d2886692e692f6c185f05b055584d6b316625ba25e5a7ddf0fc3821d3522f9771d18053ea58eb7bf042 WHIRLPOOL 96a471aea9e70c6e1e98d81fd0cd74d82b2f01193429357327c602b44b78e73a7560d6d7636f84870d3c3927cc4981eebb730c5e94f4b3cb0c7693cccbde17d1
+MISC ChangeLog 58534 SHA256 e9dc1d461a630f87be70be30cc7d82cb93b620dcbee5ff73db1569ca952e889b SHA512 01553c97aede39a3aabcfb3792f74022db66577daf65d235d7b57813a86993701b9d2f9520a1844573cecec155e81cbf78c003026390d486abee584d768e6065 WHIRLPOOL e0b06a56d0e146135ae9463c55c92dc2af941057a26aa0a7e456ebd0b524d4f46261662e3b5a5e8f146e7dc38cfe444f810db441c6b9bf58116c9cc71976c970
MISC metadata.xml 418 SHA256 5283e8e4df90b1d6dee867370ca08668ff9cadf333f2af896b260d66cd772dcf SHA512 337fdc5a670690722273d2c7aaa5c0b7a44f4a167f8ac22f860680c544e97b04c34816dbbca6d2cf44236a99890f0767534496795a4e9727b3dc735585c3298f WHIRLPOOL 3e2ba0b9cab5298ccdff2522b03079b85f8016bca115ff354196d84793312cda732ef984cf6cd68bfc09cab16bd66f11c14e5a0a7c2898c9ca23db563cc6407a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUXmYqAAoJEEdUh39IaPFNiWYIAISx6Z6BIygp49xPFZLvps0v
-+PCBz4eaGnfdcz+HSNUpbbiamzGILhXYOs/Mbx8Yrgp5LwgmGRCAfCVzS9GyVUZh
-35gq4LfQ3LSYRLy/OaVg/vJMtTcTC94pg5zc5JGu94rRDeLz2drL7M7k+XQdUQlh
-kB4IVp1vzbB3tztZbZRGk49ODV27V+5gsr96h+Et+B00vrcqFtCIrkicI2fM3BPQ
-/SgCGFZK64Bm46L7wAfYF+dXdXfbIy6demz0qEq50ftpaTJRCdYIw/uu2XXXJQJ/
-e8E+Li+X87G3txOIemCgQH6pRrXoQWee7qJvAomLVmaN3z9gthvYMD9DJ8HD4Dg=
-=Y37k
------END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2014 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.28-r1.ebuild,v 1.1 2014/11/19 19:16:08 vapier 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"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+ libsamplerate? ( media-libs/libsamplerate )
+ ncurses? ( >=sys-libs/ncurses-5.7-r7 )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-alsa )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-aplay-return.patch
+ epatch "${FILESDIR}"/${P}-va-end.patch
+ epatch "${FILESDIR}"/${P}-{mixer,monitor}-proto.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() {
+ default
+ dodoc seq/*/README.*
+
+ newinitd "${FILESDIR}"/alsasound.initd-r6 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
+}
--- /dev/null
+http://crbug.com/433899
+
+From 8f361d83cfcb39887f5fc591633e68d9448e3425 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 1 Oct 2014 15:43:57 +0200
+Subject: [PATCH [alsa-utils]] Revert "aplay: fix pcm_read() return value"
+
+This reverts commit 8aa13eec80eac312e4b99423909387660fb99b8f.
+
+The semantics for pcm_read() and pcm_readv() was changed, but the
+callers expect the exact frame count as requested. It's possible
+to fix callers, but the fix is more complicated than to revert the
+change. Note that '-d' processing was broken in some cases.
+
+Note: The reverted commit allows that the return value might be
+greater than requested (see the first condition in read routines).
+---
+ aplay/aplay.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 30d3f31..e58e1bc 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -2039,7 +2039,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount)
+ data += r * bits_per_frame / 8;
+ }
+ }
+- return result;
++ return rcount;
+ }
+
+ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
+@@ -2084,7 +2084,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
+ count -= r;
+ }
+ }
+- return result;
++ return rcount;
+ }
+
+ /*
+--
+2.1.3
+
--- /dev/null
+From c788ce9b6088e2c937f77231eab520c3d16e0c76 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 25 Jun 2014 10:49:23 +0200
+Subject: [PATCH [alsa-utils]] alsamixer: include missing mixer_controls.h
+
+---
+ alsamixer/mainloop.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c
+index 351f57f..79d81a9 100644
+--- a/alsamixer/mainloop.c
++++ b/alsamixer/mainloop.c
+@@ -29,6 +29,7 @@
+ #include "widget.h"
+ #include "mixer_widget.h"
+ #include "mixer_display.h"
++#include "mixer_controls.h"
+ #include "mainloop.h"
+
+ static WINDOW *curses_initialized;
+--
+2.1.3
+
--- /dev/null
+From 74e5d57c999f8afed4f87046dcac84f6709b9196 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 24 Sep 2014 10:46:02 +0200
+Subject: [PATCH [alsa-utils]] alsactl: aded missing monitor() prototype
+
+---
+ alsactl/alsactl.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h
+index bd9bf23..4f969ec 100644
+--- a/alsactl/alsactl.h
++++ b/alsactl/alsactl.h
+@@ -31,6 +31,7 @@ int save_state(const char *file, const char *cardname);
+ int load_state(const char *file, const char *initfile, const char *cardname,
+ int do_init);
+ int power(const char *argv[], int argc);
++int monitor(const char *name);
+ int state_daemon(const char *file, const char *cardname, int period,
+ const char *pidfile);
+ int state_daemon_kill(const char *pidfile, const char *cmd);
+--
+2.1.3
+
--- /dev/null
+From 89a4f490bd974e454d82942100f241bb1a2270f3 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 24 Sep 2014 10:52:17 +0200
+Subject: [PATCH [alsa-utils]] =?UTF-8?q?alsactl:=20coverity=20-=20missing?=
+ =?UTF-8?q?=5Fva=5Fend=20=E2=80=93=20va=5Fend=20was=20not=20called=20for?=
+ =?UTF-8?q?=20"ap"?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ alsactl/utils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/alsactl/utils.c b/alsactl/utils.c
+index b5d183c..304df7c 100644
+--- a/alsactl/utils.c
++++ b/alsactl/utils.c
+@@ -157,8 +157,8 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...)
+ fprintf(stderr, "%s: %s:%ld: ", command, fcn, line);
+ vfprintf(stderr, fmt, ap);
+ putc('\n', stderr);
+- va_end(ap);
+ }
++ va_end(ap);
+ }
+
+ void dbg_(const char *fcn, long line, const char *fmt, ...)
+@@ -174,6 +174,6 @@ void dbg_(const char *fcn, long line, const char *fmt, ...)
+ fprintf(stderr, "%s: %s:%ld: ", command, fcn, line);
+ vfprintf(stderr, fmt, ap);
+ putc('\n', stderr);
+- va_end(ap);
+ }
++ va_end(ap);
+ }
+--
+2.1.3
+