From patchwork Tue Feb 13 16:46:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Henderson X-Patchwork-Id: 872974 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 3zgpMZ0ZpFz9t3F for ; Wed, 14 Feb 2018 03:46:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 42C6587DC6; Tue, 13 Feb 2018 16:46:13 +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 ajQKp1knhJjw; Tue, 13 Feb 2018 16:46:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1E3E887869; Tue, 13 Feb 2018 16:46:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EAB471C3F8C for ; Tue, 13 Feb 2018 16:46:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E4DCB884A1 for ; Tue, 13 Feb 2018 16:46:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gzQ0HLvTVecU for ; Tue, 13 Feb 2018 16:46:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from esa3.microchip.iphmx.com (esa3.microchip.iphmx.com [68.232.153.233]) by whitealder.osuosl.org (Postfix) with ESMTPS id 480568849F for ; Tue, 13 Feb 2018 16:46:08 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.46,508,1511852400"; d="scan'208";a="11418678" Received: from exsmtp01.microchip.com (HELO email.microchip.com) ([198.175.253.37]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 13 Feb 2018 09:46:07 -0700 Received: from jhenderson-hp.microchip.com (10.10.76.4) by CHN-SV-EXCH01.mchp-main.com (10.10.76.37) with Microsoft SMTP Server id 14.3.352.0; Tue, 13 Feb 2018 09:46:06 -0700 From: Joshua Henderson To: Date: Tue, 13 Feb 2018 09:46:06 -0700 Message-ID: <1518540366-13393-1-git-send-email-joshua.henderson@microchip.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3] qt5base: Qt KMS support does not depend on opengl 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: Thomas Petazzoni , Peter Seiderer 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 --- v3: - Reorganize libdrm/egl make condition to be more clear. v2: - If libdrm is configured, make it an explicit dependency. --- package/qt5/qt5base/qt5base.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b3f9c79..644852d 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -35,12 +35,19 @@ endif QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT5BASE_CONFIGURE_OPTS += -kms +QT5BASE_DEPENDENCIES += libdrm +else +QT5BASE_CONFIGURE_OPTS += -no-kms +endif + # Uses libgbm from mesa3d ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -QT5BASE_CONFIGURE_OPTS += -kms -gbm +QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += mesa3d else -QT5BASE_CONFIGURE_OPTS += -no-kms +QT5BASE_CONFIGURE_OPTS += -no-gbm endif ifeq ($(BR2_ENABLE_DEBUG),y)