vapier 14/11/19 19:16:08
Added: alsa-utils-1.0.28-mixer-proto.patch
alsa-utils-1.0.28-va-end.patch
alsa-utils-1.0.28-monitor-proto.patch
alsa-utils-1.0.28-aplay-return.patch
Log:
Add various fixes from upstream.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.1
media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch?rev=1.1&content-type=text/plain
Index: alsa-utils-1.0.28-mixer-proto.patch
===================================================================
>From c788ce9b6088e2c937f77231eab520c3d16e0c76 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <[email protected]>
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
1.1 media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch?rev=1.1&content-type=text/plain
Index: alsa-utils-1.0.28-va-end.patch
===================================================================
>From 89a4f490bd974e454d82942100f241bb1a2270f3 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <[email protected]>
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
1.1
media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch?rev=1.1&content-type=text/plain
Index: alsa-utils-1.0.28-monitor-proto.patch
===================================================================
>From 74e5d57c999f8afed4f87046dcac84f6709b9196 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <[email protected]>
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
1.1
media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch?rev=1.1&content-type=text/plain
Index: alsa-utils-1.0.28-aplay-return.patch
===================================================================
http://crbug.com/433899
>From 8f361d83cfcb39887f5fc591633e68d9448e3425 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <[email protected]>
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
