[meta-raspberrypi][PATCH] qt5: fixed raspberrypi support

[meta-raspberrypi][PATCH] qt5: fixed raspberrypi support

[John Madieu]

Because EGL properties were not defined properly, we always had the following error
     make: *** [egl] Error 1
    | EGL disabled.
    |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
    |  You might need to modify the include and library search paths by editing QMAKE_INCDIR

    This bbappend definitively fix the bug

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 recipes-qt/qt5/qtbase_%.bbappend | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase_%.bbappend

diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
new file mode 100644
index 0000000..ac158a9
--- /dev/null
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,34 @@
+
+do_configure_prepend_rpi() {
+	
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} 
+QMAKE_LIBS_EGL = -lEGL -lGLESv2 
+EOF
+
+        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm
+EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+EOF
+        fi
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+
+
+load(qt_config)
+
+EOF
+}
+
+
+
+
+
-- 
1.9.1

Re: [meta-raspberrypi][PATCH] qt5: fixed raspberrypi support

[Andrei Gherzan]

Hi John,

On Thu, Jan 07, 2016 at 01:44:55AM +0100, John Madieu wrote:
> Because EGL properties were not defined properly, we always had the following error
>      make: *** [egl] Error 1
>     | EGL disabled.
>     |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
>     |  You might need to modify the include and library search paths by editing QMAKE_INCDIR
>
>     This bbappend definitively fix the bug
>
> Signed-off-by: John Madieu <j.madieu@expemb.com>
> ---

We had a similar patch before but this would mean adding a new dependency on a
new layer, right? I'm fine with this patch as long as it will include a similar
mechanism to what meta-fsl-arm does: add specific bb/bbappends based on the
included layers so we don't force every user from now on to add the qt5 layer.
Does it make sense? Can you add patches for this as I can merge them together?

Thanks,
--
Andrei Gherzan

[meta-raspberrypi][PATCH 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>

cleanned qtbase.bbappend

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf                            |  4 ++++
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++
 recipes-qt/qt5/qtbase_%.bbappend           | 34 ------------------------------
 3 files changed, 33 insertions(+), 34 deletions(-)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
 delete mode 100644 recipes-qt/qt5/qtbase_%.bbappend

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..6346459 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends
+# which are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
new file mode 100644
index 0000000..8b77bfa
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,29 @@
+
+do_configure_prepend_rpi() {
+
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
+QMAKE_LIBS_EGL = -lEGL -lGLESv2
+EOF
+
+        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm
+EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+EOF
+        fi
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+
+
+load(qt_config)
+
+EOF
+}
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
deleted file mode 100644
index ac158a9..0000000
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
-
-do_configure_prepend_rpi() {
-	
-	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
-    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
-        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
-QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} 
-QMAKE_LIBS_EGL = -lEGL -lGLESv2 
-EOF
-
-        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
-            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-EGLFS_DEVICE_INTEGRATION = eglfs_brcm
-EOF
-        else
-            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
-EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
-EOF
-        fi
-    fi
-    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-
-
-load(qt_config)
-
-EOF
-}
-
-
-
-
-
-- 
1.9.1

Re: [meta-raspberrypi][PATCH 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

Hi,

On Mon, Jan 11, 2016 at 3:01 AM, John Madieu <j.madieu@expemb.com> wrote:

> Signed-off-by: John Madieu <j.madieu@expemb.com>
>
> cleanned qtbase.bbappend
>
> Signed-off-by: John Madieu <j.madieu@expemb.com>
> ---
>  conf/layer.conf                            |  4 ++++
>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++
>  recipes-qt/qt5/qtbase_%.bbappend           | 34
> ------------------------------
>

Can you clean this up and have two commits: one that adds the qt5 bbappend
and one which does the layer trick?

Thanks,
Andrei

[-- Attachment #2: Type: text/html, Size: 1181 bytes --]

[meta-raspberrypi][PATCH 2/4] qt5base: moved the bbappend to a suitable path

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 34 ++++++++++++++++++++++++++++++
 recipes-qt/qt5/qtbase_%.bbappend           | 34 ------------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
 delete mode 100644 recipes-qt/qt5/qtbase_%.bbappend

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
new file mode 100644
index 0000000..ac158a9
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,34 @@
+
+do_configure_prepend_rpi() {
+	
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} 
+QMAKE_LIBS_EGL = -lEGL -lGLESv2 
+EOF
+
+        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm
+EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+EOF
+        fi
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+
+
+load(qt_config)
+
+EOF
+}
+
+
+
+
+
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
deleted file mode 100644
index ac158a9..0000000
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
-
-do_configure_prepend_rpi() {
-	
-	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
-    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
-        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
-QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} 
-QMAKE_LIBS_EGL = -lEGL -lGLESv2 
-EOF
-
-        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
-            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-EGLFS_DEVICE_INTEGRATION = eglfs_brcm
-EOF
-        else
-            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
-EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
-EOF
-        fi
-    fi
-    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-
-
-load(qt_config)
-
-EOF
-}
-
-
-
-
-
-- 
1.9.1

