commit: 8044dd90e226c6cf7deddf540bd08b13dc55234a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 18 18:36:01 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 18 18:36:01 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8044dd90
dev-qt/qtwebengine: Fix nouveau-disable-gpu patch Closes: https://bugs.gentoo.org/673398 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...atch => qtwebengine-5.12.0-nouveau-disable-gpu.patch} | 16 ++++++++-------- dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch similarity index 86% rename from dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch rename to dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch index aaf3aae4..ec315ca2 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch @@ -7,11 +7,11 @@ It also crashes when running on wayland, the cause is not yet known. Work around these issues by not doing GPU-accelerated rendering in such cases. -Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp +Index: qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp =================================================================== ---- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp -+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp -@@ -100,6 +100,7 @@ +--- qtwebengine-everywhere-src-5.12.0-alpha.orig/src/core/web_engine_context.cpp ++++ qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp +@@ -101,6 +101,7 @@ #include <QOffscreenSurface> #ifndef QT_NO_OPENGL # include <QOpenGLContext> @@ -19,7 +19,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp #endif #include <QQuickWindow> #include <QStringList> -@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v +@@ -162,6 +163,39 @@ void dummyGetPluginCallback(const std::v } #endif @@ -59,13 +59,13 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp } // namespace namespace QtWebEngineCore { -@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext() +@@ -440,6 +474,27 @@ WebEngineContext::WebEngineContext() const char *glType = 0; #ifndef QT_NO_OPENGL + bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); + -+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive)) ++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && qApp->platformName().startsWith("wayland", Qt::CaseInsensitive)) + { + qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n" + "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n" @@ -87,7 +87,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp bool tryGL = !usingANGLE() && (!usingSoftwareDynamicGL() -@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext() +@@ -450,7 +505,7 @@ WebEngineContext::WebEngineContext() || enableWebGLSoftwareRendering #endif ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild index 3210a151..232f3195 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild @@ -81,7 +81,7 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 - "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 + "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 ) src_prepare() { diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild index 3210a151..232f3195 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild @@ -81,7 +81,7 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 - "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 + "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 ) src_prepare() {
