diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-10-18 15:53:22 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-23 17:42:26 +0100 |
commit | e736b200a0129747d35f1f8e4b406b9215937baf (patch) | |
tree | 66f2d652a5deb724619dfa2efacd881e1260ef15 /meta/recipes-sato/webkit | |
parent | faf701d2d5556d94522f78bf6021477efc727835 (diff) | |
download | poky-e736b200a0129747d35f1f8e4b406b9215937baf.tar.gz |
webkitgtk: add PACKAGECONFIG for opengl-or-es
* added in:
https://github.com/WebKit/WebKit/commit/29421afdcd64250c839fc1dbf26c9089584e224c
* fixes build without opengl in DISTRO_FEATURES which was failing since upgrade to 2.34.0 with:
| CMake Error at Source/cmake/OptionsGTK.cmake:353 (message):
| Either GLX or EGL is needed.
| Call Stack (most recent call first):
| Source/cmake/WebKitCommon.cmake:220 (include)
| CMakeLists.txt:20 (include)
* and add a patch to fix building this version with opengl and gles disabled
(default oe-core setup without opengl in DISTRO_FEATURES)
(From OE-Core rev: 7214f09c77675b66e63b8f342a93c6b4db16e53d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch | 133 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.34.0.bb | 3 |
2 files changed, 136 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch new file mode 100644 index 0000000000..e4c7d77ccd --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch | |||
@@ -0,0 +1,133 @@ | |||
1 | From 646e347c173dbb9782492ac7cb4f54b65533ba90 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 17 Oct 2021 20:49:21 +0000 | ||
4 | Subject: [PATCH] Fix build without opengl-or-es | ||
5 | |||
6 | * fix build failure when opengl-or-es is disabled: | ||
7 | In file included from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:30, | ||
8 | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-36.cpp:1: | ||
9 | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:41:10: fatal error: WebCore/CoordinatedGraphicsLayer.h: No such file or directory | ||
10 | 41 | #include <WebCore/CoordinatedGraphicsLayer.h> | ||
11 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
12 | compilation terminated. | ||
13 | |||
14 | * the CoordinatedGraphicsLayer.h header installation is controled by | ||
15 | USE_COORDINATED_GRAPHICS in webkitgtk-2.34.0/Source/WebCore/platform/TextureMapper.cmake | ||
16 | but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was enabled only inside | ||
17 | if (USE_OPENGL_OR_ES) | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | --- | ||
21 | .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- | ||
22 | .../DrawingAreaProxyCoordinatedGraphics.h | 2 +- | ||
23 | .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | 2 +- | ||
24 | .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | 2 +- | ||
25 | .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp | 4 ++-- | ||
26 | .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 6 +++--- | ||
27 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
28 | |||
29 | diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp | ||
30 | index 038d9ee2..5e828a10 100644 | ||
31 | --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp | ||
32 | +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp | ||
33 | @@ -152,7 +152,7 @@ void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBa | ||
34 | #endif | ||
35 | } | ||
36 | |||
37 | -#if PLATFORM(GTK) | ||
38 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
39 | void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin) | ||
40 | { | ||
41 | send(Messages::DrawingArea::AdjustTransientZoom(scale, origin)); | ||
42 | diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h | ||
43 | index b23a45ff..cd263402 100644 | ||
44 | --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h | ||
45 | +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h | ||
46 | @@ -57,7 +57,7 @@ private: | ||
47 | void waitForBackingStoreUpdateOnNextPaint() override; | ||
48 | void setBackingStoreIsDiscardable(bool) override; | ||
49 | |||
50 | -#if PLATFORM(GTK) | ||
51 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
52 | void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override; | ||
53 | void commitTransientZoom(double scale, WebCore::FloatPoint origin) override; | ||
54 | #endif | ||
55 | diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | ||
56 | index 33ac2e1d..42375784 100644 | ||
57 | --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | ||
58 | +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | ||
59 | @@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate() | ||
60 | displayTimerFired(); | ||
61 | } | ||
62 | |||
63 | -#if PLATFORM(GTK) | ||
64 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
65 | void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin) | ||
66 | { | ||
67 | if (!m_transientZoom) { | ||
68 | diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | ||
69 | index d8dc6df7..c8322364 100644 | ||
70 | --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | ||
71 | +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | ||
72 | @@ -84,7 +84,7 @@ private: | ||
73 | void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override; | ||
74 | void didUpdate() override; | ||
75 | |||
76 | -#if PLATFORM(GTK) | ||
77 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
78 | void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override; | ||
79 | void commitTransientZoom(double scale, WebCore::FloatPoint origin) override; | ||
80 | #endif | ||
81 | diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp | ||
82 | index f3304d10..ca0476ff 100644 | ||
83 | --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp | ||
84 | +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp | ||
85 | @@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired() | ||
86 | |||
87 | bool didSync = m_coordinator.flushPendingLayerChanges(flags); | ||
88 | |||
89 | -#if PLATFORM(GTK) | ||
90 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
91 | // If we have an active transient zoom, we want the zoom to win over any changes | ||
92 | // that WebCore makes to the relevant layers, so re-apply our changes after flushing. | ||
93 | if (m_transientZoom) | ||
94 | @@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint) | ||
95 | } | ||
96 | } | ||
97 | |||
98 | -#if PLATFORM(GTK) | ||
99 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
100 | FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, FloatPoint origin) const | ||
101 | { | ||
102 | FrameView& frameView = *m_webPage.mainFrameView(); | ||
103 | diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | ||
104 | index 4f727e41..b070266e 100644 | ||
105 | --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | ||
106 | +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | ||
107 | @@ -37,7 +37,7 @@ | ||
108 | #include <wtf/Forward.h> | ||
109 | #include <wtf/OptionSet.h> | ||
110 | #include <wtf/RunLoop.h> | ||
111 | -#if PLATFORM(GTK) | ||
112 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
113 | #include <WebCore/CoordinatedGraphicsLayer.h> | ||
114 | #endif | ||
115 | |||
116 | @@ -100,7 +100,7 @@ public: | ||
117 | |||
118 | WebCore::PlatformDisplayID displayID() const { return m_displayID; } | ||
119 | |||
120 | -#if PLATFORM(GTK) | ||
121 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
122 | void adjustTransientZoom(double, WebCore::FloatPoint); | ||
123 | void commitTransientZoom(double, WebCore::FloatPoint); | ||
124 | #endif | ||
125 | @@ -213,7 +213,7 @@ private: | ||
126 | #endif // USE(COORDINATED_GRAPHICS) | ||
127 | WebCore::PlatformDisplayID m_displayID; | ||
128 | |||
129 | -#if PLATFORM(GTK) | ||
130 | +#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) | ||
131 | bool m_transientZoom { false }; | ||
132 | double m_transientZoomScale { 1 }; | ||
133 | WebCore::FloatPoint m_transientZoomOrigin; | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb index 25e1d422cc..e54cbbacf9 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
19 | file://reduce-memory-overheads.patch \ | 19 | file://reduce-memory-overheads.patch \ |
20 | file://musl-lower-stack-usage.patch \ | 20 | file://musl-lower-stack-usage.patch \ |
21 | file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \ | 21 | file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \ |
22 | file://0001-Fix-build-without-opengl-or-es.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[sha256sum] = "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34" | 25 | SRC_URI[sha256sum] = "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34" |
@@ -49,6 +50,7 @@ DEPENDS = " \ | |||
49 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ | 50 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ |
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ |
51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ | 52 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ |
53 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ | ||
52 | enchant \ | 54 | enchant \ |
53 | libsecret \ | 55 | libsecret \ |
54 | " | 56 | " |
@@ -61,6 +63,7 @@ PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant | |||
61 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" | 63 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" |
62 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" | 64 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" |
63 | PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" | 65 | PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" |
66 | PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" | ||
64 | PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" | 67 | PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" |
65 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | 68 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" |
66 | PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" | 69 | PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" |