From patchwork Tue Aug 15 16:14:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 801659 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="kAuHGLds"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xWyHG3f48z9s06 for ; Wed, 16 Aug 2017 02:14:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C228530386; Tue, 15 Aug 2017 16:14:48 +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 D-sNjjEzXAve; Tue, 15 Aug 2017 16:14:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0D34630366; Tue, 15 Aug 2017 16:14:47 +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 1C8401C0681 for ; Tue, 15 Aug 2017 16:14:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 155F4840E4 for ; Tue, 15 Aug 2017 16:14: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 K3MxI_DSsyw8 for ; Tue, 15 Aug 2017 16:14:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1E0528407F for ; Tue, 15 Aug 2017 16:14:45 +0000 (UTC) Received: by mail-wr0-f173.google.com with SMTP id m57so4581326wrm.5 for ; Tue, 15 Aug 2017 09:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=GIUlX/UuaU1qI04R+ZzkFF6KMqmwaZb+4j2W8MExXb8=; b=kAuHGLdsz2RViH5REzL9pAN5vJZ/apvMnYuP9IbXhZAL96XnRqCpz0WTyllKOmya3E oPjd4npmaDAfXroWPJ9sDr3YIOj20DDyuQ3jxWf7NAfpL55z1I2deInOaZr6ppq9qurh tbmgehOMDafyVbWK/0fHYdxDOpjVn0qb9TnDPij8LfE93gf/Lr7wHxsUeOYNP5rBVioe egdCmw3Hf2dzjMswAANx87EBOT7/cWiL5ZV/dm+PYD8sbNSNRRZmtIInRr91TTxS9sKh DrobMwAwVmFSpzQWJdsSXsQ47QYMcPXZBYAJN2tt67bGNiKBayCm/S3pMdOTYvwBvsEG qBBw== 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; bh=GIUlX/UuaU1qI04R+ZzkFF6KMqmwaZb+4j2W8MExXb8=; b=RQ2q9+Wg/hubRZPf8ypNE/kM8J6nE334whBCq/jBCy1BEW1kKJXjL2wwmia43mkGEb 1Ro3ypLjc/+j8lst7x8hJymloUwHNRcxtLrm3ZUxAkZyekIylwsEGmyabnhNV65Yi0WK 3gyHx3oAYpECbNMYAXcuShYvgSrtn1WZIz0yzZqXbDcwvSIO876kLH655hPPjeM2LbSo 9zo6bQ1IahmTn8N2p8xVpFKaUDZQk9wpcdG66AFqpPzFBjU//AW58k3//Qk+R/2taDKj G55lw0ZKdvHWX0veMRTQ/LxwHuMAw2j8AC0leavoSUN3GxjG6IWJKKHhY8cdf4zCjfJC lz6w== X-Gm-Message-State: AHYfb5hOlMw4mSkg9WanqJdGoDHUZvKGvAuSZK7XXj5k6oMr5S7NRlQN AY9/ZO7d2OsijUv8Wnk= X-Received: by 10.223.158.202 with SMTP id b10mr18119029wrf.234.1502813683253; Tue, 15 Aug 2017 09:14:43 -0700 (PDT) Received: from t450s.lan (LMontsouris-657-1-10-89.w90-63.abo.wanadoo.fr. [90.63.251.89]) by smtp.googlemail.com with ESMTPSA id y35sm8999637wrd.60.2017.08.15.09.14.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2017 09:14:42 -0700 (PDT) From: Gary Bisson To: buildroot@buildroot.org Date: Tue, 15 Aug 2017 18:14:28 +0200 Message-Id: <20170815161428.7765-1-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.14.1 Cc: thomas.petazzoni@free-electrons.com, Peter Seiderer Subject: [Buildroot] [PATCH] qt5base: add qmake.conf fixup for i.MX platforms 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" As stated in QTBUG-61156 [1], since Qt5.9 all the Qt apps fail to start on i.MX platforms. The reason is that the qmake.conf should apparently now specify which eglfs backend to use. It can be seen in the qmake.conf example for i.MX [2]. It has also been integrated into the Yocto meta-freescale layer [3]. Although this issue can be worked around by exporting a variable (QT_QPA_EGLFS_INTEGRATION=eglfs_viv), this patch aims at providing a more user-friendly approach by modifying qmake.conf when created. [1]: https://bugreports.qt.io/browse/QTBUG-61156 [2]: https://github.com/qt/qtbase/blob/5.9/mkspecs/devices/linux-imx6-g%2B%2B/qmake.conf#L35 [3]: https://github.com/Freescale/meta-freescale/blob/master/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch Signed-off-by: Gary Bisson Tested-by: Maxime Ripard --- Hi all, Not sure if this approach is acceptable but my idea was to make this patch as small as possible. It was tested on Nitrogen6x using the nitrogen6x_qt5_gst1_defconfig from our newly created external repository: https://github.com/boundarydevices/buildroot-external-boundary Regards, Gary --- package/qt5/qt5base/qt5base.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bbbdd41209..fbbb3b0c93 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -214,6 +214,15 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) +define QT5BASE_CONFIGURE_QMAKE_CONFIG + echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf +endef +endif +endif + ifneq ($(QT5BASE_CONFIG_FILE),) define QT5BASE_CONFIGURE_CONFIG_FILE cp $(QT5BASE_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h @@ -231,6 +240,7 @@ endif define QT5BASE_CONFIGURE_CMDS $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(QT5BASE_CONFIGURE_QMAKE_CONFIG) $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE)