From c908fe4ebd5a04813be0b83c173fae182bb22728 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 2 Nov 2013 19:06:14 +0100 Subject: qt5: upgrade to 5.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 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 Signed-off-by: Martin Jansa --- ...-qtwaylandscanner-tool-to-the-native-side.patch | 32 ---------- ...mmon-should-not-be-a-mandatory-dependency.patch | 46 -------------- ...-patching-this-out-as-Qt5.0.0-does-not-ha.patch | 33 ---------- ...eImageKHR-requires-the-context-to-be-NULL.patch | 71 ---------------------- 4 files changed, 182 deletions(-) delete mode 100644 recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch delete mode 100644 recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch delete mode 100644 recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch delete mode 100644 recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch (limited to 'recipes-qt/qt5/qtwayland-git') diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch deleted file mode 100644 index 1fac95b7..00000000 --- a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Fri, 19 Jul 2013 13:35:14 +0000 -Subject: [PATCH] Install the qtwaylandscanner tool to the native side - -Upstream-Status: Inappropiate [configuration] - -Signed-off-by: Simon Busch ---- - src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro -index ac2d07b..53b93f9 100644 ---- a/src/qtwaylandscanner/qtwaylandscanner.pro -+++ b/src/qtwaylandscanner/qtwaylandscanner.pro -@@ -1,6 +1,10 @@ - option(host_build) - --SOURCES += qtwaylandscanner.cpp -+TARGET = qtwaylandscanner$$qtPlatformTargetSuffix() -+CONFIG += console warn_off -+QT = core - --load(qt_tool) -+SOURCES += qtwaylandscanner.cpp - -+target.path = $$[QT_HOST_BINS] -+INSTALLS += target --- -1.8.1.2 - 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 deleted file mode 100644 index 0571ea5e..00000000 --- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 19 Feb 2013 11:16:05 -0800 -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 - -This change won't be needed when this commit from dev branch is merged -to stable: -commit 894adf8a447865119be7c6c4d01577d8032f4177 -Author: Oswald Buddenhagen -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 ---- - qtwayland.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtwayland.pro b/qtwayland.pro -index 24e104b..66dd38a 100644 ---- a/qtwayland.pro -+++ b/qtwayland.pro -@@ -11,7 +11,7 @@ qtCompileTest(xcomposite) - load(qt_parts) - - !config_wayland { -- error(QtWayland requires Wayland 1.0.3 or higher) -+ error("QtWayland requires Wayland 1.0.3 or higher") - } - - !config_xkbcommon { -@@ -19,7 +19,7 @@ load(qt_parts) - } - - !config_wayland_scanner { -- error(QtWayland requires wayland-scanner) -+ error("QtWayland requires wayland-scanner") - } - - !config_wayland_egl { --- -1.8.2.1 - 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 deleted file mode 100644 index 77172908..00000000 --- a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Fri, 1 Mar 2013 13:00:53 -0800 -Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have - qtHaveModule - -Signed-off-by: Martin Jansa ---- - src/compositor/compositor_api/compositor_api.pri | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri -index f0bbe76..e7905e5 100644 ---- a/src/compositor/compositor_api/compositor_api.pri -+++ b/src/compositor/compositor_api/compositor_api.pri -@@ -12,7 +12,7 @@ SOURCES += \ - - QT += core-private - --qtHaveModule(quick) { -+#qtHaveModule(quick) { - SOURCES += \ - compositor_api/qwaylandsurfaceitem.cpp \ - compositor_api/qwaylandsurfacenode.cpp \ -@@ -27,4 +27,4 @@ qtHaveModule(quick) { - - QT += qml quick - QT += quick-private gui-private --} -+#} --- -1.8.2.1 - 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 @@ -From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Wed, 6 Mar 2013 10:18:49 -0800 -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. - -Signed-off-by: Martin Jansa ---- - .../wayland-egl/waylandeglintegration.cpp | 16 ++-------------- - 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 73877c4..16e77fb 100644 ---- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -+++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -@@ -101,7 +101,6 @@ public: - - PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d; - -- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context; - }; - - WaylandEglIntegration::WaylandEglIntegration() -@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla - const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS); - if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display")) - { -- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context"); -- if (!d->get_egl_context) { -- qWarning("Failed to retrieve the get_egl_context function"); -- } - d->egl_bind_wayland_display = - reinterpret_cast(eglGetProcAddress("eglBindWaylandDisplayWL")); - d->egl_unbind_wayland_display = -@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla - reinterpret_cast(eglGetProcAddress("glEGLImageTargetTexture2DOES")); - - if (d->egl_bind_wayland_display -- && d->get_egl_context - && d->egl_unbind_wayland_display - && d->egl_create_image - && d->egl_destroy_image -@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL - return 0; - } - -- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); -- EGLContext egl_context = d->get_egl_context(context); -- -- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, -+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, - EGL_WAYLAND_BUFFER_WL, - buffer, NULL); - -@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC - { - Q_D(const WaylandEglIntegration); - -- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); -- EGLContext egl_context = d->get_egl_context(context); -- -- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, -+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, - EGL_WAYLAND_BUFFER_WL, - buffer, NULL); - return image; --- -1.8.2.1 - -- cgit v1.2.3-54-g00ecf