summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
downloadmeta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch')
-rw-r--r--recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch71
1 files changed, 0 insertions, 71 deletions
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
deleted file mode 100644
index 58f82663..00000000
--- a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Wed, 6 Mar 2013 10:18:49 -0800
4Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL
5
6As per the EGL spec the context passed to that function should
7be null.
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 .../wayland-egl/waylandeglintegration.cpp | 16 ++--------------
12 1 file changed, 2 insertions(+), 14 deletions(-)
13
14diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
15index 73877c4..16e77fb 100644
16--- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
17+++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
18@@ -101,7 +101,6 @@ public:
19
20 PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d;
21
22- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context;
23 };
24
25 WaylandEglIntegration::WaylandEglIntegration()
26@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla
27 const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS);
28 if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display"))
29 {
30- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context");
31- if (!d->get_egl_context) {
32- qWarning("Failed to retrieve the get_egl_context function");
33- }
34 d->egl_bind_wayland_display =
35 reinterpret_cast<PFNEGLBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglBindWaylandDisplayWL"));
36 d->egl_unbind_wayland_display =
37@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla
38 reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
39
40 if (d->egl_bind_wayland_display
41- && d->get_egl_context
42 && d->egl_unbind_wayland_display
43 && d->egl_create_image
44 && d->egl_destroy_image
45@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL
46 return 0;
47 }
48
49- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
50- EGLContext egl_context = d->get_egl_context(context);
51-
52- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context,
53+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL,
54 EGL_WAYLAND_BUFFER_WL,
55 buffer, NULL);
56
57@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC
58 {
59 Q_D(const WaylandEglIntegration);
60
61- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
62- EGLContext egl_context = d->get_egl_context(context);
63-
64- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context,
65+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL,
66 EGL_WAYLAND_BUFFER_WL,
67 buffer, NULL);
68 return image;
69--
701.8.2.1
71