From patchwork Wed Sep 23 18:23:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1370029 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BxRPZ3KM4z9sRf for ; Thu, 24 Sep 2020 04:23:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9581420421; Wed, 23 Sep 2020 18:23:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f+HcsL5x0q-R; Wed, 23 Sep 2020 18:23:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 911AD2729B; Wed, 23 Sep 2020 18:23:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DB7071BF388 for ; Wed, 23 Sep 2020 18:23:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D5CFD272F6 for ; Wed, 23 Sep 2020 18:23:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pP4MHMnNWri2 for ; Wed, 23 Sep 2020 18:23:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp2.megiteam.pl (smtp2.megiteam.pl [213.189.52.193]) by silver.osuosl.org (Postfix) with ESMTPS id E9C5820421 for ; Wed, 23 Sep 2020 18:23:05 +0000 (UTC) Received: from host-81-161-192-17.oxylion.net.pl ([81.161.192.17] helo=bartekk-pc.lan) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1kL9Pz-0003hZ-78; Wed, 23 Sep 2020 20:23:03 +0200 From: Bartosz Bilas To: buildroot@buildroot.org Date: Wed, 23 Sep 2020 20:23:00 +0200 Message-Id: <20200923182300.58950-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/qt5/qt5declarative: remove optional quick module option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Bilas , thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since commit [1] we are not able to disable/enable this module so let's force to set Qt5 OpenGL support by default if it's possible because currently quick's components are being built anyway. This should fix the build errors with qt5location package which includes couple of built-in components that require OpenGL support [2] when Qt Quick module is detected. http://autobuild.buildroot.net/results/ddd/ddda7cdb9400f6ca7d548e9b5ada18674fbe42e0/ http://autobuild.buildroot.net/results/ddb/ddb25ebb591ed6029a7bd4934464171358553936/ [1] https://git.buildroot.net/buildroot/commit/package/qt5/qt5declarative/qt5declarative.mk?id=1bdceb5d735aad5fbf32b35e3a7f573ecb727e20 [2] https://code.woboq.org/qt5/qtdeclarative/src/quick/scenegraph/coreapi/qsgmaterialshader.h.html#105 Signed-off-by: Bartosz Bilas --- package/qt5/qt5declarative/Config.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3ba9224c22..a25a12f06f 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE help Qt is a cross-platform application and UI framework for developers using C++. @@ -11,11 +12,3 @@ config BR2_PACKAGE_QT5DECLARATIVE http://doc.qt.io/qt-5/qtqml-index.html http://doc.qt.io/qt-5/qtquick-index.html - -if BR2_PACKAGE_QT5DECLARATIVE - -config BR2_PACKAGE_QT5DECLARATIVE_QUICK - bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE - -endif