[Buildroot] [PATCH 0/4] Update WPE WebKit, Cog, and their dependencies

[Buildroot] [PATCH 0/4] Update WPE WebKit, Cog, and their dependencies

[Adrian Perez de Castro]

Hi there,

WPE WebKit 2.32.0 was released by the end of March, but I have been waiting
for 2.32.1 before submitting a patch set to update. The reasons are mainly
two:

  - I knew that fixes to build WPE WebKit against Musl would land on time
    for 2.32.1; which allows removing a patch we have been carrying in
	Buildroot.
  - While working on the release candidates for WPEBackend-fdo, we found
    a number of regressions, which delayed things while trying to solve
	all the issues found. Except for a minor issue, the rest are now all
	solved in 1.9.92. This is still a release candidate, but very stable
	in my experience. If there are concerns with it, I can change the
	patch to use 1.8.4 instead, which has backports of the changes.

Cheers,
-Adrian


Adrian Perez de Castro (4):
  package/libwpe: bump to version 1.10.0
  package/wpebackend-fdo: bump to version 1.9.92
  package/wpewebkit: bump to version 2.32.1
  package/cog: bump to version 0.10.0

 package/cog/cog.hash                          |  8 +-
 package/cog/cog.mk                            |  2 +-
 ...ial-dependency-to-pass-EGL-module-fl.patch | 45 -----------
 package/libwpe/libwpe.hash                    |  8 +-
 package/libwpe/libwpe.mk                      |  2 +-
 package/wpebackend-fdo/wpebackend-fdo.hash    |  8 +-
 package/wpebackend-fdo/wpebackend-fdo.mk      |  2 +-
 .../wpewebkit/0001-Fix-build-with-musl.patch  | 79 -------------------
 package/wpewebkit/wpewebkit.hash              |  8 +-
 package/wpewebkit/wpewebkit.mk                |  2 +-
 10 files changed, 20 insertions(+), 144 deletions(-)
 delete mode 100644 package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch
 delete mode 100644 package/wpewebkit/0001-Fix-build-with-musl.patch

-- 
2.31.1

[Buildroot] [PATCH 1/4] package/libwpe: bump to version 1.10.0

[Adrian Perez de Castro]

Release notes:

  https://wpewebkit.org/release/libwpe-1.10.0.html

The patch is removed, as it has been included upstream.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...ial-dependency-to-pass-EGL-module-fl.patch | 45 -------------------
 package/libwpe/libwpe.hash                    |  8 ++--
 package/libwpe/libwpe.mk                      |  2 +-
 3 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch

