From patchwork Fri Feb 9 01:22:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABl_PORTAY?= X-Patchwork-Id: 871171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zcy3w4t1bz9s72 for ; Fri, 9 Feb 2018 12:22:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4747689D2C; Fri, 9 Feb 2018 01:22:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PnrsROFTaaiT; Fri, 9 Feb 2018 01:22:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DB93989A56; Fri, 9 Feb 2018 01:22:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4A8261C20DE for ; Fri, 9 Feb 2018 01:22:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 473F888868 for ; Fri, 9 Feb 2018 01:22:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2jWyhm9aZOwt for ; Fri, 9 Feb 2018 01:22:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4B7968885C for ; Fri, 9 Feb 2018 01:22:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 6CF4C9C1C71; Thu, 8 Feb 2018 20:22:43 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id fx4zCoSm5DLZ; Thu, 8 Feb 2018 20:22:42 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id B789B9C1CB2; Thu, 8 Feb 2018 20:22:42 -0500 (EST) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3mBM7O4BhdhI; Thu, 8 Feb 2018 20:22:42 -0500 (EST) Received: from localhost.localdomain (unknown [172.16.15.14]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 830B99C1C71; Thu, 8 Feb 2018 20:22:42 -0500 (EST) From: =?utf-8?q?Ga=C3=ABl_PORTAY?= To: buildroot@buildroot.org, "Thomas Petazzoni" Date: Thu, 8 Feb 2018 20:22:36 -0500 Message-Id: <20180209012236.5118-1-gael.portay@savoirfairelinux.com> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] qt5webengine: fix build issue with alsa X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Ga=C3=ABl_PORTAY?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Qt WebEngine auto-guesses if it compiles support for alsa. When the alsa-lib config is enabled but the features mixer, rawmidi, hwdep and seq are not also enabled, it leads to a build failure. Lets the developer decide whether or not support for alsa in Qt WebEngine by adding the new config BR2_PACKAGE_QT5WEBENGINE_ALSA that selects the features it needs when it is set. Fixes [1]. [1]: http://autobuild.buildroot.net/results/d81537a8f67bb0a3625057560b2f16daf4828f98/build-end.log Signed-off-by: Gaƫl PORTAY --- package/qt5/qt5webengine/Config.in | 10 ++++++++++ package/qt5/qt5webengine/qt5webengine.mk | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index d0c8d18210..387ce0a76e 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -81,4 +81,14 @@ config BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS which includes required proprietary audio and video codecs, such as H.264 and MPEG layer-3 (MP3). +config BR2_PACKAGE_QT5WEBENGINE_ALSA + bool "alsa" + depends on BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_MIXER + select BR2_PACKAGE_ALSA_LIB_RAWMIDI + select BR2_PACKAGE_ALSA_LIB_HWDEP + select BR2_PACKAGE_ALSA_LIB_SEQ + help + Enable ALSA support. + endif diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 96dd401c6c..344ecc514b 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -28,6 +28,12 @@ ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs endif +ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) +QT5WEBENGINE_DEPENDENCIES += alsa-lib +else +QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa +endif + # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink.