diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2019-02-25 17:56:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-26 23:04:31 +0000 |
commit | a2a5615cee92a51aa18dceb6fa53a276892db7b2 (patch) | |
tree | 009b9a3cd28bcba91556d759b2c14370d1895fb5 /meta/recipes-multimedia/alsa/alsa-tools | |
parent | 9ea8ca7f62ea5e9865f871ef79337b2fa9867cdc (diff) | |
download | poky-a2a5615cee92a51aa18dceb6fa53a276892db7b2.tar.gz |
alsa-tools: 1.1.6 -> 1.1.7
Changelog:
http://alsa-project.org/main/index.php/Changes_v1.1.6_v1.1.7
The two patches have now been upstreamed. Apart from those changes, the
only thing that changed was the hwmixvolume tool, which got ported from
PyGTK to PyGObject, and from GTK 2 to GTK 3.
When testing hwmixvolume, I found that it depends on pyalsa, which has
not been packaged for OE. I believe hwmixvolume has never worked on OE.
It certainly didn't work before this patch, trying to build it failed
due to python-pygtk not being available. Even if python-pygtk was
available at some point in the past, hwmixvolume has always used pyalsa,
but the alsa-tools recipe has never had that dependency declared.
(From OE-Core rev: b1426844235a64246d46d71cf826e871c92d7ed4)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-tools')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch | 34 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/musl.patch | 47 |
2 files changed, 0 insertions, 81 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch deleted file mode 100644 index c137bc8a28..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
3 | |||
4 | From a861bdabf02cd9bfb3ec7c0571c563c0fa14adfb Mon Sep 17 00:00:00 2001 | ||
5 | From: Khem Raj <raj.khem@gmail.com> | ||
6 | Date: Tue, 24 Apr 2018 12:24:32 -0700 | ||
7 | Subject: [PATCH] us428control: Fix clang -Wreserved-user-defined-literal | ||
8 | warnings | ||
9 | |||
10 | | us428control.cc:66:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] | ||
11 | | printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); | ||
12 | | ^ | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | ||
16 | --- | ||
17 | us428control/us428control.cc | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/us428control/us428control.cc b/us428control/us428control.cc | ||
21 | index e839bf4..8cb3c42 100644 | ||
22 | --- a/us428control/us428control.cc | ||
23 | +++ b/us428control/us428control.cc | ||
24 | @@ -63,7 +63,7 @@ static void usage(void) | ||
25 | { | ||
26 | printf("Tascam US-428 Control\n"); | ||
27 | printf("version %s\n", VERSION); | ||
28 | - printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); | ||
29 | + printf("usage: " PROGNAME " [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); | ||
30 | printf("mode is one of (us224, us428, mixxx)\n"); | ||
31 | } | ||
32 | /* | ||
33 | -- | ||
34 | 1.7.11.7 | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/musl.patch b/meta/recipes-multimedia/alsa/alsa-tools/musl.patch deleted file mode 100644 index 9eb129c379..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/musl.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 235d9c5e8381518b0a8661786e7e0cbdd1bbcd01 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 12 Jun 2018 13:24:34 +0100 | ||
7 | Subject: [PATCH] ld10k1: define _GNU_SOURCE and use sighandler_t | ||
8 | |||
9 | __sighandler_t is a glibc internal type which doesn't exist in musl. By using | ||
10 | AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE defined, both glibc and musl | ||
11 | then expose sighandler_t. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | ||
15 | --- | ||
16 | ld10k1/configure.ac | 1 + | ||
17 | ld10k1/src/ld10k1_fnc1.c | 2 +- | ||
18 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/ld10k1/configure.ac b/ld10k1/configure.ac | ||
21 | index 276b24e..f48ca31 100644 | ||
22 | --- a/ld10k1/configure.ac | ||
23 | +++ b/ld10k1/configure.ac | ||
24 | @@ -4,6 +4,7 @@ AC_CONFIG_MACRO_DIR([m4]) | ||
25 | AM_MAINTAINER_MODE([enable]) | ||
26 | |||
27 | AC_CONFIG_HEADERS(config.h) | ||
28 | +AC_USE_SYSTEM_EXTENSIONS | ||
29 | AC_PROG_CC | ||
30 | AC_PROG_LD | ||
31 | AC_PROG_INSTALL | ||
32 | diff --git a/ld10k1/src/ld10k1_fnc1.c b/ld10k1/src/ld10k1_fnc1.c | ||
33 | index 343584c..ddc43c6 100644 | ||
34 | --- a/ld10k1/src/ld10k1_fnc1.c | ||
35 | +++ b/ld10k1/src/ld10k1_fnc1.c | ||
36 | @@ -179,7 +179,7 @@ int main_loop(comm_param *param, int audigy, const char *card_id, int tram_size, | ||
37 | { | ||
38 | fd_set active_fd_set/*, read_fd_set*/; | ||
39 | int i, j, res = 0; | ||
40 | - __sighandler_t old_sig_pipe; | ||
41 | + sighandler_t old_sig_pipe; | ||
42 | |||
43 | int main_sock = 0; | ||
44 | int data_sock = 0; | ||
45 | -- | ||
46 | 2.11.0 | ||
47 | |||