From b1426844235a64246d46d71cf826e871c92d7ed4 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Mon, 25 Feb 2019 17:56:15 +0200 Subject: [PATCH] alsa-tools: 1.1.6 -> 1.1.7 Changelog: http://alsa-project.org/main/index.php/Changes_v1.1.6_v1.1.7 The two patches have now been upstreamed. Apart from those changes, the only thing that changed was the hwmixvolume tool, which got ported from PyGTK to PyGObject, and from GTK 2 to GTK 3. When testing hwmixvolume, I found that it depends on pyalsa, which has not been packaged for OE. I believe hwmixvolume has never worked on OE. It certainly didn't work before this patch, trying to build it failed due to python-pygtk not being available. Even if python-pygtk was available at some point in the past, hwmixvolume has always used pyalsa, but the alsa-tools recipe has never had that dependency declared. Signed-off-by: Tanu Kaskinen Signed-off-by: Richard Purdie --- ...served-user-defined-literal-warnings.patch | 34 -------------- .../alsa/alsa-tools/musl.patch | 47 ------------------- ...lsa-tools_1.1.6.bb => alsa-tools_1.1.7.bb} | 14 +++--- 3 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/musl.patch rename meta/recipes-multimedia/alsa/{alsa-tools_1.1.6.bb => alsa-tools_1.1.7.bb} (90%) diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch deleted file mode 100644 index c137bc8a28..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Khem Raj - -From a861bdabf02cd9bfb3ec7c0571c563c0fa14adfb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 24 Apr 2018 12:24:32 -0700 -Subject: [PATCH] us428control: Fix clang -Wreserved-user-defined-literal - warnings - -| us428control.cc:66:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] -| printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); -| ^ - -Signed-off-by: Khem Raj -Signed-off-by: Takashi Iwai ---- - us428control/us428control.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/us428control/us428control.cc b/us428control/us428control.cc -index e839bf4..8cb3c42 100644 ---- a/us428control/us428control.cc -+++ b/us428control/us428control.cc -@@ -63,7 +63,7 @@ static void usage(void) - { - printf("Tascam US-428 Control\n"); - printf("version %s\n", VERSION); -- printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); -+ printf("usage: " PROGNAME " [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); - printf("mode is one of (us224, us428, mixxx)\n"); - } - /* --- -1.7.11.7 diff --git a/meta/recipes-multimedia/alsa/alsa-tools/musl.patch b/meta/recipes-multimedia/alsa/alsa-tools/musl.patch deleted file mode 100644 index 9eb129c379..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 235d9c5e8381518b0a8661786e7e0cbdd1bbcd01 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 12 Jun 2018 13:24:34 +0100 -Subject: [PATCH] ld10k1: define _GNU_SOURCE and use sighandler_t - -__sighandler_t is a glibc internal type which doesn't exist in musl. By using -AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE defined, both glibc and musl -then expose sighandler_t. - -Signed-off-by: Ross Burton -Signed-off-by: Takashi Iwai ---- - ld10k1/configure.ac | 1 + - ld10k1/src/ld10k1_fnc1.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ld10k1/configure.ac b/ld10k1/configure.ac -index 276b24e..f48ca31 100644 ---- a/ld10k1/configure.ac -+++ b/ld10k1/configure.ac -@@ -4,6 +4,7 @@ AC_CONFIG_MACRO_DIR([m4]) - AM_MAINTAINER_MODE([enable]) - - AC_CONFIG_HEADERS(config.h) -+AC_USE_SYSTEM_EXTENSIONS - AC_PROG_CC - AC_PROG_LD - AC_PROG_INSTALL -diff --git a/ld10k1/src/ld10k1_fnc1.c b/ld10k1/src/ld10k1_fnc1.c -index 343584c..ddc43c6 100644 ---- a/ld10k1/src/ld10k1_fnc1.c -+++ b/ld10k1/src/ld10k1_fnc1.c -@@ -179,7 +179,7 @@ int main_loop(comm_param *param, int audigy, const char *card_id, int tram_size, - { - fd_set active_fd_set/*, read_fd_set*/; - int i, j, res = 0; -- __sighandler_t old_sig_pipe; -+ sighandler_t old_sig_pipe; - - int main_sock = 0; - int data_sock = 0; --- -2.11.0 - diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb similarity index 90% rename from meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb rename to meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb index 0662b5a78d..e1b50fac52 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb @@ -9,13 +9,10 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65 file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ " -SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2 \ - file://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \ - file://musl.patch \ - " +SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2" -SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19" -SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227" +SRC_URI[md5sum] = "475bdf6457bcf55c8c895d653ee56a54" +SRC_URI[sha256sum] = "a0243328a8f6f691a3055c484fd8d3326393096325e93743b246029d327c4ef6" inherit autotools-brokensep pkgconfig # brokensep as as10k1 (and probably more) fail out of tree @@ -38,7 +35,6 @@ PACKAGECONFIG[hdajacksensetest] = ",,glib-2.0" PACKAGECONFIG[hdspconf] = ",,fltk" PACKAGECONFIG[hdsploader] = "" PACKAGECONFIG[hdspmixer] = ",,fltk" -PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygtk" PACKAGECONFIG[ld10k1] = "" PACKAGECONFIG[mixartloader] = "" PACKAGECONFIG[pcxhrloader] = "" @@ -51,6 +47,10 @@ PACKAGECONFIG[us428control] = "" PACKAGECONFIG[usx2yloader] = "" PACKAGECONFIG[vxloader] = "" +# At the time of writing pyalsa is not packaged for OE, so this is not expected +# to work. +PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygobject pyalsa" + python do_configure() { for subdir in d.getVar("PACKAGECONFIG").split(): subdir = subdir.replace("--", "/") -- 2.40.1