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 @@ -From 1cc0aa4dbd3c7f1267809e0e1ca57d46f4803bfd Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- -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(-1), - 0x10, - 0x11, - 0x18, - 0x19, - 0x1A, -- -1, -- -1, -- -1, -- -1, -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), - 0x2C, - 0x2D, - 0x2E, - 0x2F, -- -1, -- -1, -+ static_cast(-1), -+ static_cast(-1), - 0x20, - 0x21, - 0x22, -@@ -64,14 +64,14 @@ char Cus428Midi::KnobParam[] = { - 5, - 6, - 7, -- -1, -- -1, -- -1, -- -1, -- -1, -- -1, -- -1, -- -1, -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), -+ static_cast(-1), - 0x30, - 0x31, - 0x32, --- -1.9.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb similarity index 87% rename from meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb rename to 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 \ ${@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" +SRC_URI[md5sum] = "b23eaae687d55410b92587c2053b301f" +SRC_URI[sha256sum] = "d88f1dcd6872121383eded5fa24e328e68c54e527db4547e1435d5eabc2b6709" inherit autotools-brokensep pkgconfig