From df748d5b9f1cc0166cb8de5d770e001171cc3926 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Fri, 20 Jan 2017 11:26:28 +0200 Subject: 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). Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton --- ...idi-Explicitly-cast-constant-to-char-type.patch | 75 ---------------------- meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb | 42 ------------ meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb | 41 ++++++++++++ 3 files changed, 41 insertions(+), 117 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0001-Cus428Midi-Explicitly-cast-constant-to-char-type.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb (limited to 'meta/recipes-multimedia/alsa') 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.0.bb deleted file mode 100644 index a4f35ce7e9..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Advanced tools for certain ALSA sound card drivers" -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" -SECTION = "console/utils" -LICENSE = "GPLv2 & LGPLv2+" -DEPENDS = "alsa-lib ncurses glib-2.0" - -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" - -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)} \ - 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" - -inherit autotools-brokensep pkgconfig - -CLEANBROKEN = "1" - -EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" -PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," - -# configure.ac/.in doesn't exist so force copy -AUTOTOOLS_COPYACLOCAL = "1" - -do_compile_prepend () { - #Automake dir is not correctly detected in cross compilation case - export AUTOMAKE_DIR="$(automake --print-libdir)" - export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/ ${ACLOCALEXTRAPATH}" - - cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile -} - -FILES_${PN} += "${datadir}/ld10k1" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb new file mode 100644 index 0000000000..9e97c0e969 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.3.bb @@ -0,0 +1,41 @@ +SUMMARY = "Advanced tools for certain ALSA sound card drivers" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" +SECTION = "console/utils" +LICENSE = "GPLv2 & LGPLv2+" +DEPENDS = "alsa-lib ncurses glib-2.0" + +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" + +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)} \ + file://gitcompile_hdajacksensetest \ + file://0001-as10k1-Make-output_tram_line-static-inline.patch \ + " + +SRC_URI[md5sum] = "b23eaae687d55410b92587c2053b301f" +SRC_URI[sha256sum] = "d88f1dcd6872121383eded5fa24e328e68c54e527db4547e1435d5eabc2b6709" + +inherit autotools-brokensep pkgconfig + +CLEANBROKEN = "1" + +EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" +PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," + +# configure.ac/.in doesn't exist so force copy +AUTOTOOLS_COPYACLOCAL = "1" + +do_compile_prepend () { + #Automake dir is not correctly detected in cross compilation case + export AUTOMAKE_DIR="$(automake --print-libdir)" + export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/ ${ACLOCALEXTRAPATH}" + + cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile +} + +FILES_${PN} += "${datadir}/ld10k1" -- cgit 1.2.3-korg