mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 14:19:52 +00:00
webkitgtk: upgrade 2.40.5 -> 2.42.0
- Add a packageconfig for jpegxl. This is done because it is requested by default and do_configure fails because we dont have a recipe for it in meta-oe - Refresh patches with devtool - Remove check-GST_GL_HAVE_PLATFORM_GLX.patch. The file has been reworked and it should hopefully not be needed anymore Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
Khem Raj
+3
-2
@@ -1,4 +1,4 @@
|
||||
From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001
|
||||
From 69d8e34f60e6a124f699365101e854076cfe0f1b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 27 Oct 2015 16:02:19 +0200
|
||||
Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
|
||||
@@ -9,12 +9,13 @@ reasons why this is not approproiate for upstream submission.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
Source/cmake/FindGI.cmake | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
|
||||
index af039cbb..b3e810cd 100644
|
||||
index fdc56b21..d42eca52 100644
|
||||
--- a/Source/cmake/FindGI.cmake
|
||||
+++ b/Source/cmake/FindGI.cmake
|
||||
@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
|
||||
|
||||
+9
-7
@@ -1,7 +1,8 @@
|
||||
From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001
|
||||
From e3c12b38037b4bb3053c440e4bd22c36c1dc576b 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] FELightningNEON.cpp fails to build, NEON fast path seems
|
||||
|
||||
unused https://bugs.webkit.org/show_bug.cgi?id=241182
|
||||
|
||||
Reviewed by NOBODY (OOPS!).
|
||||
@@ -33,6 +34,7 @@ left for a follow-up fix.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
.../cpu/arm/filters/FELightingNEON.cpp | 4 +-
|
||||
.../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++----------
|
||||
@@ -203,7 +205,7 @@ index b17c603d..e4629cda 100644
|
||||
-
|
||||
-#endif // FELightingNEON_h
|
||||
diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
|
||||
index 70c6512f..b032c82e 100644
|
||||
index 70f583b3..7d5d27e5 100644
|
||||
--- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h
|
||||
+++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
|
||||
@@ -26,6 +26,10 @@
|
||||
@@ -218,7 +220,7 @@ index 70c6512f..b032c82e 100644
|
||||
|
||||
class DistantLightSource : public LightSource {
|
||||
diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h
|
||||
index 53beb596..e78a9354 100644
|
||||
index 179edf6d..694d712d 100644
|
||||
--- a/Source/WebCore/platform/graphics/filters/FELighting.h
|
||||
+++ b/Source/WebCore/platform/graphics/filters/FELighting.h
|
||||
@@ -35,8 +35,6 @@
|
||||
@@ -229,8 +231,8 @@ index 53beb596..e78a9354 100644
|
||||
-
|
||||
class FELighting : public FilterEffect {
|
||||
public:
|
||||
const Color& lightingColor() const { return m_lightingColor; }
|
||||
@@ -64,11 +62,6 @@ protected:
|
||||
bool operator==(const FELighting&) const;
|
||||
@@ -68,11 +66,6 @@ protected:
|
||||
|
||||
std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override;
|
||||
|
||||
@@ -243,7 +245,7 @@ index 53beb596..e78a9354 100644
|
||||
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 3a5723f0..675d63f5 100644
|
||||
index a8cfdab8..34f867bb 100644
|
||||
--- a/Source/WebCore/platform/graphics/filters/PointLightSource.h
|
||||
+++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h
|
||||
@@ -26,6 +26,10 @@
|
||||
@@ -258,7 +260,7 @@ index 3a5723f0..675d63f5 100644
|
||||
|
||||
class PointLightSource : public LightSource {
|
||||
diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
|
||||
index 684626f7..dea58389 100644
|
||||
index 6404467a..5cac38f2 100644
|
||||
--- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h
|
||||
+++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
|
||||
@@ -26,6 +26,10 @@
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
From 3b25aac4240d8af8bed3b0113110b36980370a98 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Thu, 27 Jul 2023 22:09:06 +0200
|
||||
Subject: [PATCH] webkitgtk3: add recipe
|
||||
|
||||
Injection a year based on the current date isn't reproducible. Hack this
|
||||
to a specific year for now for reproducibilty and to avoid autobuilder failures.
|
||||
|
||||
@@ -7,10 +12,14 @@ then this could be submitted upstream, sadly my ruby isn't up to that.
|
||||
Upstream-Status: Pending [could be reworked]
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
|
||||
===================================================================
|
||||
--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb
|
||||
+++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
|
||||
---
|
||||
Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb
|
||||
index 6ed2b6e4..86a28286 100644
|
||||
--- a/Source/JavaScriptCore/generator/GeneratedFile.rb
|
||||
+++ b/Source/JavaScriptCore/generator/GeneratedFile.rb
|
||||
@@ -25,7 +25,7 @@ require 'date'
|
||||
require 'digest'
|
||||
|
||||
|
||||
+2
-2
@@ -13,9 +13,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
|
||||
file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
|
||||
file://reproducibility.patch \
|
||||
file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
|
||||
file://check-GST_GL_HAVE_PLATFORM_GLX.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f"
|
||||
SRC_URI[sha256sum] = "828f95935861fae583fb8f2ae58cf64c63c178ae2b7c2d6f73070813ad64ed1b"
|
||||
|
||||
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
|
||||
|
||||
@@ -61,6 +60,7 @@ PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/lib
|
||||
PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
|
||||
PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
|
||||
PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
|
||||
PACKAGECONFIG[jpegxl] = " -DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl"
|
||||
PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl"
|
||||
PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl"
|
||||
PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF"
|
||||
Reference in New Issue
Block a user