diff --git a/recipes-hawaii/greenisland/greenisland.bb b/recipes-hawaii/greenisland/greenisland.bb index 0bd069ad..581f1a54 100644 --- a/recipes-hawaii/greenisland/greenisland.bb +++ b/recipes-hawaii/greenisland/greenisland.bb @@ -14,9 +14,6 @@ DEPENDS += " \ SRC_URI = " \ git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \ file://0001-find-native-greenisland-wayland-scanner.patch \ - file://0002-qwlsurfacebuffer.cpp-include-qwlclientbufferintegrat.patch \ - file://0003-waylandcompositor-remove-property-useHardwareIntegra.patch \ - file://0004-hardwareintegration-glx-compositor-does-not-build-in.patch \ " # we don't have wayland-protocols yet - revisit diff --git a/recipes-hawaii/greenisland/greenisland.inc b/recipes-hawaii/greenisland/greenisland.inc index a5a19442..bc1aab65 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 = "c39760ad84b8d7d872b23d97a6f7aa5be236dacd" +SRCREV = "dd195ada375bb0927d544999471fbb9bdc67d9c2" PV = "0.7.90+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-hawaii/greenisland/greenisland/0002-qwlsurfacebuffer.cpp-include-qwlclientbufferintegrat.patch b/recipes-hawaii/greenisland/greenisland/0002-qwlsurfacebuffer.cpp-include-qwlclientbufferintegrat.patch deleted file mode 100644 index 3a0995b7..00000000 --- a/recipes-hawaii/greenisland/greenisland/0002-qwlsurfacebuffer.cpp-include-qwlclientbufferintegrat.patch +++ /dev/null @@ -1,35 +0,0 @@ -From be70976f2bbbe9e7ff6826e9a4b5863a2dd5b70e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 7 Apr 2016 23:48:18 +0200 -Subject: [PATCH] qwlsurfacebuffer.cpp: include qwlclientbufferintegration_p.h - unconditionoally -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In GLESv2 environment I get: - -<...>/src/waylandcompositor/wayland_wrapper/qwlsurfacebuffer.cpp:104:22: error: invalid use of incomplete type 'class QtWayland::ClientBufferIntegration' - -Signed-off-by: Andreas Müller ---- - src/waylandcompositor/wayland_wrapper/qwlsurfacebuffer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/waylandcompositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/waylandcompositor/wayland_wrapper/qwlsurfacebuffer.cpp -index cf0c566..42591c3 100644 ---- a/src/waylandcompositor/wayland_wrapper/qwlsurfacebuffer.cpp -+++ b/src/waylandcompositor/wayland_wrapper/qwlsurfacebuffer.cpp -@@ -36,8 +36,8 @@ - - #include "qwlsurfacebuffer_p.h" - --#ifdef QT_COMPOSITOR_WAYLAND_GL - #include "hardware_integration/qwlclientbufferintegration_p.h" -+#ifdef QT_COMPOSITOR_WAYLAND_GL - #include - #endif - --- -2.5.5 - diff --git a/recipes-hawaii/greenisland/greenisland/0003-waylandcompositor-remove-property-useHardwareIntegra.patch b/recipes-hawaii/greenisland/greenisland/0003-waylandcompositor-remove-property-useHardwareIntegra.patch deleted file mode 100644 index fff168ed..00000000 --- a/recipes-hawaii/greenisland/greenisland/0003-waylandcompositor-remove-property-useHardwareIntegra.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 79a00446364852a51c58835b2c778a8be99ff911 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 7 Apr 2016 23:01:29 +0200 -Subject: [PATCH] waylandcompositor: remove property - useHardwareIntegrationExtension for non GL (GLES) builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/greenisland/0.7.90+gitAUTOINC+c39760ad84-r0/git/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp:817:15: error: 'const class QWaylandCompositorPrivate' has no member named 'use_hw_integration_extension' - return d->use_hw_integration_extension; - ^ -/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/greenisland/0.7.90+gitAUTOINC+c39760ad84-r0/git/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp: In member function 'void QWaylandCompositor::setUseHardwareIntegrationExtension(bool)': -/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/greenisland/0.7.90+gitAUTOINC+c39760ad84-r0/git/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp:823:19: error: 'class QWaylandCompositorPrivate' has no member named 'use_hw_integration_extension' - if (use == d->use_hw_integration_extension) - ^ -/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/greenisland/0.7.90+gitAUTOINC+c39760ad84-r0/git/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp:829:8: error: 'class QWaylandCompositorPrivate' has no member named 'use_hw_integration_extension' - d->use_hw_integration_extension = use; - ^ - -Signed-off-by: Andreas Müller ---- - src/waylandcompositor/compositor_api/qwaylandcompositor.cpp | 2 ++ - src/waylandcompositor/compositor_api/qwaylandcompositor.h | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp b/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp -index ab789c3..dee85f7 100644 ---- a/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp -+++ b/src/waylandcompositor/compositor_api/qwaylandcompositor.cpp -@@ -794,6 +794,7 @@ QWaylandInputDevice *QWaylandCompositor::inputDeviceFor(QInputEvent *inputEvent) - return dev; - } - -+#ifdef QT_COMPOSITOR_WAYLAND_GL - /*! - * \qmlproperty bool QtWaylandCompositor::WaylandCompositor::useHardwareIntegrationExtension - * -@@ -829,5 +830,6 @@ void QWaylandCompositor::setUseHardwareIntegrationExtension(bool use) - d->use_hw_integration_extension = use; - useHardwareIntegrationExtensionChanged(); - } -+#endif - - QT_END_NAMESPACE -diff --git a/src/waylandcompositor/compositor_api/qwaylandcompositor.h b/src/waylandcompositor/compositor_api/qwaylandcompositor.h -index 5eae20e..3d305fb 100644 ---- a/src/waylandcompositor/compositor_api/qwaylandcompositor.h -+++ b/src/waylandcompositor/compositor_api/qwaylandcompositor.h -@@ -74,7 +74,9 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject - Q_PROPERTY(QByteArray socketName READ socketName WRITE setSocketName) - Q_PROPERTY(bool retainedSelection READ retainedSelectionEnabled WRITE setRetainedSelectionEnabled) - Q_PROPERTY(QWaylandOutput *defaultOutput READ defaultOutput WRITE setDefaultOutput NOTIFY defaultOutputChanged) -+#ifdef QT_COMPOSITOR_WAYLAND_GL - Q_PROPERTY(bool useHardwareIntegrationExtension READ useHardwareIntegrationExtension WRITE setUseHardwareIntegrationExtension NOTIFY useHardwareIntegrationExtensionChanged) -+#endif - Q_PROPERTY(QWaylandInputDevice *defaultInputDevice READ defaultInputDevice NOTIFY defaultInputDeviceChanged) - - public: -@@ -115,8 +117,10 @@ public: - - QWaylandInputDevice *inputDeviceFor(QInputEvent *inputEvent); - -+#ifdef QT_COMPOSITOR_WAYLAND_GL - bool useHardwareIntegrationExtension() const; - void setUseHardwareIntegrationExtension(bool use); -+#endif - - public Q_SLOTS: - void processWaylandEvents(); --- -2.5.5 - diff --git a/recipes-hawaii/greenisland/greenisland/0004-hardwareintegration-glx-compositor-does-not-build-in.patch b/recipes-hawaii/greenisland/greenisland/0004-hardwareintegration-glx-compositor-does-not-build-in.patch deleted file mode 100644 index 60cda662..00000000 --- a/recipes-hawaii/greenisland/greenisland/0004-hardwareintegration-glx-compositor-does-not-build-in.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a9c1fc97b0b8e0586b799955e8909937e88e81c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 8 Apr 2016 00:45:05 +0200 -Subject: [PATCH] hardwareintegration: glx compositor does not build in GLES - environments -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - src/hardwareintegration/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hardwareintegration/CMakeLists.txt b/src/hardwareintegration/CMakeLists.txt -index a10419c..6de68e8 100644 ---- a/src/hardwareintegration/CMakeLists.txt -+++ b/src/hardwareintegration/CMakeLists.txt -@@ -9,7 +9,7 @@ if(X11_FOUND AND X11_Xcomposite_FOUND) - if(EGL_FOUND) - add_subdirectory(xcomposite-egl) - endif() -- if(OPENGL_FOUND) -+ if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL") - add_subdirectory(xcomposite-glx) - endif() - endif() --- -2.5.5 -