summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2023-02-13 09:11:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 10:21:34 +0000
commit84cf6120327219e2b9716b41b6b8d169cd8bcf6d (patch)
tree6b1e50c8c5d7ef349b5606bc6becd6f59c9a3c24 /meta/recipes-sato
parentc9273b8f2f3e9da409d457fa239c914c3435dc61 (diff)
downloadpoky-84cf6120327219e2b9716b41b6b8d169cd8bcf6d.tar.gz
webkitgtk: 2.38.3 -> 2.38.4
Update webkitgtk from 2.38.3 to 2.38.4. * remove 0001-When-building-introspection-files-do-not-quote-CFLAG.patch which has been merged in upstream What’s new in the WebKitGTK 2.38.4 release?[1] * Improve GStreamer multimedia playback across the board with improved codec selection logic, better handling of latency, and improving frame discard to avoid audio/video desynchronization, among other fixes. * Disable HLS media playback by default, which makes web sites use MSE instead. If needed WEBKIT_GST_ENABLE_HLS_SUPPORT=1 can be set in the environment to enable it back. * Disable threaded rendering in GTK4 builds by default, as it was causing crashes. * Fix MediaSession API not showing artwork images. * Fix MediaSession MPRIS usage when running inside a Flatpak sandbox. * Fix input element controls to correctly scale when applying a zoom factor different than the default. * Fix leakage of Web processes in certain situations. * Fix the injected bundle not being found when running inside a sandbox. * Fix the build with ENABLE_INTROSPECTION when cross-compiling. * FIx the build with ENABLE_WEBGL disabled. * Fix the build with GStreamer-based WebRTC enabled. * Fix the build with USE_GTK4 enabled. * Fix several crashes and rendering issues. [1]: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html (From OE-Core rev: a535ea38cb386f88afdfb086b07c047826368e9c) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch55
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.38.4.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.38.3.bb)3
2 files changed, 1 insertions, 57 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch
deleted file mode 100644
index 2dab00a075..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 89ac299e0d9436f1effaa07711458d616574cc8f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 4 Apr 2022 21:20:05 +0200
4Subject: [PATCH] Propagate CFLAGS to introspection targets
5
6Otherwise, important things do not get passed to the compiler in cross compiling with a sysroot scenario:
7
8In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7,
9 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34,
10 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/lib/glib-2.0/include/glibconfig.h:11,
11 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:32,
12 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32,
13 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30,
14 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2:
15/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:203:75: error: no include path in which to search for limits.h
16 203 | #include_next <limits.h> /* recurse down to the real one */
17 | ^
18In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32,
19 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30,
20 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2:
21/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:35:10: fatal error: time.h: No such file or directory
22 35 | #include <time.h>
23 | ^~~~~~~~
24compilation terminated.
25Traceback (most recent call last):
26 File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/unixccompiler.py", line 117, in _compile
27 self.spawn(compiler_so + cc_args + [src, '-o', obj] +
28 File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/ccompiler.py", line 910, in spawn
29 spawn(cmd, dry_run=self.dry_run)
30 File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/spawn.py", line 91, in spawn
31 raise DistutilsExecError(
32distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1
33
34Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/8290]
35Signed-off-by: Alexander Kanavin <alex@linutronix.de>
36
37
38Signed-off-by: Alexander Kanavin <alex@linutronix.de>
39---
40 Source/cmake/FindGI.cmake | 2 +-
41 1 file changed, 1 insertion(+), 1 deletion(-)
42
43diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
44index b3e810cd..e22a75f7 100644
45--- a/Source/cmake/FindGI.cmake
46+++ b/Source/cmake/FindGI.cmake
47@@ -340,7 +340,7 @@ function(GI_INTROSPECT namespace nsversion header)
48 DEPENDS ${gir_deps} ${gir_srcs}
49 VERBATIM
50 COMMAND_EXPAND_LISTS
51- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}"
52+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS}"
53 "${GI_SCANNER_EXE}" --quiet --warn-all --warn-error --no-libtool
54 "--output=${gir_path}"
55 "--library=$<TARGET_FILE_BASE_NAME:${opt_TARGET}>"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.38.4.bb
index 5d8d212871..cab91eec93 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.38.4.bb
@@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
12SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ 12SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ 13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
14 file://reproducibility.patch \ 14 file://reproducibility.patch \
15 file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
16 file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ 15 file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
17 file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ 16 file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \
18 " 17 "
19SRC_URI[sha256sum] = "41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a" 18SRC_URI[sha256sum] = "4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36"
20 19
21inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen 20inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
22 21