diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-24 19:10:45 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-29 23:29:18 -0800 |
| commit | 56a3ff9ed04c3644bd7eb49ec5519b261e3cb4d7 (patch) | |
| tree | fae175dccc4a7961086c33c273181f51a36f5fd6 /pkg | |
| parent | d29f7e5d531938f2699fb4c4e09939d0e43b06c1 (diff) | |
alsa-lib: Update to 1.1.3
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/alsa-lib/config.h | 6 | ||||
| -rw-r--r-- | pkg/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch | 31 | ||||
| -rw-r--r-- | pkg/alsa-lib/rev | 2 | ||||
| m--------- | pkg/alsa-lib/src | 0 |
4 files changed, 4 insertions, 35 deletions
diff --git a/pkg/alsa-lib/config.h b/pkg/alsa-lib/config.h index 82f9e706..2c6b49ea 100644 --- a/pkg/alsa-lib/config.h +++ b/pkg/alsa-lib/config.h @@ -34,10 +34,10 @@ #define PACKAGE "alsa-lib" #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "alsa-lib" -#define PACKAGE_STRING "alsa-lib 1.1.2" +#define PACKAGE_STRING "alsa-lib 1.1.3" #define PACKAGE_TARNAME "alsa-lib" #define PACKAGE_URL "" -#define PACKAGE_VERSION "1.1.2" +#define PACKAGE_VERSION "1.1.3" #define SND_MAX_CARDS 32 #define SUPPORT_ALOAD "1" /* #undef SUPPORT_RESMGR */ @@ -59,7 +59,7 @@ #ifndef __EXTENSIONS__ # define __EXTENSIONS__ 1 #endif -#define VERSION "1.1.2" +#define VERSION "1.1.3" #define VERSIONED_SYMBOLS /**/ /* #undef _MINIX */ /* #undef _POSIX_1_SOURCE */ diff --git a/pkg/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch b/pkg/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch deleted file mode 100644 index 158c53c4..00000000 --- a/pkg/alsa-lib/patch/0003-pcm_plug-Clear-plugins-on-all-error-conditions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1b7b58ebe989053af06a7ee800ff6f20899aab8d Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 18 Oct 2016 20:14:35 -0700 -Subject: [PATCH] pcm_plug: Clear plugins on all error conditions - -Otherwise, they will linger after the error is returned (but pcm->setup == 0). -Then, if the caller tries to clean up and call snd_pcm_close(), the assertion -plug->gen.slave == plug->req_slave will fail. ---- - src/pcm/pcm_plug.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c -index 5639b9e..266707b 100644 ---- a/src/pcm/pcm_plug.c -+++ b/src/pcm/pcm_plug.c -@@ -652,8 +652,10 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm, - (plug->ttable && !plug->ttable_ok)) { - snd_pcm_t *new; - int err; -- if (k >= sizeof(funcs)/sizeof(*funcs)) -+ if (k >= sizeof(funcs)/sizeof(*funcs)) { -+ snd_pcm_plug_clear(pcm); - return -EINVAL; -+ } - err = funcs[k](pcm, &new, client, &p); - if (err < 0) { - snd_pcm_plug_clear(pcm); --- -2.10.1 - diff --git a/pkg/alsa-lib/rev b/pkg/alsa-lib/rev index 0cfbf088..00750edc 100644 --- a/pkg/alsa-lib/rev +++ b/pkg/alsa-lib/rev @@ -1 +1 @@ -2 +3 diff --git a/pkg/alsa-lib/src b/pkg/alsa-lib/src -Subproject 1bf144013cffdeb41a5df3a11a8eb2596c5ea2b +Subproject 7e86c8c56fba6fd8cdb57ee97aaa731c351a889 |