[meta-raspberrypi][PATCH 3/4] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1

[meta-raspberrypi][PATCH 4/4] qtbase bbappend: cleanned recipe

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index ac158a9..8b77bfa 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,12 +1,12 @@
 
 do_configure_prepend_rpi() {
-	
+
 	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
     if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
         cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
-QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} 
-QMAKE_LIBS_EGL = -lEGL -lGLESv2 
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
+QMAKE_LIBS_EGL = -lEGL -lGLESv2
 EOF
 
         if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
@@ -27,8 +27,3 @@ load(qt_config)
 
 EOF
 }
-
-
-
-
-
-- 
1.9.1

Re: [meta-raspberrypi][PATCH 4/4] qtbase bbappend: cleanned recipe

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]

Hi John,

On Mon, Jan 11, 2016 at 3:55 AM, John Madieu <j.madieu@expemb.com> wrote:

> Signed-off-by: John Madieu <j.madieu@expemb.com>
> ---
>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> index ac158a9..8b77bfa 100644
> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> @@ -1,12 +1,12 @@
>
>
I can't follow these patches. Can you squash them to include cleanups and
so on and have clean patches sent? As well, can you send them tagged as v2
so I can easily see them?


>  do_configure_prepend_rpi() {
> -
> +
>         sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
>      if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
>          cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
>  QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads
> \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
> -QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
> -QMAKE_LIBS_EGL = -lEGL -lGLESv2
> +QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
> +QMAKE_LIBS_EGL = -lEGL -lGLESv2
>  EOF
>
>          if [ -d
> ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
> @@ -27,8 +27,3 @@ load(qt_config)
>
>  EOF
>  }
> -
> -
> -
> -
> -
> --
> 1.9.1
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>

[-- Attachment #2: Type: text/html, Size: 2461 bytes --]

Re: [meta-raspberrypi][PATCH 4/4] qtbase bbappend: cleanned recipe

[john madieu]

On Mon, Jan 11, 2016 at 2:49 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>
> Hi John,
Hello Andrei
>
> On Mon, Jan 11, 2016 at 3:55 AM, John Madieu <j.madieu@expemb.com> wrote:
>>
>> Signed-off-by: John Madieu <j.madieu@expemb.com>
>> ---
>>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 11 +++--------
>>  1 file changed, 3 insertions(+), 8 deletions(-)
>>
>> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> index ac158a9..8b77bfa 100644
>> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> @@ -1,12 +1,12 @@
>>
>
> I can't follow these patches. Can you squash them to include cleanups and so on and have clean patches sent? As well, can you send them tagged as v2 so I can easily see them?
Of course.
I will send you back all patches directly from the beginning, by
tagging them all v2

>
>>
>>  do_configure_prepend_rpi() {
>> -
>> +
>>         sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
>>      if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
>>          cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
>>  QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
>> -QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
>> -QMAKE_LIBS_EGL = -lEGL -lGLESv2
>> +QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
>> +QMAKE_LIBS_EGL = -lEGL -lGLESv2
>>  EOF
>>
>>          if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
>> @@ -27,8 +27,3 @@ load(qt_config)
>>
>>  EOF
>>  }
>> -
>> -
>> -
>> -
>> -
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>
>

-- 

John MADIEU |  j.madieu@expemb.com

[meta-raspberrypi][PATCH v2 1/2] qt5: fixed raspberrypi support

[John Madieu]

Because EGL properties were not defined properly, we always had the following error
    make: *** [egl] Error 1
    | EGL disabled.
    |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
    |  You might need to modify the include and library search paths by editing QMAKE_INCDIR

This bbappend definitively fix the bug

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
new file mode 100644
index 0000000..8b77bfa
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,29 @@
+
+do_configure_prepend_rpi() {
+
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
+QMAKE_LIBS_EGL = -lEGL -lGLESv2
+EOF
+
+        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm
+EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+EOF
+        fi
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+
+
+load(qt_config)
+
+EOF
+}
-- 
1.9.1

[meta-raspberrypi][PATCH v2 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1

Re: [meta-raspberrypi][PATCH 4/4] qtbase bbappend: cleanned recipe

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]

On Mon, Jan 11, 2016 at 3:21 PM, john madieu <j.madieu@expemb.com> wrote:

> On Mon, Jan 11, 2016 at 2:49 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> >
> > Hi John,
> Hello Andrei
> >
> > On Mon, Jan 11, 2016 at 3:55 AM, John Madieu <j.madieu@expemb.com>
> wrote:
> >>
> >> Signed-off-by: John Madieu <j.madieu@expemb.com>
> >> ---
> >>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 11 +++--------
> >>  1 file changed, 3 insertions(+), 8 deletions(-)
> >>
> >> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> >> index ac158a9..8b77bfa 100644
> >> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> >> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> >> @@ -1,12 +1,12 @@
> >>
> >
> > I can't follow these patches. Can you squash them to include cleanups
> and so on and have clean patches sent? As well, can you send them tagged as
> v2 so I can easily see them?
> Of course.
> I will send you back all patches directly from the beginning, by
> tagging them all v2
>
>
Brilliant. Thank you.

Andrei

[-- Attachment #2: Type: text/html, Size: 1843 bytes --]

[meta-raspberrypi][PATCH v2 1/2] qt5: fixed raspberrypi support

[John Madieu]

Because EGL properties were not defined properly, we always had the following error
    make: *** [egl] Error 1
    | EGL disabled.
    |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
    |  You might need to modify the include and library search paths by editing QMAKE_INCDIR

This bbappend definitively fix the bug

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
new file mode 100644
index 0000000..8b77bfa
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,29 @@
+
+do_configure_prepend_rpi() {
+
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
+QMAKE_LIBS_EGL = -lEGL -lGLESv2
+EOF
+
+        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm
+EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+EOF
+        fi
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+
+
+load(qt_config)
+
+EOF
+}
-- 
1.9.1

[meta-raspberrypi][PATCH v2 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1

Re: [meta-raspberrypi][PATCH v2 1/2] qt5: fixed raspberrypi support

[Andrei Gherzan]

On Mon, Jan 11, 2016 at 04:46:10PM +0100, John Madieu wrote:
> Because EGL properties were not defined properly, we always had the following error
>     make: *** [egl] Error 1
>     | EGL disabled.
>     |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
>     |  You might need to modify the include and library search paths by editing QMAKE_INCDIR
>
> This bbappend definitively fix the bug
>
> Signed-off-by: John Madieu <j.madieu@expemb.com>
> ---
>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
>  create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> new file mode 100644
> index 0000000..8b77bfa
> --- /dev/null
> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> @@ -0,0 +1,29 @@
> +
> +do_configure_prepend_rpi() {
> +
> +	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> +    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
> +        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
> +QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
> +QMAKE_LIBS_EGL = -lEGL -lGLESv2
> +EOF
> +
> +        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
> +            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +EGLFS_DEVICE_INTEGRATION = eglfs_brcm
> +EOF
> +        else
> +            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
> +EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
> +EOF
> +        fi
> +    fi
> +    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +
> +
> +load(qt_config)
> +
> +EOF
> +}

qtbase fails at compile time:

| compiling .moc/moc_qeglplatformcursor_p.cpp
|
/home/andrei/work/yocto/build-rpi-master/tmp/work/cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:
In member function 'virtual QRect
QGtkStyle::subControlRect(QStyle::ComplexControl, const QStyleOptionComplex*,
QStyle::SubControl, const QWidget*) const':
|
/home/andrei/work/yocto/build-rpi-master/tmp/work/cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:24:
error: 'isInstanceOf' is not a member of 'QStyleHelper'
|              } else if (QStyleHelper::isInstanceOf(groupBox->styleObject,
QAccessible::Grouping)) {
|                         ^
|
/home/andrei/work/yocto/build-rpi-master/tmp/work/cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:74:
error: 'QAccessible' has not been declared
|              } else if (QStyleHelper::isInstanceOf(groupBox->styleObject,
QAccessible::Grouping)) {
|                                                                           ^
| Makefile:53048: recipe for target '.obj/qgtkstyle.o' failed
| make[2]: *** [.obj/qgtkstyle.o] Error 1
| make[2]: *** Waiting for unfinished jobs....


How is this supposed to be tested?

--
Andrei Gherzan

Re: [meta-raspberrypi][PATCH v2 1/2] qt5: fixed raspberrypi support

[john madieu]

On Mon, Jan 11, 2016 at 9:34 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> On Mon, Jan 11, 2016 at 04:46:10PM +0100, John Madieu wrote:
>> Because EGL properties were not defined properly, we always had the following error
>>     make: *** [egl] Error 1
>>     | EGL disabled.
>>     |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
>>     |  You might need to modify the include and library search paths by editing QMAKE_INCDIR
>>
>> This bbappend definitively fix the bug
>>
>> Signed-off-by: John Madieu <j.madieu@expemb.com>
>> ---
>>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++++++
>>  1 file changed, 29 insertions(+)
>>  create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>>
>> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> new file mode 100644
>> index 0000000..8b77bfa
>> --- /dev/null
>> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
>> @@ -0,0 +1,29 @@
>> +
>> +do_configure_prepend_rpi() {
>> +
>> +     sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
>> +    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
>> +        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
>> +QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
>> +QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
>> +QMAKE_LIBS_EGL = -lEGL -lGLESv2
>> +EOF
>> +
>> +        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
>> +            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
>> +EGLFS_DEVICE_INTEGRATION = eglfs_brcm
>> +EOF
>> +        else
>> +            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
>> +EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
>> +EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
>> +EOF
>> +        fi
>> +    fi
>> +    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
>> +
>> +
>> +load(qt_config)
>> +
>> +EOF
>> +}
>

> qtbase fails at compile time:
Sorry for that

> | compiling .moc/moc_qeglplatformcursor_p.cpp
> |
> /home/andrei/work/yocto/build-rpi-master/tmp/work/cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:
> In member function 'virtual QRect
> QGtkStyle::subControlRect(QStyle::ComplexControl, const QStyleOptionComplex*,
> QStyle::SubControl, const QWidget*) const':
> |
> /home/andrei/work/yocto/build-rpi-master/tmp/work/cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:24:
> error: 'isInstanceOf' is not a member of 'QStyleHelper'
> |              } else if (QStyleHelper::isInstanceOf(groupBox->styleObject,
> QAccessible::Grouping)) {
> |                         ^
> |
> /home/andrei/work/yocto/build-rpi-master/tmp/work/cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:74:
> error: 'QAccessible' has not been declared
> |              } else if (QStyleHelper::isInstanceOf(groupBox->styleObject,
> QAccessible::Grouping)) {
> |                                                                           ^
> | Makefile:53048: recipe for target '.obj/qgtkstyle.o' failed
> | make[2]: *** [.obj/qgtkstyle.o] Error 1
> | make[2]: *** Waiting for unfinished jobs....
>
>
> How is this supposed to be tested?

I finaly reproduced the same error.

I did not have it because during my compilation, I removed "x11"
from DISTRO_FEATURES. If you look at qtbase_git.bb, you can see that
some of PACKAGECONFIG_X11 features (gtkstyle) depend on "-accessibility" flag.

so I added that flags according to the presence or not of x11 in DISTRO_FEATURES
I thus made several test with or without x11, in DISTRO_FEATURES .
All succeeded.

The last patch will be plug and play. I'll tag it v3 and everything
should works fine now.
But before, I still have some test to do (with mixed distro_features).
I will pay more attention this time.


> --
> Andrei Gherzan
-- 
John MADIEU | j.madieu@expemb.com |

[meta-raspberrypi][PATCH v3 1/2] qt5: fixed raspberrypi support

[John Madieu]

    Because EGL properties were not defined properly, we always had the following error
        make: *** [egl] Error 1
        | EGL disabled.
        |  The EGL functionality test failed; EGL is required by some QPA plugins to manage cont
        |  You might need to modify the include and library search paths by editing QMAKE_INCDIR

    x11 in DISTRO_FEATURES also produced the following error
        error: 'QAccessible' has not been declared
        |              } else if (QStyleHelper::isInstanceOf(groupBox->styleObject,
        QAccessible::Grouping)) {
        |                                                       ^
        |Makefile:53048: recipe for target '.obj/qgtkstyle.o' failed

    This bbappend definitively fix these bug

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 33 ++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
new file mode 100644
index 0000000..f61cd1d
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,33 @@
+
+# Raspberrypi only need gles2
+PACKAGECONFIG_GL = "gles2"
+
+QT_CONFIG_FLAGS_append = "${@base_contains('DISTRO_FEATURES', 'x11', ' -accessibility ', '', d)}"
+do_configure_prepend_rpi() {
+
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then
+        cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux
+QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL}
+QMAKE_LIBS_EGL = -lEGL -lGLESv2
+EOF
+
+        if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_DEVICE_INTEGRATION = eglfs_brcm
+EOF
+        else
+            cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+EOF
+        fi
+    fi
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+
+
+load(qt_config)
+
+EOF
+}
-- 
1.9.1

[meta-raspberrypi][PATCH v3 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1

[meta-raspberrypi][PATCH v3 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1

[meta-raspberrypi][PATCH v3 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1

[meta-raspberrypi][PATCH v3 2/2] layer.conf: avoid to force users to add the qt5 layer because of qtbase bbappend

[John Madieu]

Signed-off-by: John Madieu <j.madieu@expemb.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index bea5a65..60f1bcb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 
+# Let us add layer-specific (such as qt5-layer) bbappends which
+# are only applied when that layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1