summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch34
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/musl.patch47
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb)14
3 files changed, 7 insertions, 88 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 @@
1Upstream-Status: Backport
2Signed-off-by: Khem Raj <raj.khem@gmail.com>
3
4From a861bdabf02cd9bfb3ec7c0571c563c0fa14adfb Mon Sep 17 00:00:00 2001
5From: Khem Raj <raj.khem@gmail.com>
6Date: Tue, 24 Apr 2018 12:24:32 -0700
7Subject: [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
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Takashi Iwai <tiwai@suse.de>
16---
17 us428control/us428control.cc | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/us428control/us428control.cc b/us428control/us428control.cc
21index 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--
341.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 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 235d9c5e8381518b0a8661786e7e0cbdd1bbcd01 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 12 Jun 2018 13:24:34 +0100
7Subject: [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
10AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE defined, both glibc and musl
11then expose sighandler_t.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14Signed-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
20diff --git a/ld10k1/configure.ac b/ld10k1/configure.ac
21index 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
32diff --git a/ld10k1/src/ld10k1_fnc1.c b/ld10k1/src/ld10k1_fnc1.c
33index 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--
462.11.0
47
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb
index 0662b5a78d..e1b50fac52 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb
@@ -9,13 +9,10 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65
9 file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ 9 file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \
10 " 10 "
11 11
12SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2 \ 12SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"
13 file://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \
14 file://musl.patch \
15 "
16 13
17SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19" 14SRC_URI[md5sum] = "475bdf6457bcf55c8c895d653ee56a54"
18SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227" 15SRC_URI[sha256sum] = "a0243328a8f6f691a3055c484fd8d3326393096325e93743b246029d327c4ef6"
19 16
20inherit autotools-brokensep pkgconfig 17inherit autotools-brokensep pkgconfig
21# brokensep as as10k1 (and probably more) fail out of tree 18# brokensep as as10k1 (and probably more) fail out of tree
@@ -38,7 +35,6 @@ PACKAGECONFIG[hdajacksensetest] = ",,glib-2.0"
38PACKAGECONFIG[hdspconf] = ",,fltk" 35PACKAGECONFIG[hdspconf] = ",,fltk"
39PACKAGECONFIG[hdsploader] = "" 36PACKAGECONFIG[hdsploader] = ""
40PACKAGECONFIG[hdspmixer] = ",,fltk" 37PACKAGECONFIG[hdspmixer] = ",,fltk"
41PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygtk"
42PACKAGECONFIG[ld10k1] = "" 38PACKAGECONFIG[ld10k1] = ""
43PACKAGECONFIG[mixartloader] = "" 39PACKAGECONFIG[mixartloader] = ""
44PACKAGECONFIG[pcxhrloader] = "" 40PACKAGECONFIG[pcxhrloader] = ""
@@ -51,6 +47,10 @@ PACKAGECONFIG[us428control] = ""
51PACKAGECONFIG[usx2yloader] = "" 47PACKAGECONFIG[usx2yloader] = ""
52PACKAGECONFIG[vxloader] = "" 48PACKAGECONFIG[vxloader] = ""
53 49
50# At the time of writing pyalsa is not packaged for OE, so this is not expected
51# to work.
52PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygobject pyalsa"
53
54python do_configure() { 54python do_configure() {
55 for subdir in d.getVar("PACKAGECONFIG").split(): 55 for subdir in d.getVar("PACKAGECONFIG").split():
56 subdir = subdir.replace("--", "/") 56 subdir = subdir.replace("--", "/")