Patchwork [meta-fsl-arm,RFC,1/4] qt5: add mx5 and mx6 support

login
register
mail settings
Submitter Eric BENARD
Date May 28, 2013, 12:02 a.m.
Message ID <1369699372-1398-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/50591/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Eric BENARD - May 28, 2013, 12:02 a.m.
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6Q

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 conf/layer.conf                                |    2 +
 recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp |  105 ++++++++++++++++++++++++
 recipes-qt/qt5/qtbase_5.0.2.bbappend           |   68 +++++++++++++++
 3 files changed, 175 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
 create mode 100644 recipes-qt/qt5/qtbase_5.0.2.bbappend
Eric BENARD - May 28, 2013, 12:08 a.m.
Hi,

Le Tue, 28 May 2013 02:02:49 +0200,
Eric Bénard <eric@eukrea.com> a écrit :
> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
> - tested on i.MX51, i.MX53 and i.MX6Q
> 
note that his patch was tested with the following in meta-qt5 :
cherry-pick e7a477a
apply the 8 patches on this serie :
http://lists.openembedded.org/pipermail/openembedded-devel/2013-May/090861.html

and set default to use version 5.0.2 (check
conf/distro/include/qt5-versions.inc or hack
recipes-qt/qt5/qt5-5.0.2.inc).

Only eglfs and minimalegl backend were tested (no X11 support was
tested at the moment).

Eric
Otavio Salvador - May 28, 2013, 1:29 p.m.
On Mon, May 27, 2013 at 9:02 PM, Eric Bénard <eric@eukrea.com> wrote:

> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
> - tested on i.MX51, i.MX53 and i.MX6Q
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
>

I like the idea of it dynamically extend the parsed recipes so users don't
need to handle it byhand.
Eric BENARD - May 28, 2013, 1:38 p.m.
Le Tue, 28 May 2013 10:29:51 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Mon, May 27, 2013 at 9:02 PM, Eric Bénard <eric@eukrea.com> wrote:
> 
> > - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
> > - tested on i.MX51, i.MX53 and i.MX6Q
> >
> > Signed-off-by: Eric Bénard <eric@eukrea.com>
> >
> 
> I like the idea of it dynamically extend the parsed recipes so users don't
> need to handle it byhand.
> 
you can send yourself flowers as that's your idea ;-) That took me quite
some time to find the right way on how to make this idea real ;-)

Eric
Chris Larson - May 30, 2013, 3:26 p.m.
On Tue, May 28, 2013 at 6:29 AM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Mon, May 27, 2013 at 9:02 PM, Eric Bénard <eric@eukrea.com> wrote:
>
>> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
>> - tested on i.MX51, i.MX53 and i.MX6Q
>>
>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>>
>
> I like the idea of it dynamically extend the parsed recipes so users don't
> need to handle it byhand.
>

It is quite helpful for this sort of case, either a bsp layer appending to
optional layer content, or a common layer appending to bsp layer content,
we do something similar for the mentor layer —
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
but this one doesn't hardcode a particular layer.
Erik Botö - May 31, 2013, 6:53 a.m.
On Thu, May 30, 2013 at 5:26 PM, Chris Larson <clarson@kergoth.com> wrote:
>
> It is quite helpful for this sort of case, either a bsp layer appending to
> optional layer content, or a common layer appending to bsp layer content, we
> do something similar for the mentor layer —
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
> but this one doesn't hardcode a particular layer.

That's a really neat solution, thanks for the hint!

-- Erik

> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>
Otavio Salvador - May 31, 2013, 12:37 p.m.
On Thu, May 30, 2013 at 12:26 PM, Chris Larson <clarson@kergoth.com> wrote:

>
> On Tue, May 28, 2013 at 6:29 AM, Otavio Salvador <otavio@ossystems.com.br>wrote:
>
>> On Mon, May 27, 2013 at 9:02 PM, Eric Bénard <eric@eukrea.com> wrote:
>>
>>> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
>>> - tested on i.MX51, i.MX53 and i.MX6Q
>>>
>>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>>>
>>
>> I like the idea of it dynamically extend the parsed recipes so users
>> don't need to handle it byhand.
>>
>
> It is quite helpful for this sort of case, either a bsp layer appending to
> optional layer content, or a common layer appending to bsp layer content,
> we do something similar for the mentor layer —
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
> but this one doesn't hardcode a particular layer.
>

So you have 'qt5' for it to be enabled when meta-qt5 is added, right?
Chris Larson - May 31, 2013, 1:27 p.m.
On Fri, May 31, 2013 at 5:37 AM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Thu, May 30, 2013 at 12:26 PM, Chris Larson <clarson@kergoth.com>wrote:
>
>>
>> On Tue, May 28, 2013 at 6:29 AM, Otavio Salvador <otavio@ossystems.com.br
>> > wrote:
>>
>>> On Mon, May 27, 2013 at 9:02 PM, Eric Bénard <eric@eukrea.com> wrote:
>>>
>>>> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
>>>> - tested on i.MX51, i.MX53 and i.MX6Q
>>>>
>>>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>>>>
>>>
>>> I like the idea of it dynamically extend the parsed recipes so users
>>> don't need to handle it byhand.
>>>
>>
>> It is quite helpful for this sort of case, either a bsp layer appending
>> to optional layer content, or a common layer appending to bsp layer
>> content, we do something similar for the mentor layer —
>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
>> but this one doesn't hardcode a particular layer.
>>
>
> So you have 'qt5' for it to be enabled when meta-qt5 is added, right?
>

Yeah, that's the one downside to that generic approach, using the name from
BBFILE_COLLECTIONS directly also means we end up with directories like
'openembedded-layer' in our layer :)

Patch

diff --git a/conf/layer.conf b/conf/layer.conf
index c4b9cd1..2bdff7c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -4,6 +4,8 @@  BBPATH .= ":${LAYERDIR}"
 # We have a packages directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBMASK_append = "${@base_contains('BBFILE_COLLECTIONS', 'qt5-layer', '' ,\
+           ' meta-fsl-arm/recipes-qt/qt5/*.bb meta-fsl-arm/recipes-qt/qt5/*.bbappend', d)}"
 
 BBFILE_COLLECTIONS += "fsl-arm"
 BBFILE_PATTERN_fsl-arm := "^${LAYERDIR}/"
diff --git a/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp b/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
new file mode 100644
index 0000000..43e6d8d
--- /dev/null
+++ b/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 <fcntl.h>    /* For O_RDWR */
+#include <unistd.h>   /* For open(), creat() */
+#include "qeglfshooks.h"
+#include <EGL/egl.h>
+#include <linux/fb.h>
+#include <sys/ioctl.h>
+
+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/recipes-qt/qt5/qtbase_5.0.2.bbappend b/recipes-qt/qt5/qtbase_5.0.2.bbappend
new file mode 100644
index 0000000..00a8819
--- /dev/null
+++ b/recipes-qt/qt5/qtbase_5.0.2.bbappend
@@ -0,0 +1,68 @@ 
+# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
+
+GL_DEPENDS_mx6 = "virtual/libgles2 virtual/egl"
+QT_GLFLAGS_mx6 = "-opengl es2 -eglfs"
+QT_EXAMPLES_mx6 = "-make examples"
+QT_DEMOS_mx6 = "-make demos"
+
+GL_DEPENDS_mx5 = "virtual/libgles2 virtual/egl"
+QT_GLFLAGS_mx5 = "-opengl es2 -eglfs"
+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() {
+# 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 <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
+IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_EGL += \$\$IMX6_CFLAGS
+load(qt_config)
+
+EOF
+
+# copy the hook in the mkspecs directory OE is using
+cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
+}
+
+do_configure_prepend_mx5() {
+# 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 <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx5.cpp
+IMX5_CFLAGS             = -D_LINUX
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_EGL += \$\$IMX5_CFLAGS
+load(qt_config)
+
+EOF
+
+cp ${WORKDIR}/qeglfshooks_imx5.cpp ${S}/mkspecs/linux-oe-g++/
+}