From patchwork Mon Sep 18 19:21:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Henderson X-Patchwork-Id: 815124 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xwwq441Zcz9s7G for ; Tue, 19 Sep 2017 05:21:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 101D3876C2; Mon, 18 Sep 2017 19:21:33 +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 FUCuzcCtVTkB; Mon, 18 Sep 2017 19:21:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 502C9873EF; Mon, 18 Sep 2017 19:21:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B270C1C24E3 for ; Mon, 18 Sep 2017 19:21:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AC6E289BB3 for ; Mon, 18 Sep 2017 19:21:28 +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 tWDHjwa705Te for ; Mon, 18 Sep 2017 19:21:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from esa5.microchip.iphmx.com (esa5.microchip.iphmx.com [216.71.150.166]) by hemlock.osuosl.org (Postfix) with ESMTPS id 00FAE893A3 for ; Mon, 18 Sep 2017 19:21:26 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.42,414,1500966000"; d="scan'208";a="4801056" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 18 Sep 2017 12:21:26 -0700 Received: from jhenderson-hp.microchip.com (10.10.76.4) by chn-sv-exch05.mchp-main.com (10.10.76.106) with Microsoft SMTP Server id 14.3.352.0; Mon, 18 Sep 2017 12:21:25 -0700 From: Joshua Henderson To: Date: Mon, 18 Sep 2017 12:21:25 -0700 Message-ID: <1505762485-15768-1-git-send-email-joshua.henderson@microchip.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: Peter Seiderer Subject: [Buildroot] [PATCH v2] qt5base: Qt KMS support does not depend on opengl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Qt KMS support should not explicitly depend on the availability of opengl. Don't explicitly disable KMS if opengl is not available and fallback to detecting if libdrm is available before disabling kms. The scenario where this is necessary involves using the Qt linuxfb backend "dumb buffer" support via the DRM API. This is new in Qt 5.9 [1] and only requires KMS, but not opengl. [1] http://doc.qt.io/qt-5/embedded-linux.html#linuxfb Cc: Peter Seiderer Cc: Julien Corjon Signed-off-by: Joshua Henderson --- v2: - If libdrm is configured, make it an explicit dependency. --- package/qt5/qt5base/qt5base.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 0ca11a5..7234948 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -40,8 +40,13 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) QT5BASE_CONFIGURE_OPTS += -kms -gbm QT5BASE_DEPENDENCIES += mesa3d else +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT5BASE_CONFIGURE_OPTS += -kms +QT5BASE_DEPENDENCIES += libdrm +else QT5BASE_CONFIGURE_OPTS += -no-kms endif +endif ifeq ($(BR2_ENABLE_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug