summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-05-11 10:35:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:29 +0100
commit54cbfa3a0b5f6df4b8cec3f7186c21d4fe6d5059 (patch)
tree34ea2b71c4723a0b7b1e5d3b6831c537e1b423e1 /meta/recipes-multimedia/alsa
parentb8e70ce2044b3f88b0d49bde31fd68dc57c10e86 (diff)
downloadpoky-54cbfa3a0b5f6df4b8cec3f7186c21d4fe6d5059.tar.gz
alsa-tools: Fix build with gcc6
bb.utils.contains was spread over multiple lines collapse it into single line, make it more readable (From OE-Core rev: 912782db29cfc15dae2e19e79fa974e11b83f297) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch75
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb6
2 files changed, 78 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch b/meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch
new file mode 100644
index 0000000000..bf95cac440
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch
@@ -0,0 +1,75 @@
1From 1cc0aa4dbd3c7f1267809e0e1ca57d46f4803bfd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 23:25:18 +0000
4Subject: [PATCH] Cus428Midi: Explicitly cast constant to char type
5
6This is flagged by gcc6
7Cus428Midi.cc:83:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 us428control/Cus428Midi.cc | 30 +++++++++++++++---------------
14 1 file changed, 15 insertions(+), 15 deletions(-)
15
16diff --git a/us428control/Cus428Midi.cc b/us428control/Cus428Midi.cc
17index b9e6783..bef7bb1 100644
18--- a/us428control/Cus428Midi.cc
19+++ b/us428control/Cus428Midi.cc
20@@ -32,22 +32,22 @@ char Cus428Midi::KnobParam[] = {
21 0x2A,
22 0x29,
23 0x28,
24- -1,
25+ static_cast<char>(-1),
26 0x10,
27 0x11,
28 0x18,
29 0x19,
30 0x1A,
31- -1,
32- -1,
33- -1,
34- -1,
35+ static_cast<char>(-1),
36+ static_cast<char>(-1),
37+ static_cast<char>(-1),
38+ static_cast<char>(-1),
39 0x2C,
40 0x2D,
41 0x2E,
42 0x2F,
43- -1,
44- -1,
45+ static_cast<char>(-1),
46+ static_cast<char>(-1),
47 0x20,
48 0x21,
49 0x22,
50@@ -64,14 +64,14 @@ char Cus428Midi::KnobParam[] = {
51 5,
52 6,
53 7,
54- -1,
55- -1,
56- -1,
57- -1,
58- -1,
59- -1,
60- -1,
61- -1,
62+ static_cast<char>(-1),
63+ static_cast<char>(-1),
64+ static_cast<char>(-1),
65+ static_cast<char>(-1),
66+ static_cast<char>(-1),
67+ static_cast<char>(-1),
68+ static_cast<char>(-1),
69+ static_cast<char>(-1),
70 0x30,
71 0x31,
72 0x32,
73--
741.9.1
75
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
index 9e633f1f70..916bf087a3 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
10 10
11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ 11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \
12 file://autotools.patch \ 12 file://autotools.patch \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \
14 'file://makefile_no_gtk.patch', d)} \
15 file://gitcompile_hdajacksensetest \ 14 file://gitcompile_hdajacksensetest \
16 file://0001-as10k1-Make-output_tram_line-static-inline.patch \ 15 file://0001-as10k1-Make-output_tram_line-static-inline.patch \
17 " 16 file://0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch \
17 "
18 18
19SRC_URI[md5sum] = "b476a5afaa3ea3230855553ad59d259d" 19SRC_URI[md5sum] = "b476a5afaa3ea3230855553ad59d259d"
20SRC_URI[sha256sum] = "7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51" 20SRC_URI[sha256sum] = "7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51"