[RFC][meta-qt5 0/3] qtwayland updates for hawaii

[RFC][meta-qt5 0/3] qtwayland updates for hawaii

[Andreas Müller]

I know building hawaii is some corner case but...

Update of qtwayland within 5.2.1 should be not a problem since qtwayland - as 
far as I know - has no official releases yet.

Andreas Müller (3):
  qtwayland: move to latest revision
  qtwayland-native: make qtwayland find qtwaylandscanner
  qtwayland: install created private headers

 recipes-qt/qt5/qtwayland-native_git.bb             |  5 ++
 ...0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch | 91 ----------------------
 recipes-qt/qt5/qtwayland_git.bb                    |  8 +-
 3 files changed, 11 insertions(+), 93 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch

-- 
1.8.3.1

[RFC][meta-qt5 1/3] qtwayland: move to latest revision

[Andreas Müller]

latest hawaii has moved to frame-sync support

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch | 91 ----------------------
 recipes-qt/qt5/qtwayland_git.bb                    |  3 +-
 2 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch

diff --git a/recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch b/recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch
deleted file mode 100644
index 2266f4c..0000000
--- a/recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From c5c23a37b230b426ed1eeea66544af438f48d05d Mon Sep 17 00:00:00 2001
-From: Taeyeon Mori <orochimarufan.x3@gmail.com>
-Date: Sun, 9 Feb 2014 23:43:06 +0100
-Subject: [PATCH] xcomposite-glx: Fix build on Qt 5.2.1
-
-* it was made private in
-  commit b6713ec4262c05f7d103bc3b75ab81aedc690853
-  Author: Jorgen Lind <jorgen.lind@digia.com>
-  Date:   Wed Dec 18 07:59:53 2013 +0100
-
-  Make classes in client private
-
-  and qwayland-xcomposite-glx wasn't adapted to it
-
-* found in
-  http;//oro.sodimm.me/~hinata/devel/.../0001-Fix-build-on-Qt-5.2.1.patch.htm
-  but because it was already gone, here is the cache:
-  http://webcache.googleusercontent.com/search?q=cache:5L0rSgqrKMoJ:oro.sodimm.me/~hinata/devel/qt5-wayland-git/0001-Fix-build-on-Qt-5.2.1.patch.htm&hl=en&gl=cz&strip=1
-
-Change-Id: I8eed3645ccacc43e2c9febba2bc6544c7068207a
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../compositor/xcomposite-glx/xcompositeglxintegration.cpp |  2 +-
- src/plugins/platforms/qwayland-xcomposite-glx/main.cpp     |  2 +-
- .../qwaylandxcompositeglxplatformintegration.h             | 14 ++++++++------
- 3 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
-index dce1fdc..8403c78 100644
---- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
-+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
-@@ -112,7 +112,7 @@ void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display
-     delete glContext;
- }
- 
--void XCompositeGLXClientBufferIntegration::updateTextureFromBuffer(struct ::wl_resource *buffer)
-+void XCompositeGLXClientBufferIntegration::bindTextureToBuffer(struct ::wl_resource *buffer)
- {
-     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
-     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());
-diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
-index 17b20f9..c9450a5 100644
---- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
-+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
-@@ -40,7 +40,7 @@
- ****************************************************************************/
- 
- #include <qpa/qplatformintegrationplugin.h>
--#include "qwaylandintegration.h"
-+#include "qwaylandxcompositeglxplatformintegration.h"
- 
- QT_BEGIN_NAMESPACE
- 
-diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
-index fe8c5b7..fb63fea 100644
---- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
-+++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
-@@ -42,7 +42,7 @@
- #ifndef QWAYLANDXCOMPOSITEGLXPLATFORMINTEGRATION_H
- #define QWAYLANDXCOMPOSITEGLXPLATFORMINTEGRATION_H
- 
--#include <QtWaylandClient/qwaylandintegration.h>
-+#include <QtWaylandClient/private/qwaylandintegration_p.h>
- 
- #include "qwaylandxcompositeglxintegration.h"
- 
-@@ -51,14 +51,16 @@ class QWaylandXCompositeGlxPlatformIntegration : public QWaylandIntegration
- public:
-     QWaylandXCompositeGlxPlatformIntegration()
-         : QWaylandIntegration()
--        , m_gl_integration(new QWaylandXCompositeGLXIntegration(display()))
--    { }
-+        , m_client_buffer_integration(new QWaylandXCompositeGLXIntegration())
-+    {
-+        m_client_buffer_integration->initialize(display());
-+    }
- 
--    QWaylandGLIntegration *glIntegration() const Q_DECL_OVERRIDE
--    { return m_gl_integration; }
-+    QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE
-+    { return m_client_buffer_integration; }
- 
- private:
--    QWaylandGLIntegration *m_gl_integration;
-+    QWaylandClientBufferIntegration *m_client_buffer_integration;
- };
- 
- #endif
--- 
-1.8.5.3
-
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 789a882..ebdda82 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -4,9 +4,8 @@ require ${PN}.inc
 # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
 
