summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-01-20 11:26:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:21 +0000
commit12106c68cd6eb10ad79eea4076d4ea80742c47c6 (patch)
treef6e423cb7cbbf265f864b005e3f1eaffc852b525 /meta
parent0af7715cbb0d5814d07562bb75e9a57d330ed97e (diff)
downloadpoky-12106c68cd6eb10ad79eea4076d4ea80742c47c6.tar.gz
alsa-tools: 1.1.0 -> 1.1.3
Drop 0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch, because the new release has an equivalent fix (and that's actually the only change in the new release). (From OE-Core rev: df748d5b9f1cc0166cb8de5d770e001171cc3926) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.3.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb)5
2 files changed, 2 insertions, 78 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
deleted file mode 100644
index bf95cac440..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch
+++ /dev/null
@@ -1,75 +0,0 @@
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.3.bb
index a4f35ce7e9..9e97c0e969 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb
@@ -13,11 +13,10 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \
14 file://gitcompile_hdajacksensetest \ 14 file://gitcompile_hdajacksensetest \
15 file://0001-as10k1-Make-output_tram_line-static-inline.patch \ 15 file://0001-as10k1-Make-output_tram_line-static-inline.patch \
16 file://0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch \
17 " 16 "
18 17
19SRC_URI[md5sum] = "b476a5afaa3ea3230855553ad59d259d" 18SRC_URI[md5sum] = "b23eaae687d55410b92587c2053b301f"
20SRC_URI[sha256sum] = "7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51" 19SRC_URI[sha256sum] = "d88f1dcd6872121383eded5fa24e328e68c54e527db4547e1435d5eabc2b6709"
21 20
22inherit autotools-brokensep pkgconfig 21inherit autotools-brokensep pkgconfig
23 22