From patchwork Tue Mar 19 19:29:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 229195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 2D1F22C0092 for ; Wed, 20 Mar 2013 06:31:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A85B8CFF9; Tue, 19 Mar 2013 19:31:32 +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 87-rOZFQHEYo; Tue, 19 Mar 2013 19:31:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6092B8D04F; Tue, 19 Mar 2013 19:31:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AB2288F74B for ; Tue, 19 Mar 2013 19:30:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B4A9931698 for ; Tue, 19 Mar 2013 19:30:17 +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 Dxb8UWcTS7jP for ; Tue, 19 Mar 2013 19:30:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by silver.osuosl.org (Postfix) with ESMTP id 35EBF311EE for ; Tue, 19 Mar 2013 19:30:16 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 4BCD5224E; Tue, 19 Mar 2013 20:30:14 +0100 (CET) Received: from localhost (unknown [37.160.38.137]) by mail.free-electrons.com (Postfix) with ESMTPSA id 64D0A828 for ; Tue, 19 Mar 2013 20:30:13 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 19 Mar 2013 20:29:35 +0100 Message-Id: <1363721394-14973-3-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363721394-14973-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1363721394-14973-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH v4 02/21] qt5base: add eglfs graphics backend X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/Config.in | 11 ++++++- ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 9 ++++-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 801ef6f..0af5df6 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -59,7 +59,8 @@ config BR2_PACKAGE_QT5BASE_GUI # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ !BR2_PACKAGE_QT5BASE_DIRECTFB && \ - !BR2_PACKAGE_QT5BASE_XCB + !BR2_PACKAGE_QT5BASE_XCB && \ + !BR2_PACKAGE_QT5BASE_EGLFS help This option enables the Qt5Gui library. @@ -89,6 +90,14 @@ config BR2_PACKAGE_QT5BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT5BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_OPENGL_EGL + depends on BR2_PACKAGE_HAS_OPENGL_ES + +comment "eglfs backend available if OpenGLES and EGL are enabled" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES + config BR2_PACKAGE_QT5BASE_PRINTSUPPORT bool "print support module" select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch new file mode 100644 index 0000000..a85a5aa --- /dev/null +++ b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch @@ -0,0 +1,32 @@ +From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 13 Jan 2013 14:36:48 +0100 +Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include + paths + +The eglconvenience code includes . Therefore, it should get +the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, +otherwise the build might if the EGL library has its headers in +special locations. In order to achieve this, we simply add the "egl" +feature to the list of features imported by eglconvenience. + +Signed-off-by: Thomas Petazzoni +--- + .../eglconvenience/eglconvenience.pri | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri +index 188eb1c..8996cea 100644 +--- a/src/platformsupport/eglconvenience/eglconvenience.pri ++++ b/src/platformsupport/eglconvenience/eglconvenience.pri +@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) { + SOURCES += \ + $$PWD/qeglconvenience.cpp \ + $$PWD/qeglplatformcontext.cpp ++ CONFIG += egl + + contains(QT_CONFIG,xlib) { + HEADERS += \ +-- +1.7.9.5 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 736965d..700bc67 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -20,9 +20,7 @@ QT5BASE_INSTALL_STAGING = YES # want to use the one packaged in Buildroot QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-eglfs \ -no-kms \ - -no-opengl \ -no-glib \ -no-cups \ -no-nis \ @@ -81,6 +79,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-xcb endif +ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) +QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs +QT5BASE_DEPENDENCIES += libgles libegl +else +QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs +endif + QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)