-SRCREV = "573d0ee5ba86d99095f217ea9e19172bfc5e75fd"
+SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
 
 SRC_URI += " \
-    file://0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch \
     file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
 "
-- 
1.8.3.1

[RFC][meta-qt5 2/3] qtwayland-native: make qtwayland find qtwaylandscanner

[Andreas Müller]

bindir/qt5 causes not building QtWaylandClient files.
See [1] for further explanation. This error was discoverd by building
hawaii-shell failing with:

| /home/superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlinputdevice_p.h:56:58: fatal error: QtCompositor/private/qwayland
|  #include <QtCompositor/private/qwayland-server-wayland.h>
|                                                           ^
| compilation terminated.

[1] https://qt.gitorious.org/qt/qtbase/commit/0e1ce36ae67de940b2d499ec7f23e520dce0f112

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-qt/qt5/qtwayland-native_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 988aa98..966ae55 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -5,3 +5,8 @@ require ${PN}.inc
 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
 
 SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
+
+# wayland-scanner and qtwaylandscanner must be in same path to work properly
+do_install_append() {
+	ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
+}
-- 
1.8.3.1

[RFC][meta-qt5 3/3] qtwayland: install created private headers

[Andreas Müller]

buildhistory diff:
--- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
+++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
@@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
 RPROVIDES =
 RDEPENDS = qtwayland
 RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
-PKGSIZE = 295533
+PKGSIZE = 537651
 FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
-FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
+FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-qt/qt5/qtwayland_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index ebdda82..8da8249 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
 SRC_URI += " \
     file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
 "
+
+do_install_append() {
+	# do install files created by qtwaylandscanner
+	install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
+}
-- 
1.8.3.1

Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Andreas Müller]

On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> buildhistory diff:
> --- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> +++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>  RPROVIDES =
>  RDEPENDS = qtwayland
>  RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
> -PKGSIZE = 295533
> +PKGSIZE = 537651
>  FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
> -FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
> +FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  recipes-qt/qt5/qtwayland_git.bb | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
> index ebdda82..8da8249 100644
> --- a/recipes-qt/qt5/qtwayland_git.bb
> +++ b/recipes-qt/qt5/qtwayland_git.bb
> @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>  SRC_URI += " \
>      file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>  "
> +
> +do_install_append() {
> +       # do install files created by qtwaylandscanner
> +       install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
Aargh: Wrong directory did test with /usr/include and expected
includedir = /usr/include -> V2 will follow

Andreas

Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Andreas Müller]

On Tue, May 13, 2014 at 2:17 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> buildhistory diff:
>> --- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> +++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>>  RPROVIDES =
>>  RDEPENDS = qtwayland
>>  RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
>> -PKGSIZE = 295533
>> +PKGSIZE = 537651
>>  FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
>> -FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
>> +FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  recipes-qt/qt5/qtwayland_git.bb | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
>> index ebdda82..8da8249 100644
>> --- a/recipes-qt/qt5/qtwayland_git.bb
>> +++ b/recipes-qt/qt5/qtwayland_git.bb
>> @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>>  SRC_URI += " \
>>      file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>>  "
>> +
>> +do_install_append() {
>> +       # do install files created by qtwaylandscanner
>> +       install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
> Aargh: Wrong directory did test with /usr/include and expected
> includedir = /usr/include -> V2 will follow
I should stop for today -> my error here was caused by updating QT
installing to 5.3.0 - patch should work - no V2 - sorry for the noise
>
> Andreas

Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Martin Jansa]

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

On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
> On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > buildhistory diff:
> > --- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > +++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
> >  RPROVIDES =
> >  RDEPENDS = qtwayland
> >  RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
> > -PKGSIZE = 295533
> > +PKGSIZE = 537651
> >  FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
> > -FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
> > +FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> > ---
> >  recipes-qt/qt5/qtwayland_git.bb | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
> > index ebdda82..8da8249 100644
> > --- a/recipes-qt/qt5/qtwayland_git.bb
> > +++ b/recipes-qt/qt5/qtwayland_git.bb
> > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
> >  SRC_URI += " \
> >      file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
> >  "
> > +
> > +do_install_append() {
> > +       # do install files created by qtwaylandscanner
> > +       install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
> Aargh: Wrong directory did test with /usr/include and expected
> includedir = /usr/include -> V2 will follow

fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
cherry-picking to master-next

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Andreas Müller]

