[meta-freescale] [PATCH] qtbase: Remove upstream applied patch

[Fabio Berton]

This patch was applied on qtbase commit:

commit 9ae028f507a22bd03c861e9d14c2efc4aa2efeda
Author: Marco Martin 
Date:   Fri Feb 10 15:00:23 2017 +0100

Environment variable enabling the workaround FBO readback bug

On some ARM devices the font glyph generation is broken
Add an environment variable to enable workaround_brokenFBOReadBack
in QOpenGLContext, to fix font rendering on such devices as
Mali and Adreno

Change-Id: I9cc99ecb8b71a35bc369ec9dd11b877016b1179e
Reviewed-by: Laszlo Agocs 

Change-Id: I0aec7ed2941b22aa2a0ea7638a5523a25c47fbd1
Signed-off-by: Fabio Berton 
---
 ...-variable-enabling-the-workaround-FBO-rea.patch | 134 -
 .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend |   1 -
 2 files changed, 135 deletions(-)
 delete mode 100644 
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/Environment-variable-enabling-the-workaround-FBO-rea.patch

diff --git 
a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/Environment-variable-enabling-the-workaround-FBO-rea.patch
 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/Environment-variable-enabling-the-workaround-FBO-rea.patch
deleted file mode 100644
index a056c8ed..
--- 
a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/Environment-variable-enabling-the-workaround-FBO-rea.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 068c13d7f561f3bd88facb14093cdc88fe1b50f2 Mon Sep 17 00:00:00 2001
-From: Marco Martin 
-Date: Fri, 10 Feb 2017 15:00:23 +0100
-Subject: [PATCH] Environment variable enabling the workaround FBO readback bug
-Organization: O.S. Systems Software LTDA.
-
-On some ARM devices the font glyph generation is broken
-Add an environment variable to enable workaround_brokenFBOReadBack
-in QOpenGLContext, to fix font rendering on such devices as
-Mali and Adreno
-
-Change-Id: I9cc99ecb8b71a35bc369ec9dd11b877016b1179e

- src/gui/kernel/qopenglcontext.cpp  | 34 ++
- .../android/qandroidplatformopenglcontext.cpp  | 31 
- .../android/qandroidplatformopenglcontext.h|  1 -
- 3 files changed, 34 insertions(+), 32 deletions(-)
-
-diff --git a/src/gui/kernel/qopenglcontext.cpp 
b/src/gui/kernel/qopenglcontext.cpp
-index 0f7bbfd2e1..2b0b1f7ff1 100644
 a/src/gui/kernel/qopenglcontext.cpp
