sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Khem Raj 2016-05-11 10:35:09 -07:00 committed by Richard Purdie
parent b8e70ce204
commit 54cbfa3a0b
2 changed files with 78 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch Normal file
View File

@ -0,0 +1,75 @@
From 1cc0aa4dbd3c7f1267809e0e1ca57d46f4803bfd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 17 Apr 2016 23:25:18 +0000
Subject: [PATCH] Cus428Midi: Explicitly cast constant to char type
This is flagged by gcc6
Cus428Midi.cc:83:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
us428control/Cus428Midi.cc | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/us428control/Cus428Midi.cc b/us428control/Cus428Midi.cc
index b9e6783..bef7bb1 100644
--- a/us428control/Cus428Midi.cc
+++ b/us428control/Cus428Midi.cc
@@ -32,22 +32,22 @@ char Cus428Midi::KnobParam[] = {
0x2A,
0x29,
0x28,
- -1,
+ static_cast<char>(-1),
0x10,
0x11,
0x18,
0x19,
0x1A,
- -1,
- -1,
- -1,
- -1,
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
0x2C,
0x2D,
0x2E,
0x2F,
- -1,
- -1,
+ static_cast<char>(-1),
+ static_cast<char>(-1),
0x20,
0x21,
0x22,
@@ -64,14 +64,14 @@ char Cus428Midi::KnobParam[] = {
5,
6,
7,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
- -1,
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
+ static_cast<char>(-1),
0x30,
0x31,
0x32,
--
1.9.1

6
meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
View File

@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \
file://autotools.patch \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
'file://makefile_no_gtk.patch', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \
file://gitcompile_hdajacksensetest \
file://0001-as10k1-Make-output_tram_line-static-inline.patch \
"
file://0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch \
"
SRC_URI[md5sum] = "b476a5afaa3ea3230855553ad59d259d"
SRC_URI[sha256sum] = "7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51"