commit: 4421b5d072f2f5d4a7694a0e40306e198927ec34 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 7 11:28:34 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 7 14:17:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4421b5d0
dev-qt/qtwayland: Don't recreate hidden egl surfaces Fixing a runtime crash that affects many users. Patch taken from 5.9 branch (fixed in 5.9.5). KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=381630 Qt-Bug: https://bugreports.qt.io/browse/QTBUG-65553 See also: https://codereview.qt-project.org/#/c/210552/ Tested-by: Andrius Štikonas <andrius <AT> stikonas.eu> Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/qtwayland-5.9.4-qquickwindow-crash.patch | 109 +++++++++++++++++++++ dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild | 41 ++++++++ 2 files changed, 150 insertions(+) diff --git a/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch new file mode 100644 index 00000000000..40f2a6dff4e --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch @@ -0,0 +1,109 @@ +From bf09c7a1493c01a65ee0f110b37a04e653edc08e Mon Sep 17 00:00:00 2001 +From: David Edmundson <[email protected]> +Date: Wed, 3 Jan 2018 19:18:42 +0000 +Subject: [PATCH] Don't recreate hidden egl surfaces + +QWaylandEglWindow deletes surfaces when a window changes from hidden to +visible, presumably as a result of us not having a valid wl_surface +object. By extension it doesn't make sense to create a surface whilst a +window is still hidden. + +This fixes a crash where a QQuickWindow hides and then is destroyed. In +QQuickWindow destruction we have to create a valid context in order to +delete any textures/assets owned by the scene graph; as the wl_surface +has gone this causes an error in the EGL libs when we create an EGL +surface. + +Task-number: QTBUG-65553 +Change-Id: I9b37a86326bf2cd7737c4e839c1aa8c74cf08116 +Reviewed-by: Johan Helsing <[email protected]> +--- + .../client/wayland-egl/qwaylandglcontext.cpp | 2 +- + tests/auto/client/client/tst_client.cpp | 37 ++++++++++++++++++++++ + 2 files changed, 38 insertions(+), 1 deletion(-) + +diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +index 2a9e39e..f4dd6f4 100644 +--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp ++++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +@@ -407,7 +407,7 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface) + window->createDecoration(); + + if (eglSurface == EGL_NO_SURFACE) { +- window->updateSurface(true); ++ window->updateSurface(window->isExposed()); + eglSurface = window->eglSurface(); + } + +diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp +index 3897bd3..aed601d 100644 +--- a/tests/auto/client/client/tst_client.cpp ++++ b/tests/auto/client/client/tst_client.cpp +@@ -35,6 +35,8 @@ + #include <QMimeData> + #include <QPixmap> + #include <QDrag> ++#include <QWindow> ++#include <QOpenGLWindow> + + #include <QtTest/QtTest> + #include <QtWaylandClient/private/qwaylandintegration_p.h> +@@ -112,6 +114,25 @@ public: + QPoint mousePressPos; + }; + ++class TestGlWindow : public QOpenGLWindow ++{ ++ Q_OBJECT ++ ++public: ++ TestGlWindow(); ++ ++protected: ++ void paintGL() override; ++}; ++ ++TestGlWindow::TestGlWindow() ++{} ++ ++void TestGlWindow::paintGL() ++{ ++ glClear(GL_COLOR_BUFFER_BIT); ++} ++ + class tst_WaylandClient : public QObject + { + Q_OBJECT +@@ -149,6 +170,7 @@ private slots: + void dontCrashOnMultipleCommits(); + void hiddenTransientParent(); + void hiddenPopupParent(); ++ void glWindow(); + + private: + MockCompositor *compositor; +@@ -409,6 +431,21 @@ void tst_WaylandClient::hiddenPopupParent() + QTRY_VERIFY(compositor->surface()); + } + ++void tst_WaylandClient::glWindow() ++{ ++ QSKIP("Skipping GL tests, as not supported by all CI systems: See https://bugreports.qt.io/browse/QTBUG-65802";); ++ ++ QScopedPointer<TestGlWindow> testWindow(new TestGlWindow); ++ testWindow->show(); ++ QSharedPointer<MockSurface> surface; ++ QTRY_VERIFY(surface = compositor->surface()); ++ ++ //confirm we don't crash when we delete an already hidden GL window ++ //QTBUG-65553 ++ testWindow->setVisible(false); ++ QTRY_VERIFY(!compositor->surface()); ++} ++ + int main(int argc, char **argv) + { + setenv("XDG_RUNTIME_DIR", ".", 1); +-- +2.7.4 + diff --git a/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild new file mode 100644 index 00000000000..16a5d921047 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit qt5-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +fi + +IUSE="+libinput xcomposite" + +DEPEND=" + >=dev-libs/wayland-1.6.0 + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV}[egl,libinput?] + media-libs/mesa[egl] + >=x11-libs/libxkbcommon-0.2.0 + xcomposite? ( + x11-libs/libX11 + x11-libs/libXcomposite + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-qquickwindow-crash.patch" ) # 5.9 branch + +src_prepare() { + qt_use_disable_config libinput xkbcommon-evdev \ + src/client/client.pro \ + src/compositor/wayland_wrapper/wayland_wrapper.pri \ + src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ + tests/auto/compositor/compositor/compositor.pro + + use xcomposite || rm -r config.tests/xcomposite || die + + qt5-build_src_prepare +}