-+++ b/src/gui/kernel/qopenglcontext.cpp
-@@ -951,6 +951,7 @@ GLuint QOpenGLContext::defaultFramebufferObject() const
- bool QOpenGLContext::makeCurrent(QSurface *surface)
- {
- Q_D(QOpenGLContext);
-+
- if (!isValid())
- return false;
- 
-@@ -972,6 +973,39 @@ bool QOpenGLContext::makeCurrent(QSurface *surface)
- QOpenGLContext *previous = QOpenGLContextPrivate::setCurrentContext(this);
- 
- if (d->platformGLContext->makeCurrent(surface->surfaceHandle())) {
-+static bool needsWorkaroundSet = false;
-+static bool needsWorkaround = false;
-+
-+if (!needsWorkaroundSet) {
-+#ifdef Q_OS_ANDROID
-+const QByteArray env = 
qgetenv("QT_ANDROID_DISABLE_GLYPH_CACHE_WORKAROUND");
-+needsWorkaround = env.isEmpty() || env == "0" || env == "false";
-+#endif
-+QByteArray env = qgetenv("QT_ENABLE_GLYPH_CACHE_WORKAROUND");
-+if (env == "1" || env == "true")
-+needsWorkaround = true;
-+
-+if (!needsWorkaround) {
-+const char *rendererString = reinterpret_cast(glGetString(GL_RENDERER));
-+if (rendererString)
-+needsWorkaround =
-+qstrncmp(rendererString, "Mali-4xx", 6) == 0 // 
Mali-400, Mali-450
-+|| qstrncmp(rendererString, "Adreno (TM) 2xx", 
13) == 0 // Adreno 200, 203, 205
-+|| qstrncmp(rendererString, "Adreno 2xx", 8) == 0 
// Same as above but without the '(TM)'
-+|| qstrncmp(rendererString, "Adreno (TM) 30x", 
14) == 0 // Adreno 302, 305
-+|| qstrncmp(rendererString, "Adreno 30x", 9) == 0 
// Same as above but without the '(TM)'
-+|| qstrncmp(rendererString, "Adreno (TM) 4xx", 
13) == 0 // Adreno 405, 418, 420, 430
-+|| qstrncmp(rendererString, "Adreno 4xx", 8) == 0 
// Same as above but without the '(TM)'
-+|| qstrcmp(rendererString, "GC800 core") == 0
-+|| qstrcmp(rendererString, "GC1000 core") == 0
-+|| qstrcmp(rendererString, "Immersion.16") == 0;
-+}
-+needsWorkaroundSet = true;
-+}
-+
-+if (needsWorkaround)
-+d->workaround_brokenFBOReadBack = true;
-+
- d->surface = surface;
- 
- d->shareGroup->d_func()->deletePendingResources(this);
-diff --git a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp 

Re: [meta-freescale] [PATCH] kernel-itbimage: depends extraimage task to fix EXTRA_IMAGEDEPEND license issue

[C.r. Guo]

Hello all,
please ignore it .

There is a patch merged in upstream Yocto 3 days ago.
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=stable/rocko-next=3e1bc75af4c94fe150f70e8334408cf16007aa7b

Thanks
Chunrong


-Original Message-
From: Chunrong Guo [mailto:b40...@freescale.com] 
Sent: Monday, December 04, 2017 6:02 PM
To: meta-freescale@yoctoproject.org
Cc: Zhenhua Luo ; C.r. Guo 
Subject: [PATCH] kernel-itbimage: depends extraimage task to fix 
EXTRA_IMAGEDEPEND license issue

From: Chunrong Guo 

*Fix the build error:
|[Errno 2] No such file or directory: '.../licenses/ppa/recipeinfo'

Signed-off-by: Chunrong Guo 
---
 classes/kernel-itbimage.bbclass | 8 
 1 file changed, 8 insertions(+)

diff --git a/classes/kernel-itbimage.bbclass b/classes/kernel-itbimage.bbclass 
index bb838ef..448e2a6 100644
--- a/classes/kernel-itbimage.bbclass
+++ b/classes/kernel-itbimage.bbclass
@@ -22,6 +22,14 @@ python __anonymous () {
 image = d.getVar('INITRAMFS_IMAGE')
 if image:
 d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' 
${INITRAMFS_IMAGE}:do_image_complete')
+def extraimage_getdepends(task):
+deps = ""
+for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split():
+deps += " %s:%s" % (dep, task)
+return deps
+
+d.appendVarFlag('do_image', 'depends', 
extraimage_getdepends('do_populate_lic'))
+d.appendVarFlag('do_image_complete', 'depends', 
+ extraimage_getdepends('do_populate_sysroot'))
 
 # Verified boot will sign the fitImage and append the public key to
 # U-Boot dtb. We ensure the U-Boot dtb is deployed before assembling
--
1.9.0

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [meta-freescale] [PATCH] u-boot-fslc: Upgrade to 2017.11-based fork

[Richard Röjfors]

Hi Otavio,

On Tue, Dec 5, 2017 at 12:39 PM, Otavio Salvador
 wrote:
> Hello Richard,
>
> On Tue, Dec 5, 2017 at 7:13 AM, Richard Röjfors
>  wrote:
>> On Tue, Nov 28, 2017 at 8:13 PM, Otavio Salvador
>>  wrote:
>>>
>>>
>>>  ...oot-fslc-fw-utils_2017.09.bb => u-boot-fslc-fw-utils_2017.11.bb} | 0
>>
>> Why do you do such change on the rocko branch? Doesn't it break the
>> idea of the "fairly" stable release branches?
>
> In fact, it was planned before. I was keeping the 2017.11 branch under
> test until the formal release and this is going to receive just bug
> fixes from now on.
>
> Until yesterday (due rocko stable update), many machines from
> meta-freescale were failing to build so I was not considering it
> "stable". Did you find any regression?

We use another layer which appends on the now removed u-boot version,
so that layer is broken.
I didn't expect such things to happen when branched off to a release
branch...:-/

Thanks,
--Richard
-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [PATCH v2 1/4] qtbase: Correct eglfs configuration in wayland backend

[Yuqing Zhu]

-eglfs is conditioned on GPU3D with FrameBuffer only

Signed-off-by: Yuqing Zhu 
---
 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index a0bb301..8277d52 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -21,8 +21,11 @@ PACKAGECONFIG_GL_imxgpu3d = "gles2"
 PACKAGECONFIG_GL_use-mainline-bsp  = "gles2 kms"
 
 QT_CONFIG_FLAGS_APPEND = ""
-QT_CONFIG_FLAGS_APPEND_imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 
'x11', '-no-eglfs', '-eglfs', d)}"
+QT_CONFIG_FLAGS_APPEND_imxpxp = "-no-eglfs"
 QT_CONFIG_FLAGS_APPEND_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 