diff --git a/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch b/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch
deleted file mode 100644
index e74ebe125e..0000000000
--- a/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 81bfedfa02fd864f3e4b295091d49c3eb20bb372 Mon Sep 17 00:00:00 2001
-From: Adrian Perez de Castro <aperez@igalia.com>
-Date: Wed, 16 Sep 2020 00:01:37 +0300
-Subject: [PATCH] meson: Use a partial dependency to pass EGL module flags
-
-Make Meson try to always find an "egl" dependency, if found extract
-the include directories and compiler flags from ir using a partial
-dependency, otherwise check that at least EGL/eglplatform.h is
-available when the pkg-config module is not found.
-
-Fixes #70
-
-Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
-[Upstrem status: https://github.com/WebPlatformForEmbedded/libwpe/pull/71]
-
----
- meson.build | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 5c88aed..a05f4ab 100644
---- a/meson.build
-+++ b/meson.build
-@@ -57,8 +57,16 @@ dependencies = [
- ]
- 
- cc = meson.get_compiler('c')
--if not cc.has_header('EGL/eglplatform.h')
--	dependencies += dependency('egl')
-+egl_dep = dependency('egl', required: false)
-+if egl_dep.found()
-+	dependencies += egl_dep.partial_dependency(
-+		compile_args: true,
-+		includes: true,
-+	)
-+else
-+	assert(cc.has_header('EGL/eglplatform.h'),
-+		'Required heaer <EGL/eglplatform.h> not found'
-+	)
- endif
- 
- if not cc.has_function('dlopen')
--- 
-2.28.0
-
diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash
index 36cdf56664..66fd168dc3 100644
--- a/package/libwpe/libwpe.hash
+++ b/package/libwpe/libwpe.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/libwpe-1.8.0.tar.xz.sums
-md5  328ea59dd8dee9107a49353536d00844  libwpe-1.8.0.tar.xz
-sha1  3c893b1e8118a06f082d98373e279a8f8e33750d  libwpe-1.8.0.tar.xz
-sha256  a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2  libwpe-1.8.0.tar.xz
+# From https://wpewebkit.org/releases/libwpe-1.10.0.tar.xz.sums
+md5  269ecb60d4ef80a0877d25a5828c8b82  libwpe-1.10.0.tar.xz
+sha1  b3f48a48b0401da19deb60cb8f15f193dff799c1  libwpe-1.10.0.tar.xz
+sha256  2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d  libwpe-1.10.0.tar.xz
 
 # Hashes for license files:
 sha256  35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b  COPYING
diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk
index 5843e84d39..43dc201f54 100644
--- a/package/libwpe/libwpe.mk
+++ b/package/libwpe/libwpe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBWPE_VERSION = 1.8.0
+LIBWPE_VERSION = 1.10.0
 LIBWPE_SITE = https://wpewebkit.org/releases
 LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz
 LIBWPE_INSTALL_STAGING = YES
-- 
2.31.1

[Buildroot] [PATCH 2/4] package/wpebackend-fdo: bump to version 1.9.92

[Adrian Perez de Castro]

Update to version 1.9.92 which, while even being a release candidate,
is more stable than the 1.8.1 present in Buildroot.

Release notes:

  https://wpewebkit.org/release/wpebackend-fdo-1.9.90.html
  https://wpewebkit.org/release/wpebackend-fdo-1.9.91.html
  https://wpewebkit.org/release/wpebackend-fdo-1.9.92.html

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++----
 package/wpebackend-fdo/wpebackend-fdo.mk   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash
index 27e827ae2e..28d6c36938 100644
--- a/package/wpebackend-fdo/wpebackend-fdo.hash
+++ b/package/wpebackend-fdo/wpebackend-fdo.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/wpebackend-fdo-1.8.3.tar.xz.sums
-md5  980cbda207bf8f6263799c5062425737  wpebackend-fdo-1.8.3.tar.xz
-sha1  c849043039d805448715be90cb5b3491f0a90c5f  wpebackend-fdo-1.8.3.tar.xz
-sha256  3d0b4282a1bd9e0664d7a20abe14e982f3285296ac62de56cae2a404b9d28b9e  wpebackend-fdo-1.8.3.tar.xz
+# From https://wpewebkit.org/releases/wpebackend-fdo-1.9.92.tar.xz.sums
+md5  5c2f7fab6623e0964bc0d1b4a01719f0  wpebackend-fdo-1.9.92.tar.xz
+sha1  d07fdfec0df53c57e3ed36a1efffecf30d1b418c  wpebackend-fdo-1.9.92.tar.xz
+sha256  fc5b388a91d6f2c22803e1a21a6759a314b4539e5169c6e272bfc953a05fbb85  wpebackend-fdo-1.9.92.tar.xz
 
 # Hashes for license files:
 sha256  c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825  COPYING
diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk
index 5f7e7acf30..4979dad8f9 100644
--- a/package/wpebackend-fdo/wpebackend-fdo.mk
+++ b/package/wpebackend-fdo/wpebackend-fdo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEBACKEND_FDO_VERSION = 1.8.3
+WPEBACKEND_FDO_VERSION = 1.9.92
 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases
 WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz
 WPEBACKEND_FDO_INSTALL_STAGING = YES
-- 
2.31.1

[Buildroot] [PATCH 3/4] package/wpewebkit: bump to version 2.32.1

[Adrian Perez de Castro]

Update to a new major release which brings in improvements and a few new
features. Release notes:

  https://wpewebkit.org/release/wpewebkit-2.32.0.html
  https://wpewebkit.org/release/wpewebkit-2.32.1.html

None of the new features in WPE WebKit 2.32.x need additional
dependencies.

The existing patch for Musl compatibility is not needed anymore because
a better solution has been accepted upstream and backported to be
included in the 2.32.1 release.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 .../wpewebkit/0001-Fix-build-with-musl.patch  | 79 -------------------
 package/wpewebkit/wpewebkit.hash              |  8 +-
 package/wpewebkit/wpewebkit.mk                |  2 +-
 3 files changed, 5 insertions(+), 84 deletions(-)
 delete mode 100644 package/wpewebkit/0001-Fix-build-with-musl.patch

diff --git a/package/wpewebkit/0001-Fix-build-with-musl.patch b/package/wpewebkit/0001-Fix-build-with-musl.patch
deleted file mode 100644
index 705c67c7f6..0000000000
--- a/package/wpewebkit/0001-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From cc3c27a7e997ef157ed469127f185a7bb6eb1feb Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 27 May 2019 23:51:32 +0200
-Subject: [PATCH] Fix build with musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Retrieved (and slightly updated) from:
-https://github.com/WebPlatformForEmbedded/meta-wpe/blob/master/recipes-wpe/wpewebkit/wpewebkit/0001-Fix-build-with-musl.patch]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
- Source/WTF/wtf/PlatformHave.h                  |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
-index bf0bdc7a51a..78d2ec81838 100644
---- a/Source/JavaScriptCore/runtime/MachineContext.h
-+++ b/Source/JavaScriptCore/runtime/MachineContext.h
-@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) 
- 
- #if CPU(X86)
-     return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) 
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) 
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) 
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index e2a3388993f..95fe7c593cf 100644
---- a/Source/WTF/wtf/PlatformHave.h
-+++ b/Source/WTF/wtf/PlatformHave.h
-@@ -683,7 +683,7 @@
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
- #endif
-
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) 
- #define HAVE_MACHINE_CONTEXT 1
- #endif
- 
--- 
-2.20.1
-
diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
index c3aa8d4164..0c8c6dba6f 100644
--- a/package/wpewebkit/wpewebkit.hash
+++ b/package/wpewebkit/wpewebkit.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/wpewebkit-2.30.6.tar.xz.sums
-md5  e35b31932ad3da6c06736d8f2d347072  wpewebkit-2.30.6.tar.xz
-sha1  25a481e97e463df08fb2c0b0fa5d4299938670ac  wpewebkit-2.30.6.tar.xz
-sha256  893a3098226f116bbb38a665a3053c7d30e3c5dca786b954f9aa38f8c8581468  wpewebkit-2.30.6.tar.xz
+# From https://wpewebkit.org/releases/wpewebkit-2.32.1.tar.xz.sums
+md5  1dd3f56b8eba16266166d757acb979fc  wpewebkit-2.32.1.tar.xz
+sha1  c5b3a48d886375a6982dd2dc5c9cc2f92f5a9690  wpewebkit-2.32.1.tar.xz
+sha256  7b6b39a12ccf3f84da4cc6ac59e02fbe328f7476eaeb9c23de9b9288c2c2f39c  wpewebkit-2.32.1.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 b18ee2a37d..39424a26fa 100644
--- a/package/wpewebkit/wpewebkit.mk
+++ b/package/wpewebkit/wpewebkit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEWEBKIT_VERSION = 2.30.6
+WPEWEBKIT_VERSION = 2.32.1
 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
 WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
 WPEWEBKIT_INSTALL_STAGING = YES
