alsa-utils: upgraded package to upstream
Upgraded media-sound/alsa-utils to version 1.0.28-r1
BUG=chromium:433899
TEST=deploy and test audio on Ryu
Change-Id: I7e458d2a0359a3a5431cdf6a69db91136a05ee1e
Reviewed-on: https://chromium-review.googlesource.com/231343
Reviewed-by: Chinyue Chen <chinyue@chromium.org>
Reviewed-by: Anatol Pomazau <anatol@google.com>
Commit-Queue: Anatol Pomazau <anatol@google.com>
Tested-by: Anatol Pomazau <anatol@google.com>
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
similarity index 84%
rename from media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
rename to media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
index f0a1ebb..d2c3726 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.4 2014/10/23 10:46:39 pacho Exp $
+# $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
@@ -14,15 +14,19 @@
KEYWORDS="*"
IUSE="doc +libsamplerate +ncurses nls selinux"
-RDEPEND=">=media-libs/alsa-lib-${PV}
+CDEPEND=">=media-libs/alsa-lib-${PV}
libsamplerate? ( media-libs/libsamplerate )
- ncurses? ( >=sys-libs/ncurses-5.7-r7 )
- selinux? ( sec-policy/selinux-alsa )"
-DEPEND="${RDEPEND}
+ 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
}
@@ -43,8 +47,8 @@
}
src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog README TODO seq/*/README.*
+ default
+ dodoc seq/*/README.*
newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
new file mode 100644
index 0000000..e257888
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
@@ -0,0 +1,45 @@
+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
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
new file mode 100644
index 0000000..fdd26c3
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
@@ -0,0 +1,24 @@
+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
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
new file mode 100644
index 0000000..55d93f8
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
@@ -0,0 +1,24 @@
+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
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
new file mode 100644
index 0000000..a4153bd
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
@@ -0,0 +1,39 @@
+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
+
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.0.28 b/metadata/md5-cache/media-sound/alsa-utils-1.0.28-r1
similarity index 78%
rename from metadata/md5-cache/media-sound/alsa-utils-1.0.28
rename to metadata/md5-cache/media-sound/alsa-utils-1.0.28-r1
index 5d67e9b..e71fbe5 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.0.28
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.0.28-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=media-libs/alsa-lib-1.0.28 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7 ) selinux? ( sec-policy/selinux-alsa ) virtual/pkgconfig doc? ( app-text/xmlto ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=media-libs/alsa-lib-1.0.28 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7 ) virtual/pkgconfig doc? ( app-text/xmlto ) virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
EAPI=5
HOMEPAGE=http://www.alsa-project.org/
@@ -10,4 +10,4 @@
SLOT=0.9
SRC_URI=mirror://alsaproject/utils/alsa-utils-1.0.28.tar.bz2
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 9f063b2cc19c5e8030911372aa246c4e toolchain-funcs 48b38a216afb92db6314d6c3187abea3 udev a9a8d051efb42bfe884c1db82ce161de
-_md5_=aece3e3bf86b65949cda691c66db799a
+_md5_=a15693b96ee5fad6ab25e7ee51aea070
