* [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es @ 2021-10-18 13:53 Martin Jansa 2021-10-18 14:06 ` [OE-core] " Alexander Kanavin 2021-10-18 14:37 ` Alexander Kanavin 0 siblings, 2 replies; 13+ messages in thread From: Martin Jansa @ 2021-10-18 13:53 UTC (permalink / raw) To: openembedded-core; +Cc: Martin Jansa * 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) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../0001-Fix-build-without-opengl-or-es.patch | 133 ++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.34.0.bb | 3 + 2 files changed, 136 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch 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 @@ +From 646e347c173dbb9782492ac7cb4f54b65533ba90 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 17 Oct 2021 20:49:21 +0000 +Subject: [PATCH] Fix build without opengl-or-es + +* fix build failure when opengl-or-es is disabled: + 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, + 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: + /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 + 41 | #include <WebCore/CoordinatedGraphicsLayer.h> + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + compilation terminated. + +* the CoordinatedGraphicsLayer.h header installation is controled by + USE_COORDINATED_GRAPHICS in webkitgtk-2.34.0/Source/WebCore/platform/TextureMapper.cmake + but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was enabled only inside + if (USE_OPENGL_OR_ES) + +Upstream-Status: Pending +--- + .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- + .../DrawingAreaProxyCoordinatedGraphics.h | 2 +- + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | 2 +- + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | 2 +- + .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp | 4 ++-- + .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 6 +++--- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +index 038d9ee2..5e828a10 100644 +--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp ++++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -152,7 +152,7 @@ void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBa + #endif + } + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin) + { + send(Messages::DrawingArea::AdjustTransientZoom(scale, origin)); +diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h +index b23a45ff..cd263402 100644 +--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h ++++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h +@@ -57,7 +57,7 @@ private: + void waitForBackingStoreUpdateOnNextPaint() override; + void setBackingStoreIsDiscardable(bool) override; + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override; + void commitTransientZoom(double scale, WebCore::FloatPoint origin) override; + #endif +diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +index 33ac2e1d..42375784 100644 +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +@@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate() + displayTimerFired(); + } + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin) + { + if (!m_transientZoom) { +diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h +index d8dc6df7..c8322364 100644 +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h +@@ -84,7 +84,7 @@ private: + void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override; + void didUpdate() override; + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override; + void commitTransientZoom(double scale, WebCore::FloatPoint origin) override; + #endif +diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp +index f3304d10..ca0476ff 100644 +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp +@@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired() + + bool didSync = m_coordinator.flushPendingLayerChanges(flags); + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + // If we have an active transient zoom, we want the zoom to win over any changes + // that WebCore makes to the relevant layers, so re-apply our changes after flushing. + if (m_transientZoom) +@@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint) + } + } + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, FloatPoint origin) const + { + FrameView& frameView = *m_webPage.mainFrameView(); +diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +index 4f727e41..b070266e 100644 +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +@@ -37,7 +37,7 @@ + #include <wtf/Forward.h> + #include <wtf/OptionSet.h> + #include <wtf/RunLoop.h> +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + #include <WebCore/CoordinatedGraphicsLayer.h> + #endif + +@@ -100,7 +100,7 @@ public: + + WebCore::PlatformDisplayID displayID() const { return m_displayID; } + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + void adjustTransientZoom(double, WebCore::FloatPoint); + void commitTransientZoom(double, WebCore::FloatPoint); + #endif +@@ -213,7 +213,7 @@ private: + #endif // USE(COORDINATED_GRAPHICS) + WebCore::PlatformDisplayID m_displayID; + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) + bool m_transientZoom { false }; + double m_transientZoomScale { 1 }; + 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 \ file://reduce-memory-overheads.patch \ file://musl-lower-stack-usage.patch \ file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \ + file://0001-Fix-build-without-opengl-or-es.patch \ " SRC_URI[sha256sum] = "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34" @@ -49,6 +50,7 @@ DEPENDS = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ enchant \ libsecret \ " @@ -61,6 +63,7 @@ PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" +PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" -- 2.32.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 13:53 [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es Martin Jansa @ 2021-10-18 14:06 ` Alexander Kanavin 2021-10-18 14:14 ` Martin Jansa 2021-10-18 14:37 ` Alexander Kanavin 1 sibling, 1 reply; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 14:06 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 11360 bytes --] Please do send this upstream, the patch looks like a pain to rebase (and there's no AB config to test it). Alex On Mon, 18 Oct 2021 at 15:53, Martin Jansa <Martin.Jansa@gmail.com> wrote: > * 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) > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > .../0001-Fix-build-without-opengl-or-es.patch | 133 ++++++++++++++++++ > meta/recipes-sato/webkit/webkitgtk_2.34.0.bb | 3 + > 2 files changed, 136 insertions(+) > create mode 100644 > meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch > > 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 @@ > +From 646e347c173dbb9782492ac7cb4f54b65533ba90 Mon Sep 17 00:00:00 2001 > +From: Martin Jansa <Martin.Jansa@gmail.com> > +Date: Sun, 17 Oct 2021 20:49:21 +0000 > +Subject: [PATCH] Fix build without opengl-or-es > + > +* fix build failure when opengl-or-es is disabled: > + 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, > + 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: > + > /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 > + 41 | #include <WebCore/CoordinatedGraphicsLayer.h> > + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + compilation terminated. > + > +* the CoordinatedGraphicsLayer.h header installation is controled by > + USE_COORDINATED_GRAPHICS in > webkitgtk-2.34.0/Source/WebCore/platform/TextureMapper.cmake > + but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was > enabled only inside > + if (USE_OPENGL_OR_ES) > + > +Upstream-Status: Pending > +--- > + .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- > + .../DrawingAreaProxyCoordinatedGraphics.h | 2 +- > + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | 2 +- > + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | 2 +- > + .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp | 4 ++-- > + .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 6 +++--- > + 6 files changed, 9 insertions(+), 9 deletions(-) > + > +diff --git > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > +index 038d9ee2..5e828a10 100644 > +--- > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > ++++ > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > +@@ -152,7 +152,7 @@ void > DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBa > + #endif > + } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double > scale, FloatPoint origin) > + { > + send(Messages::DrawingArea::AdjustTransientZoom(scale, origin)); > +diff --git > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > +index b23a45ff..cd263402 100644 > +--- > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > ++++ > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > +@@ -57,7 +57,7 @@ private: > + void waitForBackingStoreUpdateOnNextPaint() override; > + void setBackingStoreIsDiscardable(bool) override; > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void adjustTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + void commitTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + #endif > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > +index 33ac2e1d..42375784 100644 > +--- > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > ++++ > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > +@@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate() > + displayTimerFired(); > + } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, > FloatPoint origin) > + { > + if (!m_transientZoom) { > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > +index d8dc6df7..c8322364 100644 > +--- > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > ++++ > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > +@@ -84,7 +84,7 @@ private: > + void updateBackingStoreState(uint64_t backingStoreStateID, bool > respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const > WebCore::IntSize& scrollOffset) override; > + void didUpdate() override; > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void adjustTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + void commitTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + #endif > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > +index f3304d10..ca0476ff 100644 > +--- > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > ++++ > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > +@@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired() > + > + bool didSync = m_coordinator.flushPendingLayerChanges(flags); > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + // If we have an active transient zoom, we want the zoom to win over > any changes > + // that WebCore makes to the relevant layers, so re-apply our > changes after flushing. > + if (m_transientZoom) > +@@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint) > + } > + } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, > FloatPoint origin) const > + { > + FrameView& frameView = *m_webPage.mainFrameView(); > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > +index 4f727e41..b070266e 100644 > +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > +@@ -37,7 +37,7 @@ > + #include <wtf/Forward.h> > + #include <wtf/OptionSet.h> > + #include <wtf/RunLoop.h> > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + #include <WebCore/CoordinatedGraphicsLayer.h> > + #endif > + > +@@ -100,7 +100,7 @@ public: > + > + WebCore::PlatformDisplayID displayID() const { return m_displayID; } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void adjustTransientZoom(double, WebCore::FloatPoint); > + void commitTransientZoom(double, WebCore::FloatPoint); > + #endif > +@@ -213,7 +213,7 @@ private: > + #endif // USE(COORDINATED_GRAPHICS) > + WebCore::PlatformDisplayID m_displayID; > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + bool m_transientZoom { false }; > + double m_transientZoomScale { 1 }; > + 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 \ > file://reduce-memory-overheads.patch \ > file://musl-lower-stack-usage.patch \ > file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \ > + file://0001-Fix-build-without-opengl-or-es.patch \ > " > > SRC_URI[sha256sum] = > "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34" > @@ -49,6 +50,7 @@ DEPENDS = " \ > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland > x11', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'webgl opengl', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', > 'webgl gles2 angle', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'opengl-or-es', '', d)} \ > enchant \ > libsecret \ > " > @@ -61,6 +63,7 @@ PACKAGECONFIG[enchant] = > "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant > PACKAGECONFIG[gles2] = > "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" > PACKAGECONFIG[webgl] = > "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" > PACKAGECONFIG[opengl] = > "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" > +PACKAGECONFIG[opengl-or-es] = > "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" > PACKAGECONFIG[libsecret] = > "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" > PACKAGECONFIG[libhyphen] = > "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" > PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" > -- > 2.32.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#157060): > https://lists.openembedded.org/g/openembedded-core/message/157060 > Mute This Topic: https://lists.openembedded.org/mt/86414212/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > > [-- Attachment #2: Type: text/html, Size: 13958 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:06 ` [OE-core] " Alexander Kanavin @ 2021-10-18 14:14 ` Martin Jansa 2021-10-18 14:15 ` Alexander Kanavin [not found] ` <16AF25A15C500BAB.24927@lists.openembedded.org> 0 siblings, 2 replies; 13+ messages in thread From: Martin Jansa @ 2021-10-18 14:14 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 321 bytes --] On Mon, Oct 18, 2021 at 4:06 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Please do send this upstream, the patch looks like a pain to rebase (and > there's no AB config to test it). > Feel free to do that, I'm not interested in webkitgtk at all - just wanted it to disappear from build failures in world CI. [-- Attachment #2: Type: text/html, Size: 641 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:14 ` Martin Jansa @ 2021-10-18 14:15 ` Alexander Kanavin 2021-10-18 14:20 ` Martin Jansa [not found] ` <16AF25A15C500BAB.24927@lists.openembedded.org> 1 sibling, 1 reply; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 14:15 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 540 bytes --] Sorry, but no. If you say 'Pending', the upstreaming is on you - I will simply drop the patch if it proves to be a pain. Alex On Mon, 18 Oct 2021 at 16:14, Martin Jansa <martin.jansa@gmail.com> wrote: > On Mon, Oct 18, 2021 at 4:06 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > >> Please do send this upstream, the patch looks like a pain to rebase (and >> there's no AB config to test it). >> > > Feel free to do that, I'm not interested in webkitgtk at all - just wanted > it to disappear from build failures in world CI. > [-- Attachment #2: Type: text/html, Size: 1190 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:15 ` Alexander Kanavin @ 2021-10-18 14:20 ` Martin Jansa 2021-10-18 14:31 ` Alexander Kanavin 0 siblings, 1 reply; 13+ messages in thread From: Martin Jansa @ 2021-10-18 14:20 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1183 bytes --] > If you say 'Pending', the upstreaming is on you Sorry, but no, read the definition on https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Pending - No determination has been made yet or not yet submitted to upstream > I will simply drop the patch if it proves to be a pain. OK, I'll simply PNBLACKLIST all the recipes your AUH upgrades break or stop doing the CI builds completely. Having latest versions is nice, but this approach to regressions introduced by version upgrades is quite a pain already. Thanks On Mon, Oct 18, 2021 at 4:16 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Sorry, but no. If you say 'Pending', the upstreaming is on you - I will > simply drop the patch if it proves to be a pain. > > Alex > > On Mon, 18 Oct 2021 at 16:14, Martin Jansa <martin.jansa@gmail.com> wrote: > >> On Mon, Oct 18, 2021 at 4:06 PM Alexander Kanavin <alex.kanavin@gmail.com> >> wrote: >> >>> Please do send this upstream, the patch looks like a pain to rebase (and >>> there's no AB config to test it). >>> >> >> Feel free to do that, I'm not interested in webkitgtk at all - just >> wanted it to disappear from build failures in world CI. >> > [-- Attachment #2: Type: text/html, Size: 2360 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:20 ` Martin Jansa @ 2021-10-18 14:31 ` Alexander Kanavin 2021-10-18 14:38 ` Martin Jansa 0 siblings, 1 reply; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 14:31 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 602 bytes --] On Mon, 18 Oct 2021 at 16:20, Martin Jansa <martin.jansa@gmail.com> wrote: > OK, I'll simply PNBLACKLIST all the recipes your AUH upgrades break or > stop doing the CI builds completely. > > Having latest versions is nice, but this approach to regressions > introduced by version upgrades is quite a pain already. > I do test all my upgrades on the AB. For major ones like python or openssl, I run meta-oe builds too. If the AB gives a green pass (which it did), then the upgrade works as intended. If you think AB is not doing enough testing, find the gaps in the AB matrix and address them. Alex [-- Attachment #2: Type: text/html, Size: 1184 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:31 ` Alexander Kanavin @ 2021-10-18 14:38 ` Martin Jansa 2021-10-18 14:45 ` Alexander Kanavin 0 siblings, 1 reply; 13+ messages in thread From: Martin Jansa @ 2021-10-18 14:38 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 777 bytes --] On Mon, Oct 18, 2021 at 4:32 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > On Mon, 18 Oct 2021 at 16:20, Martin Jansa <martin.jansa@gmail.com> wrote: > >> OK, I'll simply PNBLACKLIST all the recipes your AUH upgrades break or >> stop doing the CI builds completely. >> >> Having latest versions is nice, but this approach to regressions >> introduced by version upgrades is quite a pain already. >> > > I do test all my upgrades on the AB. For major ones like python or > openssl, I run meta-oe builds too. > > If the AB gives a green pass (which it did), then the upgrade works as > intended. If you think AB is not doing enough testing, find the gaps in the > AB matrix and address them. > nodistro build with default oe-core setup obviously isn't covered by AB. [-- Attachment #2: Type: text/html, Size: 1549 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:38 ` Martin Jansa @ 2021-10-18 14:45 ` Alexander Kanavin 2021-10-18 14:54 ` Martin Jansa 0 siblings, 1 reply; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 14:45 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 638 bytes --] On Mon, 18 Oct 2021 at 16:38, Martin Jansa <martin.jansa@gmail.com> wrote: > >> I do test all my upgrades on the AB. For major ones like python or >> openssl, I run meta-oe builds too. >> >> If the AB gives a green pass (which it did), then the upgrade works as >> intended. If you think AB is not doing enough testing, find the gaps in the >> AB matrix and address them. >> > > nodistro build with default oe-core setup obviously isn't covered by AB. > nodistro core-image-sato build is there, but not world. Sato doesn't include webkit: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-autobuilder-helper/tree/config.json#n234 Alex [-- Attachment #2: Type: text/html, Size: 1464 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:45 ` Alexander Kanavin @ 2021-10-18 14:54 ` Martin Jansa 2021-10-18 15:03 ` Alexander Kanavin 0 siblings, 1 reply; 13+ messages in thread From: Martin Jansa @ 2021-10-18 14:54 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1142 bytes --] So you're testing your version upgrades by a build which doesn't include the upgraded recipes? and that's the proof that "the upgrade works as intended" and then you get angry, because someone reports an regression and even sends a fix for it.. it's early, but I guess I need more coffee or beer to understand this. FWIW: I'm not going to continue in this discussion before I calm down. On Mon, Oct 18, 2021 at 4:45 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > On Mon, 18 Oct 2021 at 16:38, Martin Jansa <martin.jansa@gmail.com> wrote: > >> >>> I do test all my upgrades on the AB. For major ones like python or >>> openssl, I run meta-oe builds too. >>> >>> If the AB gives a green pass (which it did), then the upgrade works as >>> intended. If you think AB is not doing enough testing, find the gaps in the >>> AB matrix and address them. >>> >> >> nodistro build with default oe-core setup obviously isn't covered by AB. >> > > nodistro core-image-sato build is there, but not world. Sato doesn't > include webkit: > > > http://git.yoctoproject.org/cgit/cgit.cgi/yocto-autobuilder-helper/tree/config.json#n234 > > Alex > > [-- Attachment #2: Type: text/html, Size: 2329 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:54 ` Martin Jansa @ 2021-10-18 15:03 ` Alexander Kanavin 0 siblings, 0 replies; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 15:03 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1987 bytes --] I usually run a-full with poky checkout pointing to my package update branch, so all upgrades are there, and things can and do break and they get privately addressed before any patches are sent here. The branch is here http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates Just started such a build now: https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2768 All of the things in the matrix are poky-based, except that one sato build definition which uses nodistro: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-autobuilder-helper/tree/config.json If you see gaps in that config.json, they can be addressed. Adding world to the nodistro build is an option. Alex On Mon, 18 Oct 2021 at 16:54, Martin Jansa <martin.jansa@gmail.com> wrote: > So you're testing your version upgrades by a build which doesn't include > the upgraded recipes? > > and that's the proof that "the upgrade works as intended" and then you get > angry, because someone reports an regression and even sends a fix for it.. > it's early, but I guess I need more coffee or beer to understand this. > > FWIW: I'm not going to continue in this discussion before I calm down. > > On Mon, Oct 18, 2021 at 4:45 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > >> On Mon, 18 Oct 2021 at 16:38, Martin Jansa <martin.jansa@gmail.com> >> wrote: >> >>> >>>> I do test all my upgrades on the AB. For major ones like python or >>>> openssl, I run meta-oe builds too. >>>> >>>> If the AB gives a green pass (which it did), then the upgrade works as >>>> intended. If you think AB is not doing enough testing, find the gaps in the >>>> AB matrix and address them. >>>> >>> >>> nodistro build with default oe-core setup obviously isn't covered by AB. >>> >> >> nodistro core-image-sato build is there, but not world. Sato doesn't >> include webkit: >> >> >> http://git.yoctoproject.org/cgit/cgit.cgi/yocto-autobuilder-helper/tree/config.json#n234 >> >> Alex >> >> [-- Attachment #2: Type: text/html, Size: 3922 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <16AF25A15C500BAB.24927@lists.openembedded.org>]
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es [not found] ` <16AF25A15C500BAB.24927@lists.openembedded.org> @ 2021-10-18 14:20 ` Alexander Kanavin 2021-10-18 14:37 ` Martin Jansa 0 siblings, 1 reply; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 14:20 UTC (permalink / raw) To: Alexander Kanavin; +Cc: Martin Jansa, OE-core [-- Attachment #1: Type: text/plain, Size: 1261 bytes --] ... especially if you don't actually have a use case for this, and wrote the patch just to keep your private CI happy. Alex On Mon, 18 Oct 2021 at 16:16, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > Sorry, but no. If you say 'Pending', the upstreaming is on you - I will > simply drop the patch if it proves to be a pain. > > Alex > > On Mon, 18 Oct 2021 at 16:14, Martin Jansa <martin.jansa@gmail.com> wrote: > >> On Mon, Oct 18, 2021 at 4:06 PM Alexander Kanavin <alex.kanavin@gmail.com> >> wrote: >> >>> Please do send this upstream, the patch looks like a pain to rebase (and >>> there's no AB config to test it). >>> >> >> Feel free to do that, I'm not interested in webkitgtk at all - just >> wanted it to disappear from build failures in world CI. >> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#157067): > https://lists.openembedded.org/g/openembedded-core/message/157067 > Mute This Topic: https://lists.openembedded.org/mt/86414212/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > > [-- Attachment #2: Type: text/html, Size: 2768 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 14:20 ` Alexander Kanavin @ 2021-10-18 14:37 ` Martin Jansa 0 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2021-10-18 14:37 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 391 bytes --] On Mon, Oct 18, 2021 at 4:20 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > ... especially if you don't actually have a use case for this, and wrote > the patch just to keep your private CI happy. > yeah, my private CI testing _the default oe-core setup_. But I can stop doing that, if it's not welcome, there are better things in life than spending time on patches to be deleted. [-- Attachment #2: Type: text/html, Size: 725 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es 2021-10-18 13:53 [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es Martin Jansa 2021-10-18 14:06 ` [OE-core] " Alexander Kanavin @ 2021-10-18 14:37 ` Alexander Kanavin 1 sibling, 0 replies; 13+ messages in thread From: Alexander Kanavin @ 2021-10-18 14:37 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 11533 bytes --] Perhaps the easiest way out is to just change: REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" to say 'opengl' unconditionally. If upstream doesn't test and isn't interested in opengl-less configuration, we shouldn't try either. Alex On Mon, 18 Oct 2021 at 15:53, Martin Jansa <Martin.Jansa@gmail.com> wrote: > * 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) > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > .../0001-Fix-build-without-opengl-or-es.patch | 133 ++++++++++++++++++ > meta/recipes-sato/webkit/webkitgtk_2.34.0.bb | 3 + > 2 files changed, 136 insertions(+) > create mode 100644 > meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch > > 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 @@ > +From 646e347c173dbb9782492ac7cb4f54b65533ba90 Mon Sep 17 00:00:00 2001 > +From: Martin Jansa <Martin.Jansa@gmail.com> > +Date: Sun, 17 Oct 2021 20:49:21 +0000 > +Subject: [PATCH] Fix build without opengl-or-es > + > +* fix build failure when opengl-or-es is disabled: > + 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, > + 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: > + > /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 > + 41 | #include <WebCore/CoordinatedGraphicsLayer.h> > + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + compilation terminated. > + > +* the CoordinatedGraphicsLayer.h header installation is controled by > + USE_COORDINATED_GRAPHICS in > webkitgtk-2.34.0/Source/WebCore/platform/TextureMapper.cmake > + but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was > enabled only inside > + if (USE_OPENGL_OR_ES) > + > +Upstream-Status: Pending > +--- > + .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- > + .../DrawingAreaProxyCoordinatedGraphics.h | 2 +- > + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | 2 +- > + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | 2 +- > + .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp | 4 ++-- > + .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 6 +++--- > + 6 files changed, 9 insertions(+), 9 deletions(-) > + > +diff --git > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > +index 038d9ee2..5e828a10 100644 > +--- > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > ++++ > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp > +@@ -152,7 +152,7 @@ void > DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBa > + #endif > + } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double > scale, FloatPoint origin) > + { > + send(Messages::DrawingArea::AdjustTransientZoom(scale, origin)); > +diff --git > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > +index b23a45ff..cd263402 100644 > +--- > a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > ++++ > b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h > +@@ -57,7 +57,7 @@ private: > + void waitForBackingStoreUpdateOnNextPaint() override; > + void setBackingStoreIsDiscardable(bool) override; > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void adjustTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + void commitTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + #endif > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > +index 33ac2e1d..42375784 100644 > +--- > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > ++++ > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp > +@@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate() > + displayTimerFired(); > + } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, > FloatPoint origin) > + { > + if (!m_transientZoom) { > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > +index d8dc6df7..c8322364 100644 > +--- > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > ++++ > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h > +@@ -84,7 +84,7 @@ private: > + void updateBackingStoreState(uint64_t backingStoreStateID, bool > respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const > WebCore::IntSize& scrollOffset) override; > + void didUpdate() override; > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void adjustTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + void commitTransientZoom(double scale, WebCore::FloatPoint origin) > override; > + #endif > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > +index f3304d10..ca0476ff 100644 > +--- > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > ++++ > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp > +@@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired() > + > + bool didSync = m_coordinator.flushPendingLayerChanges(flags); > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + // If we have an active transient zoom, we want the zoom to win over > any changes > + // that WebCore makes to the relevant layers, so re-apply our > changes after flushing. > + if (m_transientZoom) > +@@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint) > + } > + } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, > FloatPoint origin) const > + { > + FrameView& frameView = *m_webPage.mainFrameView(); > +diff --git > a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > +index 4f727e41..b070266e 100644 > +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h > +@@ -37,7 +37,7 @@ > + #include <wtf/Forward.h> > + #include <wtf/OptionSet.h> > + #include <wtf/RunLoop.h> > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + #include <WebCore/CoordinatedGraphicsLayer.h> > + #endif > + > +@@ -100,7 +100,7 @@ public: > + > + WebCore::PlatformDisplayID displayID() const { return m_displayID; } > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + void adjustTransientZoom(double, WebCore::FloatPoint); > + void commitTransientZoom(double, WebCore::FloatPoint); > + #endif > +@@ -213,7 +213,7 @@ private: > + #endif // USE(COORDINATED_GRAPHICS) > + WebCore::PlatformDisplayID m_displayID; > + > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + bool m_transientZoom { false }; > + double m_transientZoomScale { 1 }; > + 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 \ > file://reduce-memory-overheads.patch \ > file://musl-lower-stack-usage.patch \ > file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \ > + file://0001-Fix-build-without-opengl-or-es.patch \ > " > > SRC_URI[sha256sum] = > "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34" > @@ -49,6 +50,7 @@ DEPENDS = " \ > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland > x11', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'webgl opengl', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', > 'webgl gles2 angle', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'opengl-or-es', '', d)} \ > enchant \ > libsecret \ > " > @@ -61,6 +63,7 @@ PACKAGECONFIG[enchant] = > "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant > PACKAGECONFIG[gles2] = > "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" > PACKAGECONFIG[webgl] = > "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" > PACKAGECONFIG[opengl] = > "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" > +PACKAGECONFIG[opengl-or-es] = > "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" > PACKAGECONFIG[libsecret] = > "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" > PACKAGECONFIG[libhyphen] = > "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" > PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" > -- > 2.32.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#157060): > https://lists.openembedded.org/g/openembedded-core/message/157060 > Mute This Topic: https://lists.openembedded.org/mt/86414212/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > > [-- Attachment #2: Type: text/html, Size: 14227 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-10-18 15:03 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 13:53 [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es Martin Jansa
2021-10-18 14:06 ` [OE-core] " Alexander Kanavin
2021-10-18 14:14 ` Martin Jansa
2021-10-18 14:15 ` Alexander Kanavin
2021-10-18 14:20 ` Martin Jansa
2021-10-18 14:31 ` Alexander Kanavin
2021-10-18 14:38 ` Martin Jansa
2021-10-18 14:45 ` Alexander Kanavin
2021-10-18 14:54 ` Martin Jansa
2021-10-18 15:03 ` Alexander Kanavin
[not found] ` <16AF25A15C500BAB.24927@lists.openembedded.org>
2021-10-18 14:20 ` Alexander Kanavin
2021-10-18 14:37 ` Martin Jansa
2021-10-18 14:37 ` Alexander Kanavin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.