-- 
2.31.1

[Buildroot] [PATCH 4/4] package/cog: bump to version 0.10.0

[Adrian Perez de Castro]

Release notes:

  https://wpewebkit.org/release/cog-0.10.0.html

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/cog/cog.hash | 8 ++++----
 package/cog/cog.mk   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/cog/cog.hash b/package/cog/cog.hash
index 2cafe8ca6e..566d30fa2a 100644
--- a/package/cog/cog.hash
+++ b/package/cog/cog.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/cog-0.8.1.tar.xz.sums
-md5  21664fb04c9149dea6d68e13e6074276  cog-0.8.1.tar.xz
-sha1  baabba7f0f6009c64ef0c4f7c5f807382cffef5d  cog-0.8.1.tar.xz
-sha256  b82e917eb764943b9859c631974f8f0e748b79ae87bb7a944f46c818740e0208  cog-0.8.1.tar.xz
+# From https://wpewebkit.org/releases/cog-0.10.0.tar.xz.sums
+md5  1b0407b6163a3a01afdfc0fb454a7570  cog-0.10.0.tar.xz
+sha1  911816c00a2b08f4cfd388b1d2e176835c9b4e9e  cog-0.10.0.tar.xz
+sha256  2c72369c636ca4684370adad1344071b23c9ee2c851eb7d738fa2e1d7092031f  cog-0.10.0.tar.xz
 
 # Hashes for license files:
 sha256  e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252  COPYING