On Tue, May 13, 2014 at 8:57 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
>> On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>> > buildhistory diff:
>> > --- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > +++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>> >  RPROVIDES =
>> >  RDEPENDS = qtwayland
>> >  RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
>> > -PKGSIZE = 295533
>> > +PKGSIZE = 537651
>> >  FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
>> > -FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
>> > +FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>> >
>> > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> > ---
>> >  recipes-qt/qt5/qtwayland_git.bb | 5 +++++
>> >  1 file changed, 5 insertions(+)
>> >
>> > diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
>> > index ebdda82..8da8249 100644
>> > --- a/recipes-qt/qt5/qtwayland_git.bb
>> > +++ b/recipes-qt/qt5/qtwayland_git.bb
>> > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>> >  SRC_URI += " \
>> >      file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>> >  "
>> > +
>> > +do_install_append() {
>> > +       # do install files created by qtwaylandscanner
>> > +       install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
>> Aargh: Wrong directory did test with /usr/include and expected
>> includedir = /usr/include -> V2 will follow
>
> fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
> cherry-picking to master-next
Thanks - hope to get that next time...

Andreas

Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Martin Jansa]

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

On Tue, May 13, 2014 at 08:57:00AM +0200, Martin Jansa wrote:
> On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
> > On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
> > <schnitzeltony@googlemail.com> wrote:
> > > buildhistory diff:
> > > --- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > > +++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
> > >  RPROVIDES =
> > >  RDEPENDS = qtwayland
> > >  RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
> > > -PKGSIZE = 295533
> > > +PKGSIZE = 537651
> > >  FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
> > > -FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
> > > +FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
> > >
> > > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> > > ---
> > >  recipes-qt/qt5/qtwayland_git.bb | 5 +++++
> > >  1 file changed, 5 insertions(+)
> > >
> > > diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
> > > index ebdda82..8da8249 100644
> > > --- a/recipes-qt/qt5/qtwayland_git.bb
> > > +++ b/recipes-qt/qt5/qtwayland_git.bb
> > > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
> > >  SRC_URI += " \
> > >      file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
> > >  "
> > > +
> > > +do_install_append() {
> > > +       # do install files created by qtwaylandscanner
> > > +       install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
> > Aargh: Wrong directory did test with /usr/include and expected
> > includedir = /usr/include -> V2 will follow
> 
> fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
> cherry-picking to master-next

Fails in world builds with dash:

| install: cannot stat
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwayland/5.2.1+gitAUTOINC+f9ebbd6c61-r0/build/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h':
No such file or directory

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Andreas Müller]

On Tue, May 13, 2014 at 10:42 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, May 13, 2014 at 08:57:00AM +0200, Martin Jansa wrote:
>> On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
>> > On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
>> > <schnitzeltony@googlemail.com> wrote:
>> > > buildhistory diff:
>> > > --- a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > > +++ b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>> > >  RPROVIDES =
>> > >  RDEPENDS = qtwayland
>> > >  RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
>> > > -PKGSIZE = 295533
>> > > +PKGSIZE = 537651
>> > >  FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
>> > > -FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
>> > > +FILELIST = /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>> > >
>> > > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> > > ---
>> > >  recipes-qt/qt5/qtwayland_git.bb | 5 +++++
>> > >  1 file changed, 5 insertions(+)
>> > >
>> > > diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
>> > > index ebdda82..8da8249 100644
>> > > --- a/recipes-qt/qt5/qtwayland_git.bb
>> > > +++ b/recipes-qt/qt5/qtwayland_git.bb
>> > > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>> > >  SRC_URI += " \
>> > >      file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>> > >  "
>> > > +
>> > > +do_install_append() {
>> > > +       # do install files created by qtwaylandscanner
>> > > +       install ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
>> > Aargh: Wrong directory did test with /usr/include and expected
>> > includedir = /usr/include -> V2 will follow
>>
>> fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
>> cherry-picking to master-next
>
> Fails in world builds with dash:
>
> | install: cannot stat
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwayland/5.2.1+gitAUTOINC+f9ebbd6c61-r0/build/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h':
> No such file or directory
Yes I was afraid this would happen last night - but was too dizzy to
realize why. It was caused by a patch I had in temporary which pinned
qtwayland to 5.2.1. I will send V2 with 5.3.0 and spaces in
do_install_append. Sorry for causing extra efforts.

Andreas