diff options
Diffstat (limited to 'package/qt5/qt5wayland')
| -rw-r--r-- | package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch | 44 | ||||
| -rw-r--r-- | package/qt5/qt5wayland/qt5wayland.hash | 4 |
2 files changed, 2 insertions, 46 deletions
diff --git a/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch b/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch deleted file mode 100644 index df09d4f382..0000000000 --- a/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1619f8bcdd1680c9557996b4977580090a749037 Mon Sep 17 00:00:00 2001 -From: Johan Klokkhammer Helsing <johan.helsing@qt.io> -Date: Thu, 9 Feb 2017 12:53:56 +0100 -Subject: [PATCH] Fix compilation for Renesas R-Car M3 - -Change-Id: Ib85001884bb880a18d8aa1241da0eb614a6b58ba -Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> - -Upstream: http://code.qt.io/cgit/qt/qtwayland.git/patch/?id=8b204b2c56be5e7c1fd21144ae140c9b865dd86b -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - .../client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp | 2 +- - .../compositor/xcomposite-egl/xcompositeeglintegration.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp -index 431cb14..9c3dee3 100644 ---- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp -+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp -@@ -121,7 +121,7 @@ void QWaylandXCompositeEGLWindow::createEglSurface() - XCompositeRedirectWindow(m_glxIntegration->xDisplay(), m_xWindow, CompositeRedirectManual); - XMapWindow(m_glxIntegration->xDisplay(), m_xWindow); - -- m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, m_xWindow,0); -+ m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, reinterpret_cast<EGLNativeWindowType>(m_xWindow), nullptr); - if (m_surface == EGL_NO_SURFACE) { - qFatal("Could not make eglsurface"); - } -diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp -index 3cc0ba0..071b088 100644 ---- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp -+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp -@@ -129,7 +129,7 @@ QOpenGLTexture *XCompositeEglClientBuffer::toOpenGlTexture(int plane) - attribList.append(EGL_TEXTURE_2D); - attribList.append(EGL_NONE); - -- EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(),config,pixmap,attribList.constData()); -+ EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(), config, reinterpret_cast<EGLNativePixmapType>(pixmap), attribList.constData()); - if (surface == EGL_NO_SURFACE) { - qDebug() << "Failed to create eglsurface" << pixmap << compositorBuffer->window(); - } --- -2.16.3 - diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b28677ad29..c36fbfff78 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 f5a7643a5ebcdc50d02b293191e675f387f67dc360c27bf6f94345372fba6356 qtwayland-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwayland-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 68814e8f207f3a90cae29ae49ce2c1f4bf9d06709a7a7962adf23120f1644127 qtwayland-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 |