diff --git a/package/cog/cog.mk b/package/cog/cog.mk
index 86bdf935d2..d373e6e1b6 100644
--- a/package/cog/cog.mk
+++ b/package/cog/cog.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COG_VERSION = 0.8.1
+COG_VERSION = 0.10.0
 COG_SITE = https://wpewebkit.org/releases
 COG_SOURCE = cog-$(COG_VERSION).tar.xz
 COG_INSTALL_STAGING = YES
-- 
2.31.1

[Buildroot] [PATCH 0/4] Update WPE WebKit, Cog, and their dependencies

[Yann E. MORIN]

Adrian, All,

On 2021-05-18 18:14 +0300, Adrian Perez de Castro spake thusly:
> Hi there,
> 
> WPE WebKit 2.32.0 was released by the end of March, but I have been waiting
> for 2.32.1 before submitting a patch set to update. The reasons are mainly
> two:
> 
>   - I knew that fixes to build WPE WebKit against Musl would land on time
>     for 2.32.1; which allows removing a patch we have been carrying in
> 	Buildroot.
>   - While working on the release candidates for WPEBackend-fdo, we found
>     a number of regressions, which delayed things while trying to solve
> 	all the issues found. Except for a minor issue, the rest are now all
> 	solved in 1.9.92. This is still a release candidate, but very stable
> 	in my experience. If there are concerns with it, I can change the
> 	patch to use 1.8.4 instead, which has backports of the changes.
> 
> Cheers,
> -Adrian
> 
> 
> Adrian Perez de Castro (4):
>   package/libwpe: bump to version 1.10.0
>   package/wpebackend-fdo: bump to version 1.9.92
>   package/wpewebkit: bump to version 2.32.1
>   package/cog: bump to version 0.10.0

Full series applied to next, thanks.

Regards,
Yann E. MORIN.

>  package/cog/cog.hash                          |  8 +-
>  package/cog/cog.mk                            |  2 +-
>  ...ial-dependency-to-pass-EGL-module-fl.patch | 45 -----------
>  package/libwpe/libwpe.hash                    |  8 +-
>  package/libwpe/libwpe.mk                      |  2 +-
>  package/wpebackend-fdo/wpebackend-fdo.hash    |  8 +-
>  package/wpebackend-fdo/wpebackend-fdo.mk      |  2 +-
>  .../wpewebkit/0001-Fix-build-with-musl.patch  | 79 -------------------
>  package/wpewebkit/wpewebkit.hash              |  8 +-
>  package/wpewebkit/wpewebkit.mk                |  2 +-
>  10 files changed, 20 insertions(+), 144 deletions(-)
>  delete mode 100644 package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch
>  delete mode 100644 package/wpewebkit/0001-Fix-build-with-musl.patch
> 
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'