From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC91AC4332F for ; Mon, 18 Oct 2021 14:37:51 +0000 (UTC) Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47]) by mx.groups.io with SMTP id smtpd.web12.37568.1634567870549382466 for ; Mon, 18 Oct 2021 07:37:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=A6AtxYjM; spf=pass (domain: gmail.com, ip: 209.85.222.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ua1-f47.google.com with SMTP id e10so6322053uab.3 for ; Mon, 18 Oct 2021 07:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gbnhrf2+e7T4+DBPGfdSaeTmmaU6/TDWHOxqbXou2LA=; b=A6AtxYjMvMiF+5jLzD0kbX8u8uB4skIBePv26vYWkr+9BR+m1v3Smu6HjCnQZdZ0XD XEcSKMMbst4feaiLSGBd1ow84UDzK6iOxJmfWJuvJF1Qtrlaf89yuoy4UqikyUWCyllm ECfie9DGn6ZI9PjRYCfMM3ZwWIZYOYO8zub8nCzo+u842VFSIbEoYbvoVScl/WyW5WG7 krACpumsocyXuef4Wg3yfmGjsMsZmC4G5JzlYciAP0zL2WcKtcaz+x+srh3aJoqUmz+i XZGCBnqBcn90AbEnZ/Neaxd1KXEUg6K/4S4Hpc1d7A7g8QHef/JW7lyiNwdmcY8BacwS /TBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gbnhrf2+e7T4+DBPGfdSaeTmmaU6/TDWHOxqbXou2LA=; b=UEHljnF8Ssg1CCEVS+EPv23bluyVL5DHywi9uCuHoHJi36eZCqtv3fbw39ikcOrsUd H5rm2E103E/WMJvsKp4eLf6jsbAYnoy0BLxw4MhbbDNQkM5EP3Qisx+kMHqGkX6Ge1gT 7Ui13OdaczR2b+M5ZPbP7Gp/79SlSsrNBtkwL7k+13IgrYCkKmTn0gItBO4ydrrBNzTE MkUNKmizRuotYhuQZaY1tr8UjnDOB/XyUWCfU/e4ZnljDiFstm6Jnne45gDUPzipx9rQ PYUNJH+Q3bFINxoMWwdxnIbxu3kkmNnfFzrY7hmBd3/IaftrFJ74ziQ/fBwQP7X1VDb6 ViIA== X-Gm-Message-State: AOAM532er3a6lfWa0miXyao16m+Ru8C+3BviOk0HgicigLHaJZMm2ulX 87biXqt6wtw4rufIqEBPyCqRZvK725OrbC67oyI= X-Google-Smtp-Source: ABdhPJw3TyLt5O4WSc2QPE9ECBDY7WQ2FcETjzHbxg8kiyBYoX0UlPtGIuuXW8CMvB5BJA8zozzoetj04yfEKAT6iPE= X-Received: by 2002:a05:6102:951:: with SMTP id a17mr27197493vsi.18.1634567869587; Mon, 18 Oct 2021 07:37:49 -0700 (PDT) MIME-Version: 1.0 References: <20211018135322.246963-1-Martin.Jansa@gmail.com> In-Reply-To: <20211018135322.246963-1-Martin.Jansa@gmail.com> From: Alexander Kanavin Date: Mon, 18 Oct 2021 16:37:38 +0200 Message-ID: Subject: Re: [OE-core] [PATCH] webkitgtk: add PACKAGECONFIG for opengl-or-es To: Martin Jansa Cc: OE-core Content-Type: multipart/alternative; boundary="0000000000003a62e005cea17d63" List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 18 Oct 2021 14:37:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/157073 --0000000000003a62e005cea17d63 Content-Type: text/plain; charset="UTF-8" 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 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 > --- > .../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 > +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 > + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + 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 > + #include > + #include > +-#if PLATFORM(GTK) > ++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) > + #include > + #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] > -=-=-=-=-=-=-=-=-=-=-=- > > --0000000000003a62e005cea17d63 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Perhaps the easiest way out is to just change:
<= div>REQUIRED_DISTRO_FEATURES =3D "${@bb.utils.contains('DISTRO_FEA= TURES', 'wayland', 'opengl', '', d)}"

to say 'opengl' unconditionally. If upstream d= oesn't test and isn't interested in opengl-less configuration, we s= houldn't try either.

Alex
<= br>
On Mon,= 18 Oct 2021 at 15:53, Martin Jansa <Martin.Jansa@gmail.com> wrote:
* added in:
=C2=A0 https://githu= b.com/WebKit/WebKit/commit/29421afdcd64250c839fc1dbf26c9089584e224c

* fixes build without opengl in DISTRO_FEATURES which was failing since upg= rade to 2.34.0 with:

| CMake Error at Source/cmake/OptionsGTK.cmake:353 (message):
|=C2=A0 =C2=A0Either GLX or EGL is needed.
| Call Stack (most recent call first):
|=C2=A0 =C2=A0Source/cmake/WebKitCommon.cmake:220 (include)
|=C2=A0 =C2=A0CMakeLists.txt:20 (include)

* and add a patch to fix building this version with opengl and gles disable= d
=C2=A0 (default oe-core setup without opengl in DISTRO_FEATURES)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
=C2=A0.../0001-Fix-build-without-opengl-or-es.patch | 133 +++++++++++++++++= +
=C2=A0meta/recipes-sato/webkit/webkitgtk_2.34.0.bb=C2=A0 |=C2=A0 =C2= =A03 +
=C2=A02 files changed, 136 insertions(+)
=C2=A0create 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-open= gl-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-e= s.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:
+=C2=A0 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,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0from = /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/buil= d/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-36.cpp:1: +=C2=A0 /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/L= ayerTreeHost.h:41:10: fatal error: WebCore/CoordinatedGraphicsLayer.h: No s= uch file or directory
+=C2=A0 =C2=A0 =C2=A041 | #include <WebCore/CoordinatedGraphicsLayer.h&g= t;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^~~~~~~~~~= ~~~~~~~~~~~~~~~~~~~~~~~~~~
+=C2=A0 compilation terminated.
+
+* the CoordinatedGraphicsLayer.h header installation is controled by
+=C2=A0 USE_COORDINATED_GRAPHICS in webkitgtk-2.34.0/Source/WebCore/platfor= m/TextureMapper.cmake
+=C2=A0 but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was e= nabled only inside
+=C2=A0 if (USE_OPENGL_OR_ES)
+
+Upstream-Status: Pending
+---
+ .../DrawingAreaProxyCoordinatedGraphics.cpp=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +-
+ .../DrawingAreaProxyCoordinatedGraphics.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +-
+ .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp=C2=A0 | 2 +- + .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h=C2=A0 =C2=A0 | 2= +-
+ .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 4 ++--
+ .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h=C2=A0 | 6 +++-= --
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyC= oordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/Drawin= gAreaProxyCoordinatedGraphics.cpp
+index 038d9ee2..5e828a10 100644
+--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordina= tedGraphics.cpp
++++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordina= tedGraphics.cpp
+@@ -152,7 +152,7 @@ void DrawingAreaProxyCoordinatedGraphics::setBackingSt= oreIsDiscardable(bool isBa
+ #endif
+ }
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+ void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double scal= e, FloatPoint origin)
+ {
+=C2=A0 =C2=A0 =C2=A0send(Messages::DrawingArea::AdjustTransientZoom(scale,= origin));
+diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyC= oordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingA= reaProxyCoordinatedGraphics.h
+index b23a45ff..cd263402 100644
+--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordina= tedGraphics.h
++++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordina= tedGraphics.h
+@@ -57,7 +57,7 @@ private:
+=C2=A0 =C2=A0 =C2=A0void waitForBackingStoreUpdateOnNextPaint() override;<= br> +=C2=A0 =C2=A0 =C2=A0void setBackingStoreIsDiscardable(bool) override;
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+=C2=A0 =C2=A0 =C2=A0void adjustTransientZoom(double scale, WebCore::FloatP= oint origin) override;
+=C2=A0 =C2=A0 =C2=A0void commitTransientZoom(double scale, WebCore::FloatP= oint origin) override;
+ #endif
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingA= reaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGr= aphics/DrawingAreaCoordinatedGraphics.cpp
+index 33ac2e1d..42375784 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoor= dinatedGraphics.cpp
++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoor= dinatedGraphics.cpp
+@@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate()
+=C2=A0 =C2=A0 =C2=A0displayTimerFired();
+ }
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+ void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, Fl= oatPoint origin)
+ {
+=C2=A0 =C2=A0 =C2=A0if (!m_transientZoom) {
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingA= reaCoordinatedGraphics.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGrap= hics/DrawingAreaCoordinatedGraphics.h
+index d8dc6df7..c8322364 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoor= dinatedGraphics.h
++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoor= dinatedGraphics.h
+@@ -84,7 +84,7 @@ private:
+=C2=A0 =C2=A0 =C2=A0void updateBackingStoreState(uint64_t backingStoreStat= eID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSi= ze&, const WebCore::IntSize& scrollOffset) override;
+=C2=A0 =C2=A0 =C2=A0void didUpdate() override;
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+=C2=A0 =C2=A0 =C2=A0void adjustTransientZoom(double scale, WebCore::FloatP= oint origin) override;
+=C2=A0 =C2=A0 =C2=A0void commitTransientZoom(double scale, WebCore::FloatP= oint origin) override;
+ #endif
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTre= eHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeH= ost.cpp
+index f3304d10..ca0476ff 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.c= pp
++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.c= pp
+@@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired()
+
+=C2=A0 =C2=A0 =C2=A0bool didSync =3D m_coordinator.flushPendingLayerChange= s(flags);
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+=C2=A0 =C2=A0 =C2=A0// If we have an active transient zoom, we want the zo= om to win over any changes
+=C2=A0 =C2=A0 =C2=A0// that WebCore makes to the relevant layers, so re-ap= ply our changes after flushing.
+=C2=A0 =C2=A0 =C2=A0if (m_transientZoom)
+@@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint)=
+=C2=A0 =C2=A0 =C2=A0}
+ }
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+ FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, Floa= tPoint origin) const
+ {
+=C2=A0 =C2=A0 =C2=A0FrameView& frameView =3D *m_webPage.mainFrameView(= );
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTre= eHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHos= t.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:
+
+=C2=A0 =C2=A0 =C2=A0WebCore::PlatformDisplayID displayID() const { return = m_displayID; }
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+=C2=A0 =C2=A0 =C2=A0void adjustTransientZoom(double, WebCore::FloatPoint);=
+=C2=A0 =C2=A0 =C2=A0void commitTransientZoom(double, WebCore::FloatPoint);=
+ #endif
+@@ -213,7 +213,7 @@ private:
+ #endif // USE(COORDINATED_GRAPHICS)
+=C2=A0 =C2=A0 =C2=A0WebCore::PlatformDisplayID m_displayID;
+
+-#if PLATFORM(GTK)
++#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
+=C2=A0 =C2=A0 =C2=A0bool m_transientZoom { false };
+=C2=A0 =C2=A0 =C2=A0double m_transientZoomScale { 1 };
+=C2=A0 =C2=A0 =C2=A0WebCore::FloatPoint m_transientZoomOrigin;
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb b/meta/recip= es-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 =3D "ht= tps://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://reduce-memory-overheads.pa= tch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://musl-lower-stack-usage.pat= ch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-ANGLE-do-not-enable-S= SE-on-x86.patch \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-Fix-build-without-ope= ngl-or-es.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "

=C2=A0SRC_URI[sha256sum] =3D "880c8ee626f67019f67557ca09e59a23ecf245e6= 0f6173215f1a8823cb09af34"
@@ -49,6 +50,7 @@ DEPENDS =3D " \
=C2=A0PACKAGECONFIG ??=3D "${@bb.utils.filter('DISTRO_FEATURES'= ;, 'systemd wayland x11', d)} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${@bb= .utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl= opengl', '', d)} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${@bb= .utils.contains('DISTRO_FEATURES', 'x11', '', '= webgl gles2 angle', d)} \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${@bb= .utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or= -es', '', d)} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 encha= nt \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 libse= cret \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"=
@@ -61,6 +63,7 @@ PACKAGECONFIG[enchant] =3D "-DENABLE_SPELLCHECK=3DON= ,-DENABLE_SPELLCHECK=3DOFF,enchant
=C2=A0PACKAGECONFIG[gles2] =3D "-DENABLE_GLES2=3DON,-DENABLE_GLES2=3DO= FF,virtual/libgles2"
=C2=A0PACKAGECONFIG[webgl] =3D "-DENABLE_WEBGL=3DON,-DENABLE_WEBGL=3DO= FF,virtual/libgl"
=C2=A0PACKAGECONFIG[opengl] =3D "-DENABLE_GRAPHICS_CONTEXT_GL=3DON,-DE= NABLE_GRAPHICS_CONTEXT_GL=3DOFF,virtual/libgl"
+PACKAGECONFIG[opengl-or-es] =3D "-DUSE_OPENGL_OR_ES=3DON,-DUSE_OPENGL= _OR_ES=3DOFF"
=C2=A0PACKAGECONFIG[libsecret] =3D "-DUSE_LIBSECRET=3DON,-DUSE_LIBSECR= ET=3DOFF,libsecret"
=C2=A0PACKAGECONFIG[libhyphen] =3D "-DUSE_LIBHYPHEN=3DON,-DUSE_LIBHYPH= EN=3DOFF,libhyphen"
=C2=A0PACKAGECONFIG[woff2] =3D "-DUSE_WOFF2=3DON,-DUSE_WOFF2=3DOFF,wof= f2"
--
2.32.0


-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-
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<= br> Unsubscribe: https://lists.openembedded.org/= g/openembedded-core/unsub [alex.kanavin@gmail.com]
-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-

--0000000000003a62e005cea17d63--