From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id A2AC1E01516 for ; Mon, 10 Jun 2013 06:35:20 -0700 (PDT) Received: from servor.local.eukrea.com (unknown [82.240.38.71]) by smtp2-g21.free.fr (Postfix) with ESMTP id 58AE44B00CA for ; Mon, 10 Jun 2013 15:35:15 +0200 (CEST) From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: meta-freescale@yoctoproject.org Date: Mon, 10 Jun 2013 15:35:07 +0200 Message-Id: <1370871307-27783-1-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.11.2.249.g31c7954 In-Reply-To: <20130610151853.7c658ffc@e6520eb> References: <20130610151853.7c658ffc@e6520eb> MIME-Version: 1.0 Subject: [meta-fsl-arm][PATCH v7] qt5: add mx5 and mx6 support X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 13:35:22 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6 - tested on i.MX51, i.MX53 and i.MX6Q - X11 support is not yet tested so we don't change the core settings when x11 is in DISTRO_FEATURES Signed-off-by: Eric Bénard --- v7: don't change the core configuration when x11 is in DISTRO_FEATURES .../recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp | 105 +++++++++++++++++++++ qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend | 74 +++++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend diff --git a/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp b/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp new file mode 100644 index 0000000..43e6d8d --- /dev/null +++ b/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** hacked by Eric Bénard - Eukréa Electromatique +** inspired from https://community.freescale.com/docs/DOC-94123 +** and from fbset.c http://users.telenet.be/geertu/Linux/fbdev/ +** +** based on qeglfshooks_imx6.cpp which is : +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include /* For O_RDWR */ +#include /* For open(), creat() */ +#include "qeglfshooks.h" +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QEglFSImx5Hooks : public QEglFSHooks +{ +public: + QEglFSImx5Hooks(); + virtual QSize screenSize() const; + virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format); + virtual void destroyNativeWindow(EGLNativeWindowType window); + +private: + QSize mScreenSize; + EGLNativeDisplayType mNativeDisplay; +}; + + +QEglFSImx5Hooks::QEglFSImx5Hooks() +{ + int width, height; + /* code taken from fbset.c */ + int fh; + struct fb_var_screeninfo var; + fh = open("/dev/fb0", O_RDONLY); + ioctl(fh, FBIOGET_VSCREENINFO, &var); + mScreenSize.setHeight(var.yres); + mScreenSize.setWidth(var.xres); + close(fh); + mNativeDisplay = EGL_DEFAULT_DISPLAY; +} + +QSize QEglFSImx5Hooks::screenSize() const +{ + return mScreenSize; +} + +EGLNativeWindowType QEglFSImx5Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) +{ + Q_UNUSED(format); + + EGLNativeWindowType eglWindow = open("/dev/fb0", O_RDWR); + return eglWindow; +} + + +void QEglFSImx5Hooks::destroyNativeWindow(EGLNativeWindowType window) +{ + close(window); +} + +QEglFSImx5Hooks eglFSImx5Hooks; +QEglFSHooks *platformHooks = &eglFSImx5Hooks; + +QT_END_NAMESPACE diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend new file mode 100644 index 0000000..33f0e8b --- /dev/null +++ b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend @@ -0,0 +1,74 @@ +# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique + +HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}" + +GL_DEPENDS_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/libgles2 virtual/egl', d)}" +QT_GLFLAGS_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '', '-opengl es2 -eglfs', d)}" +QT_EXAMPLES_mx6 = "-make examples" +QT_DEMOS_mx6 = "-make demos" + +GL_DEPENDS_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/libgles2 virtual/egl', d)}" +QT_GLFLAGS_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', '', '-opengl es2 -eglfs', d)}" +QT_EXAMPLES_mx5 = "-make examples" +QT_DEMOS_mx5 = "-make demos" + +TSLIB_DEPENDS_mx6 = "tslib" +QT_TSLIB_mx6 = "-tslib" + +TSLIB_DEPENDS_mx5 = "tslib" +QT_TSLIB_mx5 = "-tslib" + +PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" +PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" + +FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:" +SRC_URI_append_mx5 += " \ + file://qeglfshooks_imx5.cpp \ + " + +do_configure_prepend_mx6() { + if test ${HAS_X11} -eq 0; then +# adapt qmake.conf to our needs +sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf +cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <