From patchwork Sun Apr 29 19:35:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 134675 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp3037627lji; Sun, 29 Apr 2018 12:37:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoKR35SPPST+Igdh2yTtNGYjwuz3/NL0qlzpM/GAO7IVdfg5J5AKkCcGh3kk/kKmTFZmN1U X-Received: by 2002:a65:4a84:: with SMTP id b4-v6mr8140605pgu.36.1525030628820; Sun, 29 Apr 2018 12:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525030628; cv=none; d=google.com; s=arc-20160816; b=ZqXLl1nAaLVFZjOE2PwiXGow1fqTlwSclLvZZF2wDuZWnrz8JOvDA8OHwbGwvdtApM dFRpxs99sHhq43F7dG7BRKPLl+leI+P8dDQXyWdmh2hf/lBM00EO3V2oNR8x/+Q8/NEZ o814ipvu/GbPRFd1taWEpKa0gNlU+mQuLgO0BXY33TNnwdcvkhvDvNtBu6dkoV79tbuk SYRh00Ie0nMAF57Uuc/TttkymxFwcmLdttCCdEi3FWwTb3/vUlcHYH6EV21io825qtSO MEkXB1Kp28WLaQcOWzbTLMnJEE+tD61ef3RhEC2aVHcwSMppjyC3xl3ygX9Y4eHDz5wA lT9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=EbfBfjzrsOlJ7WGOJhaMzWqGzr/GXsTfKnx+U5K9MyA=; b=QuD3SzU8yUc2jrJI8ve8sQRtMqxiY6p7PvcLPLgZrHt14k6kUSQf5P0xXRA6haGZpd GoDC7kdt9gC/eHW/svpIB2Zizszjoq7FWnEAl04Xbng9eLQyxGS3sgVC0tVI/g0KsMoN 2b33M249vIXr1VsIGocT9FNVW17c0IdwqoDfy3bdY76GFzsHifWoTOBtgoaESxAA8JGN QRfmJu3ShD9KABENI09+vTEj/qR+cuxdhPWNdI3WO/ZCVkjBOhfrUVno6wlEq0XrhHEP 6MmJLodFhUJWfDPjnKYeyStIU/Ht2zBzv/yhTZcGgOUms7JM0Fe0l/ducbQySP24bEp+ +qdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XjM8jyBW; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t3-v6si5049367pgt.547.2018.04.29.12.37.08; Sun, 29 Apr 2018 12:37:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XjM8jyBW; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5E80874578; Sun, 29 Apr 2018 19:36:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 322797449D for ; Sun, 29 Apr 2018 19:36:25 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id p10-v6so4932545pgn.1 for ; Sun, 29 Apr 2018 12:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MnGXnOt0RBN1wnyJF4EKnZess3TIYKQltsqJSdLvYiA=; b=XjM8jyBWYwsyLZKK8N5DKnPh912qxoGHC1vuG/3E/p6cQAKe/GeG1pSGaoRmeV6HKr 0Ae1ChSZ28TBC489RKuq3zDPTReGsUxdSjCs9/oCgQFXkSnAwHy4rcLYtmbKgr6ayQbD fiD2Y5vtwQXfvveHsOhIf7OLYTVGEJZtlKN/qtAoSESINI+iehzmtDRWCPJrGmSaFKDJ tAQR54j4vpBCJTX40HBSGPazHXQcLBx+GYfYbJl9t6M/8Nh2fth5MrCweznR4zxslDf2 zNkg3iVNqXI/dPWOY34YUjMpVxbnJt2oaZDDykl9f0KLouyCjzyjNMpH3BbnHebS94Lf hDbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MnGXnOt0RBN1wnyJF4EKnZess3TIYKQltsqJSdLvYiA=; b=glVq0yUt9kKM7h4LoDJuAikfxk56mob4iJD0eSk9Vxed4KHjO8MgtUGNpsI1FcbZD6 dyA79XfVdgp+lPziOcXR11fUVzztxoLaKNs3OWgHoeBOq2F9ycPna9Uid0d8pZshDYCG 6883soH2Aiq5sNzb+mb0p5d+uQn8UODPznLmhvAEFieBolJj3GiNfcTLya5gq1QiUijB TbQ1mNzIwFdnojdMp/0mcCrT7MR9Oem1SvSxUQ9XehjylSY4gtozA+GqsbpVXdOhtBNg jxuyzCgFwXIyPBlTUpzl5F6Ig+jKMQZkSQewZgwhjSBmIrcdjx2hWRUCqwBH7qTpnnTV jKlQ== X-Gm-Message-State: ALQs6tDEiN58G8dARdPJmvQdJ+UAEdckyUj+bAyksKUbBltAqpSVU5Z6 TpLo5Vy2pphDFGlqObfWIrbeZA== X-Received: by 2002:a17:902:3a5:: with SMTP id d34-v6mr10128895pld.103.1525030586558; Sun, 29 Apr 2018 12:36:26 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::ddd5]) by smtp.gmail.com with ESMTPSA id 125sm11960737pfc.145.2018.04.29.12.36.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Apr 2018 12:36:25 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 29 Apr 2018 12:35:55 -0700 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: Subject: [OE-core] [PATCH 08/24] alsa-tools: Update to 1.1.6 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org License-Update: FSF address updated in hdsploader/COPYING and ld10k1/COPYING.LIB Fix built with clang along the way Package python dependent tools into a separate package Signed-off-by: Khem Raj xxx Signed-off-by: Khem Raj --- ...served-user-defined-literal-warnings.patch | 28 +++++++++++++ .../alsa/alsa-tools/autotools.patch | 42 ++++++++++++------- ...lsa-tools_1.1.5.bb => alsa-tools_1.1.6.bb} | 25 ++++++++--- 3 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch rename meta/recipes-multimedia/alsa/{alsa-tools_1.1.5.bb => alsa-tools_1.1.6.bb} (62%) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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 new file mode 100644 index 0000000000..2290915eab --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch @@ -0,0 +1,28 @@ +From 2e48e4045e1e951433da0ca4b1e49798eedde14f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 24 Apr 2018 12:21:18 -0700 +Subject: [PATCH] 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"); +| ^ + +Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10360805/] +Signed-off-by: Khem Raj +--- + 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"); + } + /* diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 2e74963c89..c85834a593 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -1,3 +1,8 @@ +From b9a65bf3ba5628cfe8cfd2d10ce2dcf11a606775 Mon Sep 17 00:00:00 2001 +From: Dongxiao Xu +Date: Thu, 14 Jul 2011 15:40:36 +0800 +Subject: [PATCH] alsa-tools: Fix recipe build error. + Add parameters to autoreconf to support cross compile. Remove some sub-components which needs further recipe support. @@ -5,22 +10,17 @@ Signed-off-by: Dongxiao Xu Upstream-Status: Inappropriate [configuration] -diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile ---- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 -+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800 -@@ -1,6 +1,6 @@ - #!/bin/bash - --autoreconf -fi || exit 1 -+autoreconf $ACLOCAL_FLAGS -fi || exit 1 - export CFLAGS='-O2 -Wall -pipe -g' - echo "CFLAGS=$CFLAGS" - echo "./configure $@" -diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile ---- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 -+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 +--- + Makefile | 4 ++-- + ld10k1/gitcompile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index c32bf25..1119372 100644 +--- a/Makefile ++++ b/Makefile @@ -1,8 +1,8 @@ - VERSION = 1.1.5 + VERSION = 1.1.6 TOP = . -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ +SUBDIRS = as10k1 envy24control \ @@ -30,3 +30,15 @@ diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile hwmixvolume hdajackretask hda-verb hdajacksensetest all: +diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile +index 99429ac..20005d9 100755 +--- a/ld10k1/gitcompile ++++ b/ld10k1/gitcompile +@@ -1,6 +1,6 @@ + #!/bin/bash + +-autoreconf -fi || exit 1 ++autoreconf $ACLOCAL_FLAGS -fi || exit 1 + export CFLAGS='-O2 -Wall -pipe -g' + echo "CFLAGS=$CFLAGS" + echo "./configure $@" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb similarity index 62% rename from meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb rename to meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb index 1be43aa6e7..e065eec6b8 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb @@ -5,17 +5,19 @@ 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" +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ + " 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://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \ " -SRC_URI[md5sum] = "3afb92eb1b4f2edc8691498e57c3ec78" -SRC_URI[sha256sum] = "bc3c6567de835223ee7d69487b8c22fb395a2e8c613341b0c96e6a5f6a2bd534" +SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19" +SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227" inherit autotools-brokensep pkgconfig @@ -37,4 +39,17 @@ do_compile_prepend () { cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile } -FILES_${PN} += "${datadir}/ld10k1" +do_install_append() { + sed -i -e "s|/usr/bin/python2|/usr/bin/env python2|g" ${D}${bindir}/hwmixvolume +} + +PACKAGES =+ "${PN}-hwmixvolume" + +FILES_${PN}-hwmixvolume = "${bindir}/hwmixvolume" + +FILES_${PN} += "${datadir}/ld10k1 \ + ${datadir}/icons/hicolor \ + " + +RDEPENDS_${PN}-hwmixvolume += "python" +