diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-11-27 11:17:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-30 08:43:04 +0000 |
commit | 4fbbc2609d877be9898d2651fe884ff216bed43e (patch) | |
tree | 5ffecfeef55df4835a26bd0e948cb7000a96a892 /meta/recipes-sato | |
parent | 4ab32e3f767807fe5404868c9fffdc89ced6858d (diff) | |
download | poky-4fbbc2609d877be9898d2651fe884ff216bed43e.tar.gz |
webkitgtk: update 2.40.5 -> 2.42.2
Drop check-GST_GL_HAVE_PLATFORM_GLX.patch as upstream removed the code.
(From OE-Core rev: 1c75e894226656a1fe5613c1a238c3303df82b1c)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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/0d3344e17d258106617b0e6d783d073b188a2548.patch | 15 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch | 33 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.42.2.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.40.5.bb) | 4 |
3 files changed, 10 insertions, 42 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch index 34e0ff9af3..e5ece82ed3 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001 | 1 | From 95398982f4a120147a98a27e176facf6d95b2bf7 Mon Sep 17 00:00:00 2001 |
2 | From: Adrian Perez de Castro <aperez@igalia.com> | 2 | From: Adrian Perez de Castro <aperez@igalia.com> |
3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 | 3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 |
4 | Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems | 4 | Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems |
@@ -33,6 +33,7 @@ left for a follow-up fix. | |||
33 | 33 | ||
34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] | 34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] |
35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
36 | |||
36 | --- | 37 | --- |
37 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- | 38 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- |
38 | .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- | 39 | .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- |
@@ -203,7 +204,7 @@ index b17c603d..e4629cda 100644 | |||
203 | - | 204 | - |
204 | -#endif // FELightingNEON_h | 205 | -#endif // FELightingNEON_h |
205 | diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 206 | diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
206 | index 70c6512f..b032c82e 100644 | 207 | index 70f583b3..7d5d27e5 100644 |
207 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 208 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
208 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 209 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
209 | @@ -26,6 +26,10 @@ | 210 | @@ -26,6 +26,10 @@ |
@@ -218,7 +219,7 @@ index 70c6512f..b032c82e 100644 | |||
218 | 219 | ||
219 | class DistantLightSource : public LightSource { | 220 | class DistantLightSource : public LightSource { |
220 | diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h | 221 | diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h |
221 | index 53beb596..e78a9354 100644 | 222 | index 179edf6d..694d712d 100644 |
222 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h | 223 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h |
223 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h | 224 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h |
224 | @@ -35,8 +35,6 @@ | 225 | @@ -35,8 +35,6 @@ |
@@ -229,8 +230,8 @@ index 53beb596..e78a9354 100644 | |||
229 | - | 230 | - |
230 | class FELighting : public FilterEffect { | 231 | class FELighting : public FilterEffect { |
231 | public: | 232 | public: |
232 | const Color& lightingColor() const { return m_lightingColor; } | 233 | bool operator==(const FELighting&) const; |
233 | @@ -64,11 +62,6 @@ protected: | 234 | @@ -68,11 +66,6 @@ protected: |
234 | 235 | ||
235 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; | 236 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; |
236 | 237 | ||
@@ -243,7 +244,7 @@ index 53beb596..e78a9354 100644 | |||
243 | float m_surfaceScale; | 244 | float m_surfaceScale; |
244 | float m_diffuseConstant; | 245 | float m_diffuseConstant; |
245 | diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h | 246 | diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h |
246 | index 3a5723f0..675d63f5 100644 | 247 | index a8cfdab8..34f867bb 100644 |
247 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h | 248 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h |
248 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h | 249 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h |
249 | @@ -26,6 +26,10 @@ | 250 | @@ -26,6 +26,10 @@ |
@@ -258,7 +259,7 @@ index 3a5723f0..675d63f5 100644 | |||
258 | 259 | ||
259 | class PointLightSource : public LightSource { | 260 | class PointLightSource : public LightSource { |
260 | diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 261 | diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
261 | index 684626f7..dea58389 100644 | 262 | index 6404467a..5cac38f2 100644 |
262 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 263 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
263 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 264 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
264 | @@ -26,6 +26,10 @@ | 265 | @@ -26,6 +26,10 @@ |
diff --git a/meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch b/meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch deleted file mode 100644 index ae99810ced..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/check-GST_GL_HAVE_PLATFORM_GLX.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Add additional check on GST_GL_HAVE_PLATFORM_GLX before using gst_gl_display_x11_new_with_display | ||
2 | |||
3 | This ensures that there is a compile time check for glx support in gstreamer as | ||
4 | runtime check is not enough because gst_gl_display_x11_new_with_display() API comes from | ||
5 | gst/gl/x11/gstgldisplay_x11.h which is only included when GST_GL_HAVE_PLATFORM_GLX is defined | ||
6 | therefore make this check consistent to fix build with some platforms which use pvr gl drivers | ||
7 | where this problem appear at compile time. | ||
8 | |||
9 | |||
10 | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/webkitgtk/2.40.2-r0/webkitgtk-2.40.2/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp:68:31: error: use of undeclared identifier 'gst_gl_display_x11_new_with_display'; did you mean 'gst_gl_display_egl_new_with_egl_display'? | ||
11 | 68 | return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native())); | ||
12 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
13 | | gst_gl_display_egl_new_with_egl_display | ||
14 | |||
15 | This issue is 2.40 specific since GLX support is removed [1] from trunk upstream, therefore | ||
16 | this patch wont be needed when upgrading to 2.42+ | ||
17 | |||
18 | [1] https://github.com/WebKit/WebKit/commit/320560f9e53ddcd53954059bd005e0c75eb91abf | ||
19 | |||
20 | Upstream-Status: Inappropriate [GLX support is gone in 2.41+] | ||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | |||
23 | --- a/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-02-20 01:22:18.917743700 -0800 | ||
24 | +++ b/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-07-08 08:45:09.739177065 -0700 | ||
25 | @@ -63,7 +63,7 @@ | ||
26 | if (glPlatform == GST_GL_PLATFORM_EGL) | ||
27 | return GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(sharedDisplay.eglDisplay())); | ||
28 | #endif | ||
29 | -#if USE(GLX) | ||
30 | +#if USE(GLX) && GST_GL_HAVE_PLATFORM_GLX | ||
31 | if (is<PlatformDisplayX11>(sharedDisplay) && glPlatform == GST_GL_PLATFORM_GLX) | ||
32 | return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native())); | ||
33 | #endif | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.40.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb index 0c54f202ca..2ba60eb65b 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.40.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb | |||
@@ -13,10 +13,9 @@ SRC_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://0d3344e17d258106617b0e6d783d073b188a2548.patch \ | 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ |
16 | file://check-GST_GL_HAVE_PLATFORM_GLX.patch \ | ||
17 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ | 16 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ |
18 | " | 17 | " |
19 | SRC_URI[sha256sum] = "7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f" | 18 | SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118" |
20 | 19 | ||
21 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 20 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
22 | 21 | ||
@@ -75,6 +74,7 @@ PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" | |||
75 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" | 74 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" |
76 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" | 75 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" |
77 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" | 76 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" |
77 | PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" | ||
78 | 78 | ||
79 | EXTRA_OECMAKE = " \ | 79 | EXTRA_OECMAKE = " \ |
80 | -DPORT=GTK \ | 80 | -DPORT=GTK \ |