'x11', '-no-eglfs', '-no-opengl -linuxfb -no-eglfs', d)}"
-QT_CONFIG_FLAGS_APPEND_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 
'x11', '-no-eglfs', '-eglfs', d)}"
+QT_CONFIG_FLAGS_APPEND_imxgpu3d = "\
+${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', \
+bb.utils.contains('DISTRO_FEATURES', 'wayland', '-no-eglfs', \
+'-eglfs', d), d)}"
 QT_CONFIG_FLAGS_APPEND_use-mainline-bsp =  
"${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}"
 QT_CONFIG_FLAGS_append = " ${QT_CONFIG_FLAGS_APPEND}"
-- 
1.9.1

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [meta-freescale] [PATCH] u-boot-fslc: Upgrade to 2017.11-based fork

[Otavio Salvador]

Hello Richard,

On Tue, Dec 5, 2017 at 7:13 AM, Richard Röjfors
 wrote:
> On Tue, Nov 28, 2017 at 8:13 PM, Otavio Salvador
>  wrote:
>>
>>
>>  ...oot-fslc-fw-utils_2017.09.bb => u-boot-fslc-fw-utils_2017.11.bb} | 0
>
> Why do you do such change on the rocko branch? Doesn't it break the
> idea of the "fairly" stable release branches?

In fact, it was planned before. I was keeping the 2017.11 branch under
test until the formal release and this is going to receive just bug
fixes from now on.

Until yesterday (due rocko stable update), many machines from
meta-freescale were failing to build so I was not considering it
"stable". Did you find any regression?

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [PATCH v2 0/4] QT Wayland bug fixes for L4.9.11-1.0.0 BSP Release

[Yuqing Zhu]

-Correct PACKAGECONFIG eglfs setting.
-Remove unsupported feature "xcomposite-egl xcomposite-glx" in qtwayland.
-Fix waylandeglclientbufferintegration build errors in qtwayland.
-Fix xkb build errors in qtwayland.

Yuqing Zhu (4):
  qtbase: Correct eglfs configuration in wayland backend
  qtwayland: Remove unsupported feature
  qtwayland: Fix waylandeglclientbufferintegration build error
  qtbase: Enable xkbcommon-evdev for wayland

 .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 10 +--
 pri-Fix-waylandeglclientbufferintegratio.patch | 34 ++
 .../qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend  |  5 
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 
dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
 create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend

