From a461eed87cb2b47618aa82d220393ac72d7dc9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 10 Nov 2016 23:56:31 +0100 Subject: [PATCH] greenisland: update to latest master commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-hawaii/greenisland/greenisland.bb | 3 +- recipes-hawaii/greenisland/greenisland.inc | 4 +- ...r-work-corrrectly-with-RaspberryPi-.patch} | 0 ...andcompositor-fix-non-GL-GLES-builds.patch | 86 ------------------- 4 files changed, 3 insertions(+), 90 deletions(-) rename recipes-hawaii/greenisland/greenisland/{0003-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch => 0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch} (100%) delete mode 100644 recipes-hawaii/greenisland/greenisland/0002-waylandcompositor-fix-non-GL-GLES-builds.patch diff --git a/recipes-hawaii/greenisland/greenisland.bb b/recipes-hawaii/greenisland/greenisland.bb index b30f7ae0..904b739f 100644 --- a/recipes-hawaii/greenisland/greenisland.bb +++ b/recipes-hawaii/greenisland/greenisland.bb @@ -14,8 +14,7 @@ DEPENDS += " \ SRC_URI = " \ git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \ file://0001-find-native-greenisland-wayland-scanner.patch \ - file://0002-waylandcompositor-fix-non-GL-GLES-builds.patch \ - file://0003-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch \ + file://0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch \ " # we don't have wayland-protocols yet - revisit diff --git a/recipes-hawaii/greenisland/greenisland.inc b/recipes-hawaii/greenisland/greenisland.inc index debeea22..1441bd24 100644 --- a/recipes-hawaii/greenisland/greenisland.inc +++ b/recipes-hawaii/greenisland/greenisland.inc @@ -13,7 +13,7 @@ SRC_URI = " \ git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \ " -SRCREV = "17c32bacda7a8f8628a77c6b31ca374bc30e8c84" -PV = "0.8.1" +SRCREV = "2ef91aa2756ab4455274f47c290d0f274e1ef226" +PV = "0.8.1+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-hawaii/greenisland/greenisland/0003-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch b/recipes-hawaii/greenisland/greenisland/0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch similarity index 100% rename from recipes-hawaii/greenisland/greenisland/0003-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch rename to recipes-hawaii/greenisland/greenisland/0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch diff --git a/recipes-hawaii/greenisland/greenisland/0002-waylandcompositor-fix-non-GL-GLES-builds.patch b/recipes-hawaii/greenisland/greenisland/0002-waylandcompositor-fix-non-GL-GLES-builds.patch deleted file mode 100644 index c68b86f3..00000000 --- a/recipes-hawaii/greenisland/greenisland/0002-waylandcompositor-fix-non-GL-GLES-builds.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5be9827d217e140c1d3d060f9366cc0632a847af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 14 Sep 2016 19:34:55 +0200 -Subject: [PATCH] waylandcompositor: fix non GL (GLES) builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -qwaylandquickcompositor.cpp:159:20: error: 'class QWaylandBufferRef' has no member named 'bindToTexture' - buffer.bindToTexture(); - ^~~~~~~~~~~~~ - -qwaylandquickitem.cpp:314:24: error: 'const class QWaylandBufferRef' has no member named 'bindToTexture' - buffer.bindToTexture(); - ^~~~~~~~~~~~~ - -qwaylandquickitem.cpp:1126:40: error: 'class QWaylandBufferRef' has no member named 'textureForPlane' - if (uint texture = ref.textureForPlane(plane)) - ^~~~~~~~~~~~~~~ - -qwaylandquickitem.cpp:1129:17: error: 'class QWaylandBufferRef' has no member named 'bindToTexture' - ref.bindToTexture(); - ^~~~~~~~~~~~~ - -qwaylandquickitem.cpp:1132:13: error: 'class QWaylandBufferRef' has no member named 'updateTexture' - ref.updateTexture(); - ^~~~~~~~~~~~~ - -Signed-off-by: Andreas Müller ---- - src/waylandcompositor/compositor_api/qwaylandquickcompositor.cpp | 2 ++ - src/waylandcompositor/compositor_api/qwaylandquickitem.cpp | 8 ++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/src/waylandcompositor/compositor_api/qwaylandquickcompositor.cpp b/src/waylandcompositor/compositor_api/qwaylandquickcompositor.cpp -index e015a8f..69099db 100644 ---- a/src/waylandcompositor/compositor_api/qwaylandquickcompositor.cpp -+++ b/src/waylandcompositor/compositor_api/qwaylandquickcompositor.cpp -@@ -156,7 +156,9 @@ void QWaylandQuickCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const - glGenTextures(1, &texture); - glBindTexture(GL_TEXTURE_2D, texture); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -+#ifdef QT_WAYLAND_COMPOSITOR_GL - buffer.bindToTexture(); -+#endif - blitter.blit(texture, QMatrix4x4(), surfaceOrigin); - - blitter.release(); -diff --git a/src/waylandcompositor/compositor_api/qwaylandquickitem.cpp b/src/waylandcompositor/compositor_api/qwaylandquickitem.cpp -index 942a5d1..1e15b0f 100644 ---- a/src/waylandcompositor/compositor_api/qwaylandquickitem.cpp -+++ b/src/waylandcompositor/compositor_api/qwaylandquickitem.cpp -@@ -311,7 +311,9 @@ public: - GLuint texture; - glGenTextures(1, &texture); - glBindTexture(GL_TEXTURE_2D, texture); -+#ifdef QT_WAYLAND_COMPOSITOR_GL - buffer.bindToTexture(); -+#endif - m_sgTex = surfaceItem->window()->createTextureFromId(texture , QSize(surfaceItem->width(), surfaceItem->height()), opt); - } - } -@@ -1122,14 +1124,20 @@ QSGNode *QWaylandQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat - - if (d->newTexture) { - d->newTexture = false; -+#ifdef QT_WAYLAND_COMPOSITOR_GL - for (int plane = 0; plane < bufferTypes[ref.bufferFormatEgl()].planeCount; plane++) - if (uint texture = ref.textureForPlane(plane)) - material->setTextureForPlane(plane, texture); -+#endif - material->bind(); -+#ifdef QT_WAYLAND_COMPOSITOR_GL - ref.bindToTexture(); -+#endif - } - -+#ifdef QT_WAYLAND_COMPOSITOR_GL - ref.updateTexture(); -+#endif - QSGGeometry::updateTexturedRectGeometry(geometry, rect, QRectF(0, 0, 1, 1)); - - node->setGeometry(geometry); --- -2.5.5 -