* [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 @ 2022-05-18 14:19 Adrian Perez de Castro 2022-05-19 16:31 ` François Perrad 0 siblings, 1 reply; 12+ messages in thread From: Adrian Perez de Castro @ 2022-05-18 14:19 UTC (permalink / raw) To: buildroot; +Cc: Adrian Perez de Castro Bugfix release, mostly with build fixes, and an important fix for when using threaded rendering. Release notes: https://wpewebkit.org/release/wpewebkit-2.36.2.html This release fails to build when X11 headers are not present, but there is already a fix accepted upstream and slated for inclusion in the next release in the series, so in the meantime imported it locally. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> --- ...GLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch | 39 +++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 8 ++-- package/wpewebkit/wpewebkit.mk | 2 +- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch diff --git a/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch new file mode 100644 index 0000000000..0b6dd9bcb1 --- /dev/null +++ b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch @@ -0,0 +1,39 @@ +From 32135a4af7c2ea1db2ea528df9af0a331ca88dba Mon Sep 17 00:00:00 2001 +From: "zan@falconsigh.net" + <zan@falconsigh.net@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Tue, 12 Apr 2022 06:34:44 +0000 +Subject: [PATCH] [GTK][WPE] Build ANGLE with the + EGL_NO_PLATFORM_SPECIFIC_TYPES define + https://bugs.webkit.org/show_bug.cgi?id=239039 + +Reviewed by Adrian Perez de Castro. + +Specify the EGL_NO_PLATFORM_SPECIFIC_TYPES define when building ANGLE +subproject for the GTK and WPE ports. This should avoid searching for +platform-specific headers that might not be available at all during +build, e.g. the X11 headers which are used by default on UNIX platforms. + +* PlatformGTK.cmake: +* PlatformWPE.cmake: + +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> +Upstream status: https://bugs.webkit.org/show_bug.cgi?id=239039 +--- + Source/ThirdParty/ANGLE/ChangeLog | 15 +++++++++++++++ + Source/ThirdParty/ANGLE/PlatformGTK.cmake | 2 +- + Source/ThirdParty/ANGLE/PlatformWPE.cmake | 2 +- + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Source/ThirdParty/ANGLE/PlatformWPE.cmake b/Source/ThirdParty/ANGLE/PlatformWPE.cmake +index a4d0b959c62..8f5bff7f19a 100644 +--- a/Source/ThirdParty/ANGLE/PlatformWPE.cmake ++++ b/Source/ThirdParty/ANGLE/PlatformWPE.cmake +@@ -1,4 +1,4 @@ +-list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX) ++list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX EGL_NO_PLATFORM_SPECIFIC_TYPES) + include(linux.cmake) + + if (USE_OPENGL) +-- +2.36.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 3923c32111..d509ab091f 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums -md5 7ba1c7fd0f67891ad137d11cac12f7a9 wpewebkit-2.36.1.tar.xz -sha1 0918a4daded01f42e65ec02a69f21cd6705311db wpewebkit-2.36.1.tar.xz -sha256 ec83d8b2f8c3479ce9950d69440f3b9876ab70200fe6f4e07686054a0cba5723 wpewebkit-2.36.1.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.36.2.tar.xz.sums +md5 bcfb465ae085835ae96c68fddc85ca44 wpewebkit-2.36.2.tar.xz +sha1 1a5a6b7b5e94f4ea7e3462d6bdb5de7efa678f74 wpewebkit-2.36.2.tar.xz +sha256 959519562701e2005f2767a62e85977d6c3e65858709b376c89d8e33502febb9 wpewebkit-2.36.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 9c9a9a2838..ca26cb3f65 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.1 +WPEWEBKIT_VERSION = 2.36.2 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.36.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-18 14:19 [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 Adrian Perez de Castro @ 2022-05-19 16:31 ` François Perrad 2022-05-19 17:12 ` Adrian Perez de Castro 0 siblings, 1 reply; 12+ messages in thread From: François Perrad @ 2022-05-19 16:31 UTC (permalink / raw) To: buildroot; +Cc: Adrian Perez de Castro [-- Attachment #1.1: Type: text/plain, Size: 4779 bytes --] Le mer. 18 mai 2022 à 16:19, Adrian Perez de Castro <aperez@igalia.com> a écrit : > Bugfix release, mostly with build fixes, and an important fix for > when using threaded rendering. Release notes: > > https://wpewebkit.org/release/wpewebkit-2.36.2.html > > This release fails to build when X11 headers are not present, but there > is already a fix accepted upstream and slated for inclusion in the next > release in the series, so in the meantime imported it locally. > > webkitgtk 2.36.1 (from BR 2022.05-rc1) has also this issue. patch from https://bugs.webkit.org/show_bug.cgi?id=239039 solves it. François > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > --- > ...GLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch | 39 +++++++++++++++++++ > package/wpewebkit/wpewebkit.hash | 8 ++-- > package/wpewebkit/wpewebkit.mk | 2 +- > 3 files changed, 44 insertions(+), 5 deletions(-) > create mode 100644 > package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > > diff --git > a/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > new file mode 100644 > index 0000000000..0b6dd9bcb1 > --- /dev/null > +++ > b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > @@ -0,0 +1,39 @@ > +From 32135a4af7c2ea1db2ea528df9af0a331ca88dba Mon Sep 17 00:00:00 2001 > +From: "zan@falconsigh.net" > + <zan@falconsigh.net@268f45cc-cd09-0410-ab3c-d52691b4dbfc> > +Date: Tue, 12 Apr 2022 06:34:44 +0000 > +Subject: [PATCH] [GTK][WPE] Build ANGLE with the > + EGL_NO_PLATFORM_SPECIFIC_TYPES define > + https://bugs.webkit.org/show_bug.cgi?id=239039 > + > +Reviewed by Adrian Perez de Castro. > + > +Specify the EGL_NO_PLATFORM_SPECIFIC_TYPES define when building ANGLE > +subproject for the GTK and WPE ports. This should avoid searching for > +platform-specific headers that might not be available at all during > +build, e.g. the X11 headers which are used by default on UNIX platforms. > + > +* PlatformGTK.cmake: > +* PlatformWPE.cmake: > + > +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > +Upstream status: https://bugs.webkit.org/show_bug.cgi?id=239039 > +--- > + Source/ThirdParty/ANGLE/ChangeLog | 15 +++++++++++++++ > + Source/ThirdParty/ANGLE/PlatformGTK.cmake | 2 +- > + Source/ThirdParty/ANGLE/PlatformWPE.cmake | 2 +- > + 3 files changed, 17 insertions(+), 2 deletions(-) > + > +diff --git a/Source/ThirdParty/ANGLE/PlatformWPE.cmake > b/Source/ThirdParty/ANGLE/PlatformWPE.cmake > +index a4d0b959c62..8f5bff7f19a 100644 > +--- a/Source/ThirdParty/ANGLE/PlatformWPE.cmake > ++++ b/Source/ThirdParty/ANGLE/PlatformWPE.cmake > +@@ -1,4 +1,4 @@ > +-list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX) > ++list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX > EGL_NO_PLATFORM_SPECIFIC_TYPES) > + include(linux.cmake) > + > + if (USE_OPENGL) > +-- > +2.36.1 > + > diff --git a/package/wpewebkit/wpewebkit.hash > b/package/wpewebkit/wpewebkit.hash > index 3923c32111..d509ab091f 100644 > --- a/package/wpewebkit/wpewebkit.hash > +++ b/package/wpewebkit/wpewebkit.hash > @@ -1,7 +1,7 @@ > -# From https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums > -md5 <https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums-md5> > 7ba1c7fd0f67891ad137d11cac12f7a9 wpewebkit-2.36.1.tar.xz > -sha1 0918a4daded01f42e65ec02a69f21cd6705311db wpewebkit-2.36.1.tar.xz > -sha256 ec83d8b2f8c3479ce9950d69440f3b9876ab70200fe6f4e07686054a0cba5723 > wpewebkit-2.36.1.tar.xz > +# From https://wpewebkit.org/releases/wpewebkit-2.36.2.tar.xz.sums > +md5 <https://wpewebkit.org/releases/wpewebkit-2.36.2.tar.xz.sums+md5> > bcfb465ae085835ae96c68fddc85ca44 wpewebkit-2.36.2.tar.xz > +sha1 1a5a6b7b5e94f4ea7e3462d6bdb5de7efa678f74 wpewebkit-2.36.2.tar.xz > +sha256 959519562701e2005f2767a62e85977d6c3e65858709b376c89d8e33502febb9 > wpewebkit-2.36.2.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 > Source/WebCore/LICENSE-APPLE > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/ > wpewebkit.mk > index 9c9a9a2838..ca26cb3f65 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -WPEWEBKIT_VERSION = 2.36.1 > +WPEWEBKIT_VERSION = 2.36.2 > WPEWEBKIT_SITE = http://www.wpewebkit.org/releases > WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz > WPEWEBKIT_INSTALL_STAGING = YES > -- > 2.36.1 > > [-- Attachment #1.2: Type: text/html, Size: 6588 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-19 16:31 ` François Perrad @ 2022-05-19 17:12 ` Adrian Perez de Castro 2022-05-24 10:25 ` Michael Nosthoff via buildroot 2022-05-30 22:06 ` Adrian Perez de Castro 0 siblings, 2 replies; 12+ messages in thread From: Adrian Perez de Castro @ 2022-05-19 17:12 UTC (permalink / raw) To: François Perrad; +Cc: buildroot [-- Attachment #1.1: Type: text/plain, Size: 5729 bytes --] Hi, On Thu, 19 May 2022 18:31:30 +0200 François Perrad <francois.perrad@gadz.org> wrote: > Le mer. 18 mai 2022 à 16:19, Adrian Perez de Castro <aperez@igalia.com> a > écrit : > > > Bugfix release, mostly with build fixes, and an important fix for > > when using threaded rendering. Release notes: > > > > https://wpewebkit.org/release/wpewebkit-2.36.2.html > > > > This release fails to build when X11 headers are not present, but there > > is already a fix accepted upstream and slated for inclusion in the next > > release in the series, so in the meantime imported it locally. > > > > > webkitgtk 2.36.1 (from BR 2022.05-rc1) has also this issue. > patch from https://bugs.webkit.org/show_bug.cgi?id=239039 solves it. I was in the middle of preparing the 2.36.2 update for webkitgtk, which would include this patch as well; but then I found a different build issue. Then while looking into it Apple published a new list of security bugs, which means we need to make a new (which will be 2.36.3) for both ports including the fixes... so I have merged the build fix for the X11 headers in the release branch and we won't even need to import the patch in Buildroot. FWIW: let's not merge the 2.36.2 update for wpewebkit, because in a few days I will send anyway patches to go directly to 2.36.3 8-) > > > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > > --- > > ...GLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch | 39 +++++++++++++++++++ > > package/wpewebkit/wpewebkit.hash | 8 ++-- > > package/wpewebkit/wpewebkit.mk | 2 +- > > 3 files changed, 44 insertions(+), 5 deletions(-) > > create mode 100644 > > package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > > > > diff --git > > a/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > > b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > > new file mode 100644 > > index 0000000000..0b6dd9bcb1 > > --- /dev/null > > +++ > > b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch > > @@ -0,0 +1,39 @@ > > +From 32135a4af7c2ea1db2ea528df9af0a331ca88dba Mon Sep 17 00:00:00 2001 > > +From: "zan@falconsigh.net" > > + <zan@falconsigh.net@268f45cc-cd09-0410-ab3c-d52691b4dbfc> > > +Date: Tue, 12 Apr 2022 06:34:44 +0000 > > +Subject: [PATCH] [GTK][WPE] Build ANGLE with the > > + EGL_NO_PLATFORM_SPECIFIC_TYPES define > > + https://bugs.webkit.org/show_bug.cgi?id=239039 > > + > > +Reviewed by Adrian Perez de Castro. > > + > > +Specify the EGL_NO_PLATFORM_SPECIFIC_TYPES define when building ANGLE > > +subproject for the GTK and WPE ports. This should avoid searching for > > +platform-specific headers that might not be available at all during > > +build, e.g. the X11 headers which are used by default on UNIX platforms. > > + > > +* PlatformGTK.cmake: > > +* PlatformWPE.cmake: > > + > > +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > > +Upstream status: https://bugs.webkit.org/show_bug.cgi?id=239039 > > +--- > > + Source/ThirdParty/ANGLE/ChangeLog | 15 +++++++++++++++ > > + Source/ThirdParty/ANGLE/PlatformGTK.cmake | 2 +- > > + Source/ThirdParty/ANGLE/PlatformWPE.cmake | 2 +- > > + 3 files changed, 17 insertions(+), 2 deletions(-) > > + > > +diff --git a/Source/ThirdParty/ANGLE/PlatformWPE.cmake > > b/Source/ThirdParty/ANGLE/PlatformWPE.cmake > > +index a4d0b959c62..8f5bff7f19a 100644 > > +--- a/Source/ThirdParty/ANGLE/PlatformWPE.cmake > > ++++ b/Source/ThirdParty/ANGLE/PlatformWPE.cmake > > +@@ -1,4 +1,4 @@ > > +-list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX) > > ++list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX > > EGL_NO_PLATFORM_SPECIFIC_TYPES) > > + include(linux.cmake) > > + > > + if (USE_OPENGL) > > +-- > > +2.36.1 > > + > > diff --git a/package/wpewebkit/wpewebkit.hash > > b/package/wpewebkit/wpewebkit.hash > > index 3923c32111..d509ab091f 100644 > > --- a/package/wpewebkit/wpewebkit.hash > > +++ b/package/wpewebkit/wpewebkit.hash > > @@ -1,7 +1,7 @@ > > -# From https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums > > -md5 <https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums-md5> > > 7ba1c7fd0f67891ad137d11cac12f7a9 wpewebkit-2.36.1.tar.xz > > -sha1 0918a4daded01f42e65ec02a69f21cd6705311db wpewebkit-2.36.1.tar.xz > > -sha256 ec83d8b2f8c3479ce9950d69440f3b9876ab70200fe6f4e07686054a0cba5723 > > wpewebkit-2.36.1.tar.xz > > +# From https://wpewebkit.org/releases/wpewebkit-2.36.2.tar.xz.sums > > +md5 <https://wpewebkit.org/releases/wpewebkit-2.36.2.tar.xz.sums+md5> > > bcfb465ae085835ae96c68fddc85ca44 wpewebkit-2.36.2.tar.xz > > +sha1 1a5a6b7b5e94f4ea7e3462d6bdb5de7efa678f74 wpewebkit-2.36.2.tar.xz > > +sha256 959519562701e2005f2767a62e85977d6c3e65858709b376c89d8e33502febb9 > > wpewebkit-2.36.2.tar.xz > > > > # Hashes for license files: > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 > > Source/WebCore/LICENSE-APPLE > > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/ > > wpewebkit.mk > > index 9c9a9a2838..ca26cb3f65 100644 > > --- a/package/wpewebkit/wpewebkit.mk > > +++ b/package/wpewebkit/wpewebkit.mk > > @@ -4,7 +4,7 @@ > > # > > > > ################################################################################ > > > > -WPEWEBKIT_VERSION = 2.36.1 > > +WPEWEBKIT_VERSION = 2.36.2 > > WPEWEBKIT_SITE = http://www.wpewebkit.org/releases > > WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz > > WPEWEBKIT_INSTALL_STAGING = YES > > -- > > 2.36.1 > > > > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Cheers, —Adrián [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-19 17:12 ` Adrian Perez de Castro @ 2022-05-24 10:25 ` Michael Nosthoff via buildroot 2022-05-30 22:18 ` Adrian Perez de Castro 2022-05-30 22:06 ` Adrian Perez de Castro 1 sibling, 1 reply; 12+ messages in thread From: Michael Nosthoff via buildroot @ 2022-05-24 10:25 UTC (permalink / raw) To: Adrian Perez de Castro; +Cc: buildroot Hi Adrian, On Thursday, May 19, 2022 19:12 CEST, Adrian Perez de Castro <aperez@igalia.com> wrote: > Hi, > > On Thu, 19 May 2022 18:31:30 +0200 François Perrad <francois.perrad@gadz.org> wrote: > > Le mer. 18 mai 2022 à 16:19, Adrian Perez de Castro <aperez@igalia.com> a > > écrit : > > > > > Bugfix release, mostly with build fixes, and an important fix for > > > when using threaded rendering. Release notes: > > > > > > https://wpewebkit.org/release/wpewebkit-2.36.2.html > > > > > > This release fails to build when X11 headers are not present, but there > > > is already a fix accepted upstream and slated for inclusion in the next > > > release in the series, so in the meantime imported it locally. > > > > > > > > webkitgtk 2.36.1 (from BR 2022.05-rc1) has also this issue. > > patch from https://bugs.webkit.org/show_bug.cgi?id=239039 solves it. > > I was in the middle of preparing the 2.36.2 update for webkitgtk, which > would include this patch as well; but then I found a different build > issue. Then while looking into it Apple published a new list of security > bugs, which means we need to make a new (which will be 2.36.3) for both > ports including the fixes... so I have merged the build fix for the X11 > headers in the release branch and we won't even need to import the patch > in Buildroot. > > FWIW: let's not merge the 2.36.2 update for wpewebkit, because in a few > days I will send anyway patches to go directly to 2.36.3 > I just tested the 2022.05-rc1 + this patch with my config. The patch solved the X11 headers build error but I'm getting two other errors. (This applies to 2.36.1 as well as 2.36.2, both patched) The first one "disappears" when I issue "make wpewebkit" a second time, so I guess this is a concurrency issue in the build setup: [ 39%] Built target JavaScriptCore_CopyPrivateHeaders Scanning dependencies of target jsc make[4]: *** No rule to make target 'Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o', needed by 'bin/jsc'. Stop. make[4]: *** Waiting for unfinished jobs.... [ 39%] Building CXX object Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/__/jsc.cpp.o make[3]: *** [CMakeFiles/Makefile2:794: Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/all] Error 2 make[3]: *** Waiting for unfinished jobs.... Scanning dependencies of target LowLevelInterpreterLib [ 39%] Building CXX object Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o [ 39%] Built target LowLevelInterpreterLib [ 39%] Built target WebInspectorUI make[2]: *** [Makefile:171: all] Error 2 and the build ultimately then later fails with this error: [ 48%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-cbdfe323-42.cpp.o In file included from platform/graphics/filters/FESpecularLighting.h:25, from svg/SVGFESpecularLightingElement.h:25, from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.h:26, from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.cpp:22, from ../../WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp:5: platform/graphics/filters/FELighting.h:72:41: error: ‘LightingData’ does not name a type 72 | inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); | ^~~~~~~~~~~~ make[4]: *** [Source/WebCore/CMakeFiles/WebCore.dir/build.make:5152: Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp.o] Error 1 I tried to find it in the webkit bugtracker but was not successful. My WPE defconfig is BR2_PACKAGE_WPEWEBKIT=y BR2_PACKAGE_WPEWEBKIT_SANDBOX=y with the arm gcc 10.3 toolchain. do you have any idea if this might be fixed in the upcoming 2.36.3? Regards, Michael _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-24 10:25 ` Michael Nosthoff via buildroot @ 2022-05-30 22:18 ` Adrian Perez de Castro 2022-05-31 9:14 ` Michael Nosthoff via buildroot 0 siblings, 1 reply; 12+ messages in thread From: Adrian Perez de Castro @ 2022-05-30 22:18 UTC (permalink / raw) To: Michael Nosthoff; +Cc: buildroot [-- Attachment #1.1: Type: text/plain, Size: 4881 bytes --] Hello Michael, On Tue, 24 May 2022 12:25:51 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > On Thursday, May 19, 2022 19:12 CEST, Adrian Perez de Castro <aperez@igalia.com> wrote: > > > On Thu, 19 May 2022 18:31:30 +0200 François Perrad <francois.perrad@gadz.org> wrote: > > > Le mer. 18 mai 2022 à 16:19, Adrian Perez de Castro <aperez@igalia.com> a > > > écrit : > > > > > > > Bugfix release, mostly with build fixes, and an important fix for > > > > when using threaded rendering. Release notes: > > > > > > > > https://wpewebkit.org/release/wpewebkit-2.36.2.html > > > > > > > > This release fails to build when X11 headers are not present, but there > > > > is already a fix accepted upstream and slated for inclusion in the next > > > > release in the series, so in the meantime imported it locally. > > > > > > > > > > > webkitgtk 2.36.1 (from BR 2022.05-rc1) has also this issue. > > > patch from https://bugs.webkit.org/show_bug.cgi?id=239039 solves it. > > > > I was in the middle of preparing the 2.36.2 update for webkitgtk, which > > would include this patch as well; but then I found a different build > > issue. Then while looking into it Apple published a new list of security > > bugs, which means we need to make a new (which will be 2.36.3) for both > > ports including the fixes... so I have merged the build fix for the X11 > > headers in the release branch and we won't even need to import the patch > > in Buildroot. > > > > FWIW: let's not merge the 2.36.2 update for wpewebkit, because in a few > > days I will send anyway patches to go directly to 2.36.3 > > > > I just tested the 2022.05-rc1 + this patch with my config. > > The patch solved the X11 headers build error but I'm getting two other errors. > > (This applies to 2.36.1 as well as 2.36.2, both patched) > > The first one "disappears" when I issue "make wpewebkit" a second time, so I guess this > is a concurrency issue in the build setup: > > [ 39%] Built target JavaScriptCore_CopyPrivateHeaders > Scanning dependencies of target jsc > make[4]: *** No rule to make target 'Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o', needed by 'bin/jsc'. Stop. > make[4]: *** Waiting for unfinished jobs.... > [ 39%] Building CXX object Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/__/jsc.cpp.o > make[3]: *** [CMakeFiles/Makefile2:794: Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/all] Error 2 > make[3]: *** Waiting for unfinished jobs.... > Scanning dependencies of target LowLevelInterpreterLib > [ 39%] Building CXX object Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o > [ 39%] Built target LowLevelInterpreterLib > [ 39%] Built target WebInspectorUI > make[2]: *** [Makefile:171: all] Error 2 > > and the build ultimately then later fails with this error: > > [ 48%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-cbdfe323-42.cpp.o > In file included from platform/graphics/filters/FESpecularLighting.h:25, > from svg/SVGFESpecularLightingElement.h:25, > from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.h:26, > from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.cpp:22, > from ../../WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp:5: > platform/graphics/filters/FELighting.h:72:41: error: ‘LightingData’ does not name a type > 72 | inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); > | ^~~~~~~~~~~~ > make[4]: *** [Source/WebCore/CMakeFiles/WebCore.dir/build.make:5152: Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp.o] Error 1 > > I tried to find it in the webkit bugtracker but was not successful. We have had a few bugs related to the filters code in the past when targeting 32-bit ARM, specially the NEON fast-paths which do not get regularly built by buildbots on each WebKit commit. > My WPE defconfig is > > BR2_PACKAGE_WPEWEBKIT=y > BR2_PACKAGE_WPEWEBKIT_SANDBOX=y > > with the arm gcc 10.3 toolchain. Can you confirm that you are targeting some 32-bit ARM processor? If yes, does it have NEON support? Alternatively, if you can share a .config, or use “make savedefconfig” and share the output, that will make it much easier for me to reproduce the issue and find a suitable fix. > do you have any idea if this might be fixed in the upcoming 2.36.3? Most likely not. It might be fixed by chance due to shifting in the sources which get included in each unified-source compilation unit, tho -- but once I have a way to reproduce, I am confident it can be solved. Cheers, —Adrián [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-30 22:18 ` Adrian Perez de Castro @ 2022-05-31 9:14 ` Michael Nosthoff via buildroot 2022-06-01 7:39 ` Adrian Perez de Castro 0 siblings, 1 reply; 12+ messages in thread From: Michael Nosthoff via buildroot @ 2022-05-31 9:14 UTC (permalink / raw) To: Adrian Perez de Castro; +Cc: buildroot Hi Adrian, On Tuesday, May 31, 2022 00:18 CEST, Adrian Perez de Castro <aperez@igalia.com> wrote: > Hello Michael, > > On Tue, 24 May 2022 12:25:51 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > > > > > I just tested the 2022.05-rc1 + this patch with my config. > > > > The patch solved the X11 headers build error but I'm getting two other errors. > > > > (This applies to 2.36.1 as well as 2.36.2, both patched) > > > > The first one "disappears" when I issue "make wpewebkit" a second time, so I guess this > > is a concurrency issue in the build setup: > > > > [ 39%] Built target JavaScriptCore_CopyPrivateHeaders > > Scanning dependencies of target jsc > > make[4]: *** No rule to make target 'Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o', needed by 'bin/jsc'. Stop. > > make[4]: *** Waiting for unfinished jobs.... > > [ 39%] Building CXX object Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/__/jsc.cpp.o > > make[3]: *** [CMakeFiles/Makefile2:794: Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/all] Error 2 > > make[3]: *** Waiting for unfinished jobs.... > > Scanning dependencies of target LowLevelInterpreterLib > > [ 39%] Building CXX object Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o > > [ 39%] Built target LowLevelInterpreterLib > > [ 39%] Built target WebInspectorUI > > make[2]: *** [Makefile:171: all] Error 2 > > > > and the build ultimately then later fails with this error: > > > > [ 48%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-cbdfe323-42.cpp.o > > In file included from platform/graphics/filters/FESpecularLighting.h:25, > > from svg/SVGFESpecularLightingElement.h:25, > > from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.h:26, > > from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.cpp:22, > > from ../../WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp:5: > > platform/graphics/filters/FELighting.h:72:41: error: ‘LightingData’ does not name a type > > 72 | inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); > > | ^~~~~~~~~~~~ > > make[4]: *** [Source/WebCore/CMakeFiles/WebCore.dir/build.make:5152: Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp.o] Error 1 > > > > I tried to find it in the webkit bugtracker but was not successful. > > We have had a few bugs related to the filters code in the past when > targeting 32-bit ARM, specially the NEON fast-paths which do not get > regularly built by buildbots on each WebKit commit. > > > My WPE defconfig is > > > > BR2_PACKAGE_WPEWEBKIT=y > > BR2_PACKAGE_WPEWEBKIT_SANDBOX=y > > > > with the arm gcc 10.3 toolchain. > > Can you confirm that you are targeting some 32-bit ARM processor? If > yes, does it have NEON support? Alternatively, if you can share a > .config, or use “make savedefconfig” and share the output, that will > make it much easier for me to reproduce the issue and find a suitable > fix. > > > do you have any idea if this might be fixed in the upcoming 2.36.3? > > Most likely not. It might be fixed by chance due to shifting in the > sources which get included in each unified-source compilation unit, > tho -- but once I have a way to reproduce, I am confident it can be > solved. I tried with the latest master branch (with 2.36.3) and extended the raspberrypi4_defconfig with graphics driver. This is the defconfig: BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_TOOLCHAIN_EXTERNAL=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_COG=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" BR2_PACKAGE_WPEWEBKIT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y It fails with the same errors I listed above. Regards, Michael _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-31 9:14 ` Michael Nosthoff via buildroot @ 2022-06-01 7:39 ` Adrian Perez de Castro 2022-06-01 14:18 ` Adrian Perez de Castro 0 siblings, 1 reply; 12+ messages in thread From: Adrian Perez de Castro @ 2022-06-01 7:39 UTC (permalink / raw) To: Michael Nosthoff; +Cc: buildroot [-- Attachment #1.1: Type: text/plain, Size: 4271 bytes --] Hello Michael, On Tue, 31 May 2022 11:14:57 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > On Tuesday, May 31, 2022 00:18 CEST, Adrian Perez de Castro <aperez@igalia.com> wrote: > > > Hello Michael, > > > > On Tue, 24 May 2022 12:25:51 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > > > > > > > > I just tested the 2022.05-rc1 + this patch with my config. > > > > > > The patch solved the X11 headers build error but I'm getting two other errors. > > > > > > (This applies to 2.36.1 as well as 2.36.2, both patched) > > > > > > The first one "disappears" when I issue "make wpewebkit" a second time, so I guess this > > > is a concurrency issue in the build setup: > > > > > > [ 39%] Built target JavaScriptCore_CopyPrivateHeaders > > > Scanning dependencies of target jsc > > > make[4]: *** No rule to make target 'Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o', needed by 'bin/jsc'. Stop. > > > make[4]: *** Waiting for unfinished jobs.... > > > [ 39%] Building CXX object Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/__/jsc.cpp.o > > > make[3]: *** [CMakeFiles/Makefile2:794: Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/all] Error 2 > > > make[3]: *** Waiting for unfinished jobs.... > > > Scanning dependencies of target LowLevelInterpreterLib > > > [ 39%] Building CXX object Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o > > > [ 39%] Built target LowLevelInterpreterLib > > > [ 39%] Built target WebInspectorUI > > > make[2]: *** [Makefile:171: all] Error 2 > > > > > > and the build ultimately then later fails with this error: > > > > > > [ 48%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-cbdfe323-42.cpp.o > > > In file included from platform/graphics/filters/FESpecularLighting.h:25, > > > from svg/SVGFESpecularLightingElement.h:25, > > > from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.h:26, > > > from ../../WebCore/DerivedSources/JSSVGFESpecularLightingElement.cpp:22, > > > from ../../WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp:5: > > > platform/graphics/filters/FELighting.h:72:41: error: ‘LightingData’ does not name a type > > > 72 | inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); > > > | ^~~~~~~~~~~~ > > > make[4]: *** [Source/WebCore/CMakeFiles/WebCore.dir/build.make:5152: Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-119.cpp.o] Error 1 > > > > > > I tried to find it in the webkit bugtracker but was not successful. > > > > We have had a few bugs related to the filters code in the past when > > targeting 32-bit ARM, specially the NEON fast-paths which do not get > > regularly built by buildbots on each WebKit commit. > > > > > My WPE defconfig is > > > > > > BR2_PACKAGE_WPEWEBKIT=y > > > BR2_PACKAGE_WPEWEBKIT_SANDBOX=y > > > > > > with the arm gcc 10.3 toolchain. > > > > Can you confirm that you are targeting some 32-bit ARM processor? If > > yes, does it have NEON support? Alternatively, if you can share a > > .config, or use “make savedefconfig” and share the output, that will > > make it much easier for me to reproduce the issue and find a suitable > > fix. > > > > > do you have any idea if this might be fixed in the upcoming 2.36.3? > > > > Most likely not. It might be fixed by chance due to shifting in the > > sources which get included in each unified-source compilation unit, > > tho -- but once I have a way to reproduce, I am confident it can be > > solved. > > I tried with the latest master branch (with 2.36.3) and extended the raspberrypi4_defconfig with graphics driver. > > This is the defconfig: > > [...] Thanks a lot for sharing your config, that was most helpful! I have been able to reproduce the build issue and I am already working on a fix, which will make it into the 2.36.4 release in some weeks. In the meantime I will submit a fix to have the patch in Buildroot. Cheers, —Adrián [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-06-01 7:39 ` Adrian Perez de Castro @ 2022-06-01 14:18 ` Adrian Perez de Castro 2022-06-11 0:06 ` Adrian Perez de Castro 0 siblings, 1 reply; 12+ messages in thread From: Adrian Perez de Castro @ 2022-06-01 14:18 UTC (permalink / raw) To: Michael Nosthoff; +Cc: buildroot [-- Attachment #1.1: Type: text/plain, Size: 914 bytes --] Hi again, On Wed, 01 Jun 2022 10:39:05 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote: > On Tue, 31 May 2022 11:14:57 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > > > > [...] > > > > I tried with the latest master branch (with 2.36.3) and extended the raspberrypi4_defconfig with graphics driver. > > > > This is the defconfig: > > > > [...] > > Thanks a lot for sharing your config, that was most helpful! I have been > able to reproduce the build issue and I am already working on a fix, > which will make it into the 2.36.4 release in some weeks. In the > meantime I will submit a fix to have the patch in Buildroot. I am still working through finishing and testing a fix, but I have already filed an issue in Bugzilla to track this. Feel free to subscribe to the issue [1] to follow along :) Cheers, —Adrián --- [1] https://bugs.webkit.org/show_bug.cgi?id=241182 [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-06-01 14:18 ` Adrian Perez de Castro @ 2022-06-11 0:06 ` Adrian Perez de Castro 2022-06-11 9:14 ` André Zwing 0 siblings, 1 reply; 12+ messages in thread From: Adrian Perez de Castro @ 2022-06-11 0:06 UTC (permalink / raw) To: Michael Nosthoff; +Cc: buildroot [-- Attachment #1.1.1: Type: text/plain, Size: 1400 bytes --] Hi Michael, On Wed, 01 Jun 2022 17:18:28 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote: > Hi again, > > On Wed, 01 Jun 2022 10:39:05 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote: > > > On Tue, 31 May 2022 11:14:57 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > > > > > > [...] > > > > > > I tried with the latest master branch (with 2.36.3) and extended the raspberrypi4_defconfig with graphics driver. > > > > > > This is the defconfig: > > > > > > [...] > > > > Thanks a lot for sharing your config, that was most helpful! I have been > > able to reproduce the build issue and I am already working on a fix, > > which will make it into the 2.36.4 release in some weeks. In the > > meantime I will submit a fix to have the patch in Buildroot. > > I am still working through finishing and testing a fix, but I have > already filed an issue in Bugzilla to track this. Feel free to subscribe > to the issue [1] to follow along :) The patch I am working on still needs a bit of work [1], but in its current status it can already be used. I am attaching a version of it that will apply cleanly on top of the 2.36.3 release, which you can drop into the package/wpewebkit/ subdirectory of the Buildroot tree. I hope this helps, > --- > [1] https://bugs.webkit.org/show_bug.cgi?id=241182 —Adrián --- [1] https://github.com/WebKit/WebKit/pull/1233 [-- Attachment #1.1.2: 0001-ARM-NEON-FELightningNEON.cpp-fails-to-build-NEON-fas.patch --] [-- Type: text/plain, Size: 14042 bytes --] From 0d3344e17d258106617b0e6d783d073b188a2548 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro <aperez@igalia.com> Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] [ARM][NEON] FELightningNEON.cpp fails to build, NEON fast path seems unused https://bugs.webkit.org/show_bug.cgi?id=241182 Reviewed by NOBODY (OOPS!). Move the NEON fast path for the SVG lighting filter effects into FELightingSoftwareApplier, and arrange to actually use them by forwarding calls to applyPlatformGeneric() into applyPlatformNeon(). Some changes were needed to adapt platformApplyNeon() to the current state of filters after r286140. This was not detected because the code bitrotted due to it being guarded with CPU(ARM_TRADITIONAL), which does not get used much these days: CPU(ARM_THUMB2) is more common. It should be possible to use the NEON fast paths also in Thumb mode, but that is left for a follow-up fix. * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp: (WebCore::FELightingSoftwareApplier::platformApplyNeonWorker): (WebCore::FELightingSoftwareApplier::getPowerCoefficients): (WebCore::FELighting::platformApplyNeonWorker): Deleted. (WebCore::FELighting::getPowerCoefficients): Deleted. * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h: (WebCore::FELightingSoftwareApplier::applyPlatformNeon): (WebCore::FELighting::platformApplyNeon): Deleted. * Source/WebCore/platform/graphics/filters/DistantLightSource.h: * Source/WebCore/platform/graphics/filters/FELighting.h: * Source/WebCore/platform/graphics/filters/PointLightSource.h: * Source/WebCore/platform/graphics/filters/SpotLightSource.h: * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: --- .../cpu/arm/filters/FELightingNEON.cpp | 4 +- .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ 7 files changed, 57 insertions(+), 36 deletions(-) diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp index f6ff8c20a5a8..42a97ffc5372 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() return s_FELightingConstantsForNeon; } -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) { neonDrawLighting(parameters); } @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL "b .lightStrengthCalculated" NL ); // NOLINT -int FELighting::getPowerCoefficients(float exponent) +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h index b17c603d40d3..c6d17f573eca 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FELightingNEON_h -#define FELightingNEON_h +#pragma once #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) -#include "FELighting.h" +#include "FELightingSoftwareApplier.h" +#include "ImageBuffer.h" #include "PointLightSource.h" #include "SpotLightSource.h" +#include <wtf/ObjectIdentifier.h> #include <wtf/ParallelJobs.h> namespace WebCore { @@ -93,14 +94,14 @@ extern "C" { void neonDrawLighting(FELightingPaintingDataForNeon*); } -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { - data.pixels->data(), + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->bytes(), 1, - data.widthDecreasedByOne - 1, - data.heightDecreasedByOne - 1, + data.width - 2, + data.height - 2, 0, 0, 0, @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; - auto color = m_lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved(); + auto color = data.lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved(); floatArguments.colorRed = color.red; floatArguments.colorGreen = color.green; floatArguments.colorBlue = color.blue; floatArguments.padding4 = 0; - if (m_lightSource->type() == LS_POINT) { + if (data.lightSource->type() == LS_POINT) { neonData.flags |= FLAG_POINT_LIGHT; - PointLightSource& pointLightSource = static_cast<PointLightSource&>(m_lightSource.get()); + const auto& pointLightSource = *static_cast<const PointLightSource*>(data.lightSource); floatArguments.lightX = pointLightSource.position().x(); floatArguments.lightY = pointLightSource.position().y(); floatArguments.lightZ = pointLightSource.position().z(); floatArguments.padding2 = 0; - } else if (m_lightSource->type() == LS_SPOT) { + } else if (data.lightSource->type() == LS_SPOT) { neonData.flags |= FLAG_SPOT_LIGHT; - SpotLightSource& spotLightSource = static_cast<SpotLightSource&>(m_lightSource.get()); + const auto& spotLightSource = *static_cast<const SpotLightSource*>(data.lightSource); floatArguments.lightX = spotLightSource.position().x(); floatArguments.lightY = spotLightSource.position().y(); floatArguments.lightZ = spotLightSource.position().z(); @@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS if (spotLightSource.specularExponent() == 1) neonData.flags |= FLAG_CONE_EXPONENT_IS_1; } else { - ASSERT(m_lightSource->type() == LS_DISTANT); + ASSERT(data.lightSource->type() == LS_DISTANT); floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); @@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set lighting arguments. floatArguments.surfaceScale = data.surfaceScale; floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; - if (m_lightingType == FELighting::DiffuseLighting) - floatArguments.diffuseConstant = m_diffuseConstant; + if (data.filterType == FilterEffect::Type::FEDiffuseLighting) + floatArguments.diffuseConstant = data.diffuseConstant; else { neonData.flags |= FLAG_SPECULAR_LIGHT; - floatArguments.diffuseConstant = m_specularConstant; - neonData.specularExponent = getPowerCoefficients(m_specularExponent); - if (m_specularExponent == 1) + floatArguments.diffuseConstant = data.specularConstant; + neonData.specularExponent = getPowerCoefficients(data.specularExponent); + if (data.specularExponent == 1) neonData.flags |= FLAG_SPECULAR_EXPONENT_IS_1; } if (floatArguments.diffuseConstant == 1) neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; if (optimalThreadNumber > 1) { // Initialize parallel jobs - ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); + ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); // Fill the parameter array int job = parallelJobs.numberOfJobs(); if (job > 1) { int yStart = 1; - int yStep = (data.heightDecreasedByOne - 1) / job; + int yStep = (data.height - 2) / job; for (--job; job >= 0; --job) { FELightingPaintingDataForNeon& params = parallelJobs.parameter(job); params = neonData; params.yStart = yStart; - params.pixels += (yStart - 1) * (data.widthDecreasedByOne + 1) * 4; + params.pixels += (yStart - 1) * data.width * 4; if (job > 0) { params.absoluteHeight = yStep; yStart += yStep; } else - params.absoluteHeight = data.heightDecreasedByOne - yStart; + params.absoluteHeight = (data.height - 1) - yStart; } parallelJobs.execute(); return; @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h index 0660143fc1cf..2b1e86d99fa4 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h @@ -25,6 +25,10 @@ #include "LightSource.h" #include <wtf/Ref.h> +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h index 0c073bc13f8c..e0db00545c17 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ namespace WebCore { -struct FELightingPaintingDataForNeon; - class FELighting : public FilterEffect { public: const Color& lightingColor() const { return m_lightingColor; } @@ -67,11 +65,6 @@ protected: std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - static int getPowerCoefficients(float exponent); - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); -#endif - Color m_lightingColor; float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h index 5c9c7fb783e6..e53aa012ac1c 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include <wtf/Ref.h> +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h index 04e331ec4ec0..763c8d400b00 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include <wtf/Ref.h> +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h index c974d92115ff..e2896660cfbd 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ namespace WebCore { class FELighting; +struct FELightingPaintingDataForNeon; class FELightingSoftwareApplier final : public FilterEffectConcreteApplier<FELighting> { WTF_MAKE_FAST_ALLOCATED; @@ -132,8 +133,23 @@ private: static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); static void applyPlatformGenericWorker(ApplyParameters*); + +#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) + static int getPowerCoefficients(float exponent); + static void platformApplyNeonWorker(FELightingPaintingDataForNeon*); + inline static void applyPlatformNeon(const LightingData&, const LightSource::PaintingData&); + + inline static void applyPlatformGeneric(const LightingData& data, const LightSource::PaintingData& paintingData) + { + applyPlatformNeon(data, paintingData); + } +#else static void applyPlatformGeneric(const LightingData&, const LightSource::PaintingData&); +#endif + static void applyPlatform(const LightingData&); }; } // namespace WebCore + +#include "FELightingNEON.h" -- 2.36.1 [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-06-11 0:06 ` Adrian Perez de Castro @ 2022-06-11 9:14 ` André Zwing 0 siblings, 0 replies; 12+ messages in thread From: André Zwing @ 2022-06-11 9:14 UTC (permalink / raw) To: buildroot Am 11.06.22 um 02:06 schrieb Adrian Perez de Castro: > Hi Michael, > > On Wed, 01 Jun 2022 17:18:28 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote: >> Hi again, >> >> On Wed, 01 Jun 2022 10:39:05 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote: >> >>> On Tue, 31 May 2022 11:14:57 +0200 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: >>>> >>>> [...] >>>> >>>> I tried with the latest master branch (with 2.36.3) and extended the raspberrypi4_defconfig with graphics driver. >>>> >>>> This is the defconfig: >>>> >>>> [...] >>> >>> Thanks a lot for sharing your config, that was most helpful! I have been >>> able to reproduce the build issue and I am already working on a fix, >>> which will make it into the 2.36.4 release in some weeks. In the >>> meantime I will submit a fix to have the patch in Buildroot. >> >> I am still working through finishing and testing a fix, but I have >> already filed an issue in Bugzilla to track this. Feel free to subscribe >> to the issue [1] to follow along :) > > The patch I am working on still needs a bit of work [1], but in its > current status it can already be used. I am attaching a version of it > that will apply cleanly on top of the 2.36.3 release, which you can > drop into the package/wpewebkit/ subdirectory of the Buildroot tree. > > I hope this helps, > >> --- >> [1] https://bugs.webkit.org/show_bug.cgi?id=241182 > > —Adrián > > --- > [1] https://github.com/WebKit/WebKit/pull/1233 Hi, just wanted to add that I faced the same issue and am now trying your patch. Took me a while to find it (also due to the odd wpewebkit git setup), but thanks a lot! _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 2022-05-19 17:12 ` Adrian Perez de Castro 2022-05-24 10:25 ` Michael Nosthoff via buildroot @ 2022-05-30 22:06 ` Adrian Perez de Castro 1 sibling, 0 replies; 12+ messages in thread From: Adrian Perez de Castro @ 2022-05-30 22:06 UTC (permalink / raw) To: François Perrad; +Cc: buildroot [-- Attachment #1.1: Type: text/plain, Size: 1742 bytes --] Hello, all, On Thu, 19 May 2022 20:12:19 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote: > On Thu, 19 May 2022 18:31:30 +0200 François Perrad <francois.perrad@gadz.org> wrote: > > Le mer. 18 mai 2022 à 16:19, Adrian Perez de Castro <aperez@igalia.com> a > > écrit : > > > > > Bugfix release, mostly with build fixes, and an important fix for > > > when using threaded rendering. Release notes: > > > > > > https://wpewebkit.org/release/wpewebkit-2.36.2.html > > > > > > This release fails to build when X11 headers are not present, but there > > > is already a fix accepted upstream and slated for inclusion in the next > > > release in the series, so in the meantime imported it locally. > > > > > > > > webkitgtk 2.36.1 (from BR 2022.05-rc1) has also this issue. > > patch from https://bugs.webkit.org/show_bug.cgi?id=239039 solves it. > > I was in the middle of preparing the 2.36.2 update for webkitgtk, which > would include this patch as well; but then I found a different build > issue. Then while looking into it Apple published a new list of security > bugs, which means we need to make a new (which will be 2.36.3) for both > ports including the fixes... so I have merged the build fix for the X11 > headers in the release branch and we won't even need to import the patch > in Buildroot. > > FWIW: let's not merge the 2.36.2 update for wpewebkit, because in a few > days I will send anyway patches to go directly to 2.36.3 Done, here's the updates to 2.36.3 for both wpewebkit and webkitgtk: https://patchwork.ozlabs.org/project/buildroot/patch/20220530215627.1441783-1-aperez@igalia.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20220530220141.1445578-1-aperez@igalia.com/ Cheers, —Adrián [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 150 bytes --] _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 @ 2022-06-12 18:17 Michael Nosthoff via buildroot 0 siblings, 0 replies; 12+ messages in thread From: Michael Nosthoff via buildroot @ 2022-06-12 18:17 UTC (permalink / raw) To: Adrian Perez de Castro; +Cc: André Zwing, buildroot Hi Adrian, On Saturday, June 11, 2022 02:06 CEST, Adrian Perez de Castro <aperez@igalia.com> wrote: > > The patch I am working on still needs a bit of work [1], but in its > current status it can already be used. I am attaching a version of it > that will apply cleanly on top of the 2.36.3 release, which you can > drop into the package/wpewebkit/ subdirectory of the Buildroot tree. > thanks for the patch > I hope this helps, the old error is gone but unfortunately a new build error is now occuring: In file included from platform/graphics/filters/software/FELightingSoftwareApplier.h:155, from ./platform/graphics/filters/FELighting.cpp:31, from ../../WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-38.cpp:3: platform/graphics/cpu/arm/filters/FELightingNEON.h: In static member function ‘static void WebCore::FELightingSoftwareApplier::applyPlatformNeon(const WebCore::FELightingSoftwareApplier::LightingData&, const WebCore::LightSource::PaintingData&)’: platform/graphics/cpu/arm/filters/FELightingNEON.h:99:46: warning: attribute ignored [-Wattributes] 99 | WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; | ^~~~~~~ platform/graphics/cpu/arm/filters/FELightingNEON.h:99:46: note: an attribute that appertains to a type-specifier is ignored platform/graphics/cpu/arm/filters/FELightingNEON.h:101:22: error: ‘JSC::Uint8ClampedArray’ {aka ‘class JSC::GenericTypedArrayView<JSC::Uint8ClampedAdaptor>’} has no member named ‘bytes’ 101 | data.pixels->bytes(), | ^~~~~ make[4]: *** [Source/WebCore/CMakeFiles/WebCore.dir/build.make:9455: Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-38.cpp.o] Error 1 make[4]: *** Waiting for unfinished jobs.... (I just saw that Andre already mentioned that on the github PR) further the error requiring to start the build twice is still there: make[4]: *** No rule to make target 'Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o', needed by 'bin/jsc'. Stop. Tested with my local config (which uses the latest TI SGX driver for AM54xx which is not part of buildroot) as well as the raspberry pi 4 defconfig i sent before. Regards, Michael _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-06-12 18:17 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-05-18 14:19 [Buildroot] [PATCH 1/1] package/wpewebkit: bump to version 2.36.2 Adrian Perez de Castro 2022-05-19 16:31 ` François Perrad 2022-05-19 17:12 ` Adrian Perez de Castro 2022-05-24 10:25 ` Michael Nosthoff via buildroot 2022-05-30 22:18 ` Adrian Perez de Castro 2022-05-31 9:14 ` Michael Nosthoff via buildroot 2022-06-01 7:39 ` Adrian Perez de Castro 2022-06-01 14:18 ` Adrian Perez de Castro 2022-06-11 0:06 ` Adrian Perez de Castro 2022-06-11 9:14 ` André Zwing 2022-05-30 22:06 ` Adrian Perez de Castro 2022-06-12 18:17 Michael Nosthoff via buildroot
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.