-- 
1.9.1

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [PATCH v2 3/4] qtwayland: Fix waylandeglclientbufferintegration build error

[Yuqing Zhu]

Fix the following error:
-Compiling waylandeglclientbufferintegration.cpp ..
 The included file: eglplatform.h: fatal error: X11/Xlib.h: No such file
 Some EGL CFLAGS are missing.
 Add egl to do pkg config to gain "-DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM"

Signed-off-by: Yuqing Zhu 
---
 pri-Fix-waylandeglclientbufferintegratio.patch | 34 ++
 .../qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend  |  3 ++
 2 files changed, 37 insertions(+)
 create mode 100644 
dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch

diff --git 
a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
new file mode 100644
index 000..78016a4
--- /dev/null
+++ 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
@@ -0,0 +1,34 @@
+From 456fb82378ec975413c30572fcfe7d3981e67c37 Mon Sep 17 00:00:00 2001
+From: Yuqing Zhu 
+Date: Wed, 27 Sep 2017 01:37:53 +0800
+Subject: [PATCH] wayland-egl.pri: Fix waylandeglclientbufferintegration
+ compiling error [YOCIMX-1785]
+
+With wayland backend build, there is a build break.
+
+In included file: eglplatform.h: fatal error: X11/Xlib.h: No such file
+
+The EGL CFLAGS are missing, which should be gained when doing pkg config.
+
+Add egl into QMAKE_USE_PRIVATE to gain -DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM.
+
+Signed-off-by: Yuqing Zhu 
+---
+ src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri 
b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+index df3aead..e20c680 100644
+--- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
 b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+@@ -1,6 +1,6 @@
+ INCLUDEPATH += $$PWD
+
+-QMAKE_USE_PRIVATE += wayland-server wayland-egl
++QMAKE_USE_PRIVATE += egl wayland-server wayland-egl
+
+ QT += egl_support-private
+
+--
+2.7.4
+
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index 69b330f..7193106 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -1,2 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 
'file://0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch', '', 
d)}"
+
 PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx"
 PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx"
-- 
1.9.1

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [PATCH v2 2/4] qtwayland: Remove unsupported feature

[Yuqing Zhu]

Signed-off-by: Yuqing Zhu 
---
 dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
new file mode 100644
index 000..69b330f
--- /dev/null
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -0,0 +1,2 @@
+PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx"
-- 
1.9.1

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [PATCH v2 4/4] qtbase: Enable xkbcommon-evdev for wayland

[Yuqing Zhu]

Met some 'undefined reference to xkb' error in wayland build.
Need to enable xkbcommon-evdev for wayland.

Signed-off-by: Yuqing Zhu 
---
 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend 
b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 8277d52..d344efd 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -29,3 +29,6 @@ QT_CONFIG_FLAGS_APPEND_imxgpu3d = "\
 '-eglfs', d), d)}"
 QT_CONFIG_FLAGS_APPEND_use-mainline-bsp =  
"${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}"
 QT_CONFIG_FLAGS_append = " ${QT_CONFIG_FLAGS_APPEND}"
+
+PACKAGECONFIG_WAYLAND ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 
'xkbcommon-evdev', '', d)}"
+PACKAGECONFIG += "${PACKAGECONFIG_WAYLAND}"
-- 
1.9.1

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [meta-freescale] [PATCH] u-boot-fslc: Upgrade to 2017.11-based fork

[Richard Röjfors]

On Tue, Nov 28, 2017 at 8:13 PM, Otavio Salvador
 wrote:
>
>
>  ...oot-fslc-fw-utils_2017.09.bb => u-boot-fslc-fw-utils_2017.11.bb} | 0

Why do you do such change on the rocko branch? Doesn't it break the
idea of the "fairly" stable release branches?

Thanks,
--Richard
-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale