diff options
Diffstat (limited to 'poky/meta/recipes-sato/webkit')
| -rw-r--r-- | poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 8 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch | 37 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb (renamed from poky/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb) | 55 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb | 2 |
5 files changed, 32 insertions, 73 deletions
diff --git a/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb index 4680c1e95..6f2fe1df4 100644 --- a/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb +++ b/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb @@ -6,9 +6,6 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" DEPENDS = "virtual/egl libxkbcommon" -# Workaround build issue with RPi userland EGL libraries. -CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" - inherit cmake features_check REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch index 21828a7ec..6d7d7067e 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch @@ -1,4 +1,4 @@ -From 1a7becde0e508d7fac488bae6c08c1a4a0ac6b73 Mon Sep 17 00:00:00 2001 +From acf26a385d17a59ccd4b767d6303ec3dbf78e788 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 3 Feb 2020 17:06:27 -0800 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG @@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 1f500299..0771af9c 100644 +index f316f49..de81ce0 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() - SET_PROJECT_VERSION(2 32 2) + SET_PROJECT_VERSION(2 32 3) set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") +set(THREADS_PREFER_PTHREAD_FLAG ON) @@ -32,7 +32,7 @@ index 1f500299..0771af9c 100644 find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake -index 10664400..d9aca95a 100644 +index 1066440..d9aca95 100644 --- a/Source/cmake/OptionsJSCOnly.cmake +++ b/Source/cmake/OptionsJSCOnly.cmake @@ -1,3 +1,4 @@ diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch deleted file mode 100644 index b5367022d..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 834f335bb3e63e0bf78eed0520df33d5c55e5e8a Mon Sep 17 00:00:00 2001 -From: "commit-queue@webkit.org" - <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Sat, 10 Apr 2021 22:02:50 +0000 -Subject: [PATCH] Properly use CompletionHandler when USE_OPENGL_OR_ES is set - to OFF https://bugs.webkit.org/show_bug.cgi?id=224149 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Patch by Charlène Wendling <julianaito@posteo.jp> on 2021-04-10 -Reviewed by Fujii Hironori. - -* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h: -(WebKit::LayerTreeHost::forceRepaintAsync): - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@275802 268f45cc-cd09-0410-ab3c-d52691b4dbfc - -Upstream-Status: Backport -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - .../WebPage/CoordinatedGraphics/LayerTreeHost.h | 2 +- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -index 6727d16c8c0b..db65f813267d 100644 ---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { } - inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { } - inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { } - inline void LayerTreeHost::forceRepaint() { } --inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; } -+inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { } - inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { } - inline void LayerTreeHost::pauseRendering() { } - inline void LayerTreeHost::resumeRendering() { } diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb index 96b6cab49..c30bdf342 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb @@ -19,10 +19,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://reduce-memory-overheads.patch \ file://musl-lower-stack-usage.patch \ file://0001-MiniBrowser-Fix-reproduciblity.patch \ - file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \ " -SRC_URI[sha256sum] = "1790f86975bdef957ba9a12fc09202de8f55c885ee38467afc50d2bdb7a6c5cd" +SRC_URI[sha256sum] = "c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc @@ -79,61 +78,61 @@ EXTRA_OECMAKE = " \ " # Javascript JIT is not supported on ARC -EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " # By default 25-bit "medium" calls are used on ARC # which is not enough for binaries larger than 32 MiB -CFLAGS_append_arc = " -mlong-calls" -CXXFLAGS_append_arc = " -mlong-calls" +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" # Javascript JIT is not supported on powerpc -EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " # ARM JIT code does not build on ARMv4/5/6 anymore -EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " # JIT and gold linker does not work on RISCV -EXTRA_OECMAKE_append_riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" -EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" # JIT not supported on MIPS either -EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " # JIT not supported on X32 # An attempt was made to upstream JIT support for x32 in # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as # unresolved due to limited X32 adoption. -EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " -SECURITY_CFLAGS_remove_aarch64 = "-fpie" -SECURITY_CFLAGS_append_aarch64 = " -fPIE" +SECURITY_CFLAGS:remove:aarch64 = "-fpie" +SECURITY_CFLAGS:append:aarch64 = " -fPIE" -FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" +FILES:${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" -RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" +RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" # http://errors.yoctoproject.org/Errors/Details/20370/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 # https://bugs.webkit.org/show_bug.cgi?id=159880 # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). -ARM_INSTRUCTION_SET_armv7a = "thumb" -ARM_INSTRUCTION_SET_armv7r = "thumb" -ARM_INSTRUCTION_SET_armv7ve = "thumb" +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" # introspection inside qemu-arm hangs forever on musl/arm builds # therefore disable GI_DATA -GI_DATA_ENABLED_libc-musl_armv7a = "False" -GI_DATA_ENABLED_libc-musl_armv7ve = "False" +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" # Can't be built with ccache CCACHE_DISABLE = "1" diff --git a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb index 38a32dad1..4588ee10e 100644 --- a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb +++ b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" -DEPENDS_append_class-target = " wayland-native" +DEPENDS:append:class-target = " wayland-native" inherit meson features_check |