1 |
commit: 8044dd90e226c6cf7deddf540bd08b13dc55234a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 18 18:36:01 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 18 18:36:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8044dd90 |
7 |
|
8 |
dev-qt/qtwebengine: Fix nouveau-disable-gpu patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673398 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
...atch => qtwebengine-5.12.0-nouveau-disable-gpu.patch} | 16 ++++++++-------- |
15 |
dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild | 2 +- |
16 |
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +- |
17 |
3 files changed, 10 insertions(+), 10 deletions(-) |
18 |
|
19 |
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 |
20 |
similarity index 86% |
21 |
rename from dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch |
22 |
rename to dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch |
23 |
index aaf3aae4..ec315ca2 100644 |
24 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch |
25 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch |
26 |
@@ -7,11 +7,11 @@ It also crashes when running on wayland, the cause is not yet known. |
27 |
Work around these issues by not doing GPU-accelerated rendering in such |
28 |
cases. |
29 |
|
30 |
-Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp |
31 |
+Index: qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp |
32 |
=================================================================== |
33 |
---- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp |
34 |
-+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp |
35 |
-@@ -100,6 +100,7 @@ |
36 |
+--- qtwebengine-everywhere-src-5.12.0-alpha.orig/src/core/web_engine_context.cpp |
37 |
++++ qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp |
38 |
+@@ -101,6 +101,7 @@ |
39 |
#include <QOffscreenSurface> |
40 |
#ifndef QT_NO_OPENGL |
41 |
# include <QOpenGLContext> |
42 |
@@ -19,7 +19,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp |
43 |
#endif |
44 |
#include <QQuickWindow> |
45 |
#include <QStringList> |
46 |
-@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v |
47 |
+@@ -162,6 +163,39 @@ void dummyGetPluginCallback(const std::v |
48 |
} |
49 |
#endif |
50 |
|
51 |
@@ -59,13 +59,13 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp |
52 |
} // namespace |
53 |
|
54 |
namespace QtWebEngineCore { |
55 |
-@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext() |
56 |
+@@ -440,6 +474,27 @@ WebEngineContext::WebEngineContext() |
57 |
const char *glType = 0; |
58 |
#ifndef QT_NO_OPENGL |
59 |
|
60 |
+ bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); |
61 |
+ |
62 |
-+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive)) |
63 |
++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && qApp->platformName().startsWith("wayland", Qt::CaseInsensitive)) |
64 |
+ { |
65 |
+ qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n" |
66 |
+ "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n" |
67 |
@@ -87,7 +87,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp |
68 |
bool tryGL = |
69 |
!usingANGLE() |
70 |
&& (!usingSoftwareDynamicGL() |
71 |
-@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext() |
72 |
+@@ -450,7 +505,7 @@ WebEngineContext::WebEngineContext() |
73 |
|| enableWebGLSoftwareRendering |
74 |
#endif |
75 |
) |
76 |
|
77 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild |
78 |
index 3210a151..232f3195 100644 |
79 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild |
80 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild |
81 |
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND} |
82 |
|
83 |
PATCHES+=( |
84 |
"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 |
85 |
- "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 |
86 |
+ "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 |
87 |
) |
88 |
|
89 |
src_prepare() { |
90 |
|
91 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
92 |
index 3210a151..232f3195 100644 |
93 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
94 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
95 |
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND} |
96 |
|
97 |
PATCHES+=( |
98 |
"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 |
99 |
- "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 |
100 |
+ "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 |
101 |
) |
102 |
|
103 |
src_prepare() { |