recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe

* this will make maintaining meta-qt5 a bit easier

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

4 files changed, 21 insertions, 47 deletions

diff --git a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
index e9e705cd..0571ea5e 100644
--- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
+++ b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
@@ -1,33 +1,38 @@
-From c8417a2b0b66c26eaa0569c19422f87598e29629 Mon Sep 17 00:00:00 2001
+From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001
 From: Mikko Levonmaa <mikko.levonmaa@palm.com>
 Date: Tue, 19 Feb 2013 11:16:05 -0800
-Subject: [PATCH 1/4] xcbcommon should not be a mandatory dependency
+Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency
 
 Not all platforms that use qtwayland depend on xcbcommon to be present
 for them to be functional
 
-Change-Id: I899d9314bdf772a9d5b8b7c143636f9f12c8ad1d
+This change won't be needed when this commit from dev branch is merged
+to stable:
+commit 894adf8a447865119be7c6c4d01577d8032f4177
+Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
+Date:   Mon Apr 8 12:54:58 2013 +0200
+
+make failure to configure wayland non-fatal for a top-level build of qt
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- qtwayland.pro | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ qtwayland.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qtwayland.pro b/qtwayland.pro
-index ee0e5ac..f1a6b6f 100644
+index 24e104b..66dd38a 100644
 --- a/qtwayland.pro
 +++ b/qtwayland.pro
-@@ -11,15 +11,15 @@ qtCompileTest(xcomposite)
+@@ -11,7 +11,7 @@ qtCompileTest(xcomposite)
  load(qt_parts)
  
  !config_wayland {
--    error(QtWayland requires Wayland 1.0.0 or higher)
-+    error("QtWayland requires Wayland 1.0.0 or higher")
+-    error(QtWayland requires Wayland 1.0.3 or higher)
++    error("QtWayland requires Wayland 1.0.3 or higher")
  }
  
  !config_xkbcommon {
--    error(QtWayland requires xkbcommon 0.2.0 or higher)
-+    warning("No xkbcommon 0.2.0 or higher found, disabling support for it")
+@@ -19,7 +19,7 @@ load(qt_parts)
  }
  
  !config_wayland_scanner {
diff --git a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch
index 0c9bbbe7..77172908 100644
--- a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch
+++ b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch
@@ -1,7 +1,7 @@
-From ae72fc41609c15293b1027ca3f2c4d712e4ae478 Mon Sep 17 00:00:00 2001
+From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001
 From: Mikko Levonmaa <mikko.levonmaa@palm.com>
 Date: Fri, 1 Mar 2013 13:00:53 -0800
-Subject: [PATCH 2/4] Temporarily patching this out as Qt5.0.0 does not have
+Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have
  qtHaveModule
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
diff --git a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
index 48eb870b..58f82663 100644
--- a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
+++ b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
@@ -1,7 +1,7 @@
-From ca1f46a6192061e254deca1810d25ba423acb8de Mon Sep 17 00:00:00 2001
+From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001
 From: Mikko Levonmaa <mikko.levonmaa@palm.com>
 Date: Wed, 6 Mar 2013 10:18:49 -0800
-Subject: [PATCH 3/4] eglCreateImageKHR requires the context to be NULL
+Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL
 
 As per the EGL spec the context passed to that function should
 be null.
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 14 deletions(-)
 
 diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
-index 2a923ce..2be1e4c 100644
+index 73877c4..16e77fb 100644
 --- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
 +++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
 @@ -101,7 +101,6 @@ public:
diff --git a/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch b/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch
deleted file mode 100644
index 47ea65fd..00000000
--- a/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5c70644070803b665f64c2d3212b55a4a3270765 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Sun, 10 Mar 2013 11:29:38 -0700
-Subject: [PATCH 4/4] EGL: Specify vec2d precision qualifier in fragment shader
-
-GLSL does not specify a default precision qualifier here, so we have to
-explicitly define it.  Use highp, as it gets redefined to mediump by
-QGLShaderProgram when not available.
-
-Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp
-index 4d8017d..a0ac6d9 100644
---- a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp
-+++ b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp
-@@ -124,7 +124,7 @@ void QWaylandGLContext::swapBuffers(QPlatformSurface *surface)
-                                                                             gl_Position = position;\n\
-                                                                             outTexCoords = texCoords.xy;\n\
-                                                                         }");
--            m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying vec2 outTexCoords;\n\
-+            m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying highp vec2 outTexCoords;\n\
-                                                                             uniform sampler2D texture;\n\
-                                                                             void main()\n\
-                                                                             {\n\
--- 
-1.8.2.1
-