All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0
@ 2020-09-15 22:30 Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0 Adrian Perez de Castro
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

Hello,

Here is a patch series updating WPE WebKit, its dependencies, and the Cog
launcher to their most recent stable versions.

A couple of notes:

- The version bump for cog can be applied separately from the rest, the
  new version works fine with the versions of packages currently available
  in Buildroot.

- Switching from CMake to Meson can be left out without merging and either
  apply the patches later, or skip them altogether until upstream skips
  shipping the CMake based build system.

- The new wpewebkit version requires the update to wpebackend-fdo, but
  libwpe has barely received changes in this development cycle, so it's
  not mandatory to update it (it's still recommended, though).

Best regards,
?Adri?n

Adrian Perez de Castro (6):
  package/libwpe: bump to version 1.8.0
  package/libwpe: switch over to Meson
  package/wpebackend-fdo: bump to version 1.8.0
  package/wpebackend-fdo: switch over to Meson
  package/wpewebkit: bump to version 2.30.0
  package/cog: bump to version 0.8.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                      |  9 ++--
 package/wpebackend-fdo/Config.in              |  4 +-
 package/wpebackend-fdo/wpebackend-fdo.hash    |  8 ++--
 package/wpebackend-fdo/wpebackend-fdo.mk      |  6 +--
 package/wpewebkit/wpewebkit.hash              |  6 +--
 package/wpewebkit/wpewebkit.mk                |  2 +-
 10 files changed, 72 insertions(+), 26 deletions(-)
 create mode 100644 package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch

-- 
2.28.0

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0
  2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
@ 2020-09-15 22:30 ` Adrian Perez de Castro
  2020-09-17 20:40   ` Thomas Petazzoni
  2020-09-15 22:30 ` [Buildroot] [PATCH 2/6] package/libwpe: switch over to Meson Adrian Perez de Castro
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

Release notes:

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

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

diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash
index e138c06f2b..36cdf56664 100644
--- a/package/libwpe/libwpe.hash
+++ b/package/libwpe/libwpe.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/libwpe-1.6.0.tar.xz.sums
-md5  6e8a2c279dcc3617db5ec7ac4c03d628  libwpe-1.6.0.tar.xz
-sha1  e8424d5e29f35861d85acdc5962d8b59b53bb1ad  libwpe-1.6.0.tar.xz
-sha256  3587c6b8a807f4bb76b268ba74ca82c6b395b90235db41ad8252224456193c90  libwpe-1.6.0.tar.xz
+# 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
 
 # Hashes for license files:
 sha256  35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b  COPYING
diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk
index fd4f3d0cbd..6c3a1d354a 100644
--- a/package/libwpe/libwpe.mk
+++ b/package/libwpe/libwpe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBWPE_VERSION = 1.6.0
+LIBWPE_VERSION = 1.8.0
 LIBWPE_SITE = https://wpewebkit.org/releases
 LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz
 LIBWPE_INSTALL_STAGING = YES
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/6] package/libwpe: switch over to Meson
  2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0 Adrian Perez de Castro
@ 2020-09-15 22:30 ` Adrian Perez de Castro
  2020-09-17 20:42   ` Thomas Petazzoni
  2020-09-15 22:30 ` [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0 Adrian Perez de Castro
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

The CMake based build system will be eventually removed by upstream
so it seems like a good idea to switch over to Meson already before
that happens.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...ial-dependency-to-pass-EGL-module-fl.patch | 45 +++++++++++++++++++
 package/libwpe/libwpe.mk                      |  7 ++-
 2 files changed, 48 insertions(+), 4 deletions(-)
 create 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
new file mode 100644
index 0000000000..e74ebe125e
--- /dev/null
+++ b/package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch
@@ -0,0 +1,45 @@
+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.mk b/package/libwpe/libwpe.mk
index 6c3a1d354a..369ef5824a 100644
--- a/package/libwpe/libwpe.mk
+++ b/package/libwpe/libwpe.mk
@@ -14,9 +14,8 @@ LIBWPE_DEPENDENCIES = libegl libxkbcommon
 
 # Workaround for https://github.com/raspberrypi/userland/issues/316
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-LIBWPE_CONF_OPTS += \
-	-DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \
-	-DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE'
+LIBWPE_CFLAGS += -D_GNU_SOURCE
+LIBWPE_CXXFLAGS += -D_GNU_SOURCE
 endif
 
-$(eval $(cmake-package))
+$(eval $(meson-package))
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0
  2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0 Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 2/6] package/libwpe: switch over to Meson Adrian Perez de Castro
@ 2020-09-15 22:30 ` Adrian Perez de Castro
  2020-09-17 20:44   ` Thomas Petazzoni
  2020-09-15 22:30 ` [Buildroot] [PATCH 4/6] package/wpebackend-fdo: switch over to Meson Adrian Perez de Castro
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

The new version adds a few new features, and now uses libepoxy for
OpenGL code, so add that as a dependency. Release notes:

  https://wpewebkit.org/release/wpebackend-fdo-1.8.0.html

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

diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in
index 161e4c9a7e..4e701da5eb 100644
--- a/package/wpebackend-fdo/Config.in
+++ b/package/wpebackend-fdo/Config.in
@@ -1,15 +1,17 @@
 comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend"
 	depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+		|| !BR2_PACKAGE_HAS_LIBGL || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_WPEBACKEND_FDO
 	bool "wpebackend-fdo"
 	depends on !BR2_STATIC_LIBS # wayland
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_HAS_LIBGL # libepoxy
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+	select BR2_PACKAGE_LIBEPOXY
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBWPE
 	select BR2_PACKAGE_WAYLAND
diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash
index 0b821f3443..2f8321833c 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.6.1.tar.xz.sums
-md5  ea6c2a13e6c2423f2c2b0b31fcf9567b  wpebackend-fdo-1.6.1.tar.xz
-sha1  53e38189324d9c0c87f40164d8349a827663aabd  wpebackend-fdo-1.6.1.tar.xz
-sha256  740eee3327acfb462b8460519a219e30dc0a870326e88e2ddc4fe2c8de20b1c9  wpebackend-fdo-1.6.1.tar.xz
+# From https://wpewebkit.org/releases/wpebackend-fdo-1.8.0.tar.xz.sums
+md5  6df96f80ff34c02d56f32a7a153a62c0  wpebackend-fdo-1.8.0.tar.xz
+sha1  48dd8d5d525e0c89b8b7068fe51c439921804240  wpebackend-fdo-1.8.0.tar.xz
+sha256  9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253  wpebackend-fdo-1.8.0.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 5bc2d3ed37..e0331e7bd3 100644
--- a/package/wpebackend-fdo/wpebackend-fdo.mk
+++ b/package/wpebackend-fdo/wpebackend-fdo.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-WPEBACKEND_FDO_VERSION = 1.6.1
+WPEBACKEND_FDO_VERSION = 1.8.0
 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases
 WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz
 WPEBACKEND_FDO_INSTALL_STAGING = YES
 WPEBACKEND_FDO_LICENSE = BSD-2-Clause
 WPEBACKEND_FDO_LICENSE_FILES = COPYING
-WPEBACKEND_FDO_DEPENDENCIES = libglib2 libwpe wayland
+WPEBACKEND_FDO_DEPENDENCIES = libepoxy libglib2 libwpe wayland
 
 $(eval $(cmake-package))
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/6] package/wpebackend-fdo: switch over to Meson
  2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
                   ` (2 preceding siblings ...)
  2020-09-15 22:30 ` [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0 Adrian Perez de Castro
@ 2020-09-15 22:30 ` Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 5/6] package/wpewebkit: bump to version 2.30.0 Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 6/6] package/cog: bump to version 0.8.0 Adrian Perez de Castro
  5 siblings, 0 replies; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

The CMake based build system will be eventually removed by upstream
so it seems like a good idea to switch over to Meson already before
that happens.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/wpebackend-fdo/wpebackend-fdo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk
index e0331e7bd3..dc0c9b6740 100644
--- a/package/wpebackend-fdo/wpebackend-fdo.mk
+++ b/package/wpebackend-fdo/wpebackend-fdo.mk
@@ -12,4 +12,4 @@ WPEBACKEND_FDO_LICENSE = BSD-2-Clause
 WPEBACKEND_FDO_LICENSE_FILES = COPYING
 WPEBACKEND_FDO_DEPENDENCIES = libepoxy libglib2 libwpe wayland
 
-$(eval $(cmake-package))
+$(eval $(meson-package))
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/6] package/wpewebkit: bump to version 2.30.0
  2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
                   ` (3 preceding siblings ...)
  2020-09-15 22:30 ` [Buildroot] [PATCH 4/6] package/wpebackend-fdo: switch over to Meson Adrian Perez de Castro
@ 2020-09-15 22:30 ` Adrian Perez de Castro
  2020-09-21 20:16   ` Adrian Perez de Castro
  2020-09-15 22:30 ` [Buildroot] [PATCH 6/6] package/cog: bump to version 0.8.0 Adrian Perez de Castro
  5 siblings, 1 reply; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

This is a new major release which bring in many improvements and new
features. For a complete list, please refer to the release notes:

  https://wpewebkit.org/release/wpewebkit-2.30.0.html

None of the new features need additional dependencies.

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

diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
index 1a6fbc8b96..4ba5c446d9 100644
--- a/package/wpewebkit/wpewebkit.hash
+++ b/package/wpewebkit/wpewebkit.hash
@@ -1,7 +1,7 @@
 # From https://wpewebkit.org/releases/wpewebkit-2.28.4.tar.xz.sums
-md5  6ab041f6ebdb2e053981de5980c864e7  wpewebkit-2.28.4.tar.xz
-sha1  b31739a86a269eac4ddd5e537cdf954224672450  wpewebkit-2.28.4.tar.xz
-sha256  785d83b99cd45cedb7c4f1f697db773a5a81eb0a42aeeafa3c623053f6fde87a  wpewebkit-2.28.4.tar.xz
+md5  b91b85b645061189765a9455a0539df1  wpewebkit-2.30.0.tar.xz
+sha1  243f2759f6fd06fdaefa84cbfa80e49559fbd14b  wpewebkit-2.30.0.tar.xz
+sha256  d1a99383ac3344195d09b4a4256c15dc5269c8585b3d836f43a057e60bb6f460  wpewebkit-2.30.0.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 646bdd9384..ea198cc75e 100644
--- a/package/wpewebkit/wpewebkit.mk
+++ b/package/wpewebkit/wpewebkit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEWEBKIT_VERSION = 2.28.4
+WPEWEBKIT_VERSION = 2.30.0
 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
 WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
 WPEWEBKIT_INSTALL_STAGING = YES
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 6/6] package/cog: bump to version 0.8.0
  2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
                   ` (4 preceding siblings ...)
  2020-09-15 22:30 ` [Buildroot] [PATCH 5/6] package/wpewebkit: bump to version 2.30.0 Adrian Perez de Castro
@ 2020-09-15 22:30 ` Adrian Perez de Castro
  5 siblings, 0 replies; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-15 22:30 UTC (permalink / raw)
  To: buildroot

This new version adds a few features. Release notes:

  https://wpewebkit.org/release/cog-0.8.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 dc5c1b3c46..d76306ca54 100644
--- a/package/cog/cog.hash
+++ b/package/cog/cog.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/cog-0.6.0.tar.xz.sums
-md5  a97df4f0e2d25f4da7cd9bb55294d30e  cog-0.6.0.tar.xz
-sha1  9392d9251bab8a9f61d00297707e16a983127eae  cog-0.6.0.tar.xz
-sha256  208f58e0533b269400875237a95e994c93da7234a29fd1c904e756b88963e35d  cog-0.6.0.tar.xz
+# From https://wpewebkit.org/releases/cog-0.8.0.tar.xz.sums
+md5  f7aa8a425927cab247563411fc67c5a3  cog-0.8.0.tar.xz
+sha1  977559204dae0f9220e4c6b8ded7537899fd2daf  cog-0.8.0.tar.xz
+sha256  181b1f4963cdf264b8068460a64d14c92a627f7138ebecc0f36fce085f4e92dd  cog-0.8.0.tar.xz
 
 # Hashes for license files:
 sha256  e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252  COPYING
diff --git a/package/cog/cog.mk b/package/cog/cog.mk
index a826252829..47a5573dda 100644
--- a/package/cog/cog.mk
+++ b/package/cog/cog.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COG_VERSION = 0.6.0
+COG_VERSION = 0.8.0
 COG_SITE = https://wpewebkit.org/releases
 COG_SOURCE = cog-$(COG_VERSION).tar.xz
 COG_INSTALL_STAGING = YES
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0
  2020-09-15 22:30 ` [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0 Adrian Perez de Castro
@ 2020-09-17 20:40   ` Thomas Petazzoni
  0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2020-09-17 20:40 UTC (permalink / raw)
  To: buildroot

On Wed, 16 Sep 2020 01:30:48 +0300
Adrian Perez de Castro <aperez@igalia.com> wrote:

> Release notes:
> 
>   https://wpewebkit.org/release/libwpe-1.8.0.html
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  package/libwpe/libwpe.hash | 8 ++++----
>  package/libwpe/libwpe.mk   | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/6] package/libwpe: switch over to Meson
  2020-09-15 22:30 ` [Buildroot] [PATCH 2/6] package/libwpe: switch over to Meson Adrian Perez de Castro
@ 2020-09-17 20:42   ` Thomas Petazzoni
  0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2020-09-17 20:42 UTC (permalink / raw)
  To: buildroot

On Wed, 16 Sep 2020 01:30:49 +0300
Adrian Perez de Castro <aperez@igalia.com> wrote:

> diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk
> index 6c3a1d354a..369ef5824a 100644
> --- a/package/libwpe/libwpe.mk
> +++ b/package/libwpe/libwpe.mk
> @@ -14,9 +14,8 @@ LIBWPE_DEPENDENCIES = libegl libxkbcommon
>  
>  # Workaround for https://github.com/raspberrypi/userland/issues/316
>  ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
> -LIBWPE_CONF_OPTS += \
> -	-DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \
> -	-DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE'
> +LIBWPE_CFLAGS += -D_GNU_SOURCE
> +LIBWPE_CXXFLAGS += -D_GNU_SOURCE
>  endif

Unfortunately pkg-meson.mk does this:

$(2)_CFLAGS ?= $$(TARGET_CFLAGS)
$(2)_LDFLAGS ?= $$(TARGET_LDFLAGS)
$(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS)

So, with your libwpe.mk, it means that when BR2_PACKAGE_RPI_USERLAND is
disabled, LIBWPE_CFLAGS is not defined by libwpe.mk, and the
$(TARGET_CFLAGS) value will be used by pkg-meson.mk.

However, if BR2_PACKAGE_RPI_USERLAND=y, LIBWPE_CFLAGS will be non-empty
by the time the meson-package infrastructure is invoked, and so you
LIBWPE_CFLAGS will contain only -D_GNU_SOURCE and not the other
$(TARGET_CFLAGS).

I fixed that up and applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0
  2020-09-15 22:30 ` [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0 Adrian Perez de Castro
@ 2020-09-17 20:44   ` Thomas Petazzoni
  2020-09-18 14:06     ` Adrian Perez de Castro
  0 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2020-09-17 20:44 UTC (permalink / raw)
  To: buildroot

On Wed, 16 Sep 2020 01:30:50 +0300
Adrian Perez de Castro <aperez@igalia.com> wrote:

>  comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend"
>  	depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
> -		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> +		|| !BR2_PACKAGE_HAS_LIBGL || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

This is not longer really in sync with the comment that says "an OpenGL
capable Wayland backend".

>  config BR2_PACKAGE_WPEBACKEND_FDO
>  	bool "wpebackend-fdo"
>  	depends on !BR2_STATIC_LIBS # wayland
>  	depends on BR2_INSTALL_LIBSTDCPP
> +	depends on BR2_PACKAGE_HAS_LIBGL # libepoxy

This looks really odd as:

 (1) Requiring full OpenGL means that no OpenGL ES platform can use
     wpebakend-fdo. Remember that libgl == full/desktop OpenGL, while
     libgles = OpenGL ES.

 (2) libepoxy does not depned on HAS_LIBGL, but HAS_LIBGL || HAS_LIBEGL

 (3) You have a dependency on HAS_LIBEGL_WAYLAND... so it kind of
     implies that an EGL/OpenGL ES configuration should work ?

Could you revisit this ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0
  2020-09-17 20:44   ` Thomas Petazzoni
@ 2020-09-18 14:06     ` Adrian Perez de Castro
  0 siblings, 0 replies; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-18 14:06 UTC (permalink / raw)
  To: buildroot

Hello Thomas,

On Thu, 17 Sep 2020 22:44:52 +0200 Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> On Wed, 16 Sep 2020 01:30:50 +0300
> Adrian Perez de Castro <aperez@igalia.com> wrote:
> 
> >  comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend"
> >  	depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
> > -		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> > +		|| !BR2_PACKAGE_HAS_LIBGL || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> 
> This is not longer really in sync with the comment that says "an OpenGL
> capable Wayland backend".
> 
> >  config BR2_PACKAGE_WPEBACKEND_FDO
> >  	bool "wpebackend-fdo"
> >  	depends on !BR2_STATIC_LIBS # wayland
> >  	depends on BR2_INSTALL_LIBSTDCPP
> > +	depends on BR2_PACKAGE_HAS_LIBGL # libepoxy
> 
> This looks really odd as:
> 
>  (1) Requiring full OpenGL means that no OpenGL ES platform can use
>      wpebakend-fdo. Remember that libgl == full/desktop OpenGL, while
>      libgles = OpenGL ES.
> 
>  (2) libepoxy does not depned on HAS_LIBGL, but HAS_LIBGL || HAS_LIBEGL
> 
>  (3) You have a dependency on HAS_LIBEGL_WAYLAND... so it kind of
>      implies that an EGL/OpenGL ES configuration should work ?
> 
> Could you revisit this ?

You are right, any EGL + GLES implementation should do, and actually ?desktop
GL? (libgl) is not even supported by WPE. I'll update this patch later on and
submit an updated version.

Thanks for the review,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200918/4f42ad63/attachment.asc>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/6] package/wpewebkit: bump to version 2.30.0
  2020-09-15 22:30 ` [Buildroot] [PATCH 5/6] package/wpewebkit: bump to version 2.30.0 Adrian Perez de Castro
@ 2020-09-21 20:16   ` Adrian Perez de Castro
  0 siblings, 0 replies; 12+ messages in thread
From: Adrian Perez de Castro @ 2020-09-21 20:16 UTC (permalink / raw)
  To: buildroot

On Wed, 16 Sep 2020 01:30:52 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> This is a new major release which bring in many improvements and new
> features. For a complete list, please refer to the release notes:
> 
>   https://wpewebkit.org/release/wpewebkit-2.30.0.html

I have released 2.30.1 earlier today:

  https://wpewebkit.org/release/wpewebkit-2.30.1.html

When I send an updated patch set in a moment it will already use .1, which
contains a bug fix for a regression :)

?Adri?n

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200921/f3503a43/attachment.asc>

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-09-21 20:16 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-15 22:30 [Buildroot] [PATCH 0/6] Update WPE stack to WebKit 2.30.0 Adrian Perez de Castro
2020-09-15 22:30 ` [Buildroot] [PATCH 1/6] package/libwpe: bump to version 1.8.0 Adrian Perez de Castro
2020-09-17 20:40   ` Thomas Petazzoni
2020-09-15 22:30 ` [Buildroot] [PATCH 2/6] package/libwpe: switch over to Meson Adrian Perez de Castro
2020-09-17 20:42   ` Thomas Petazzoni
2020-09-15 22:30 ` [Buildroot] [PATCH 3/6] package/wpebackend-fdo: bump to version 1.8.0 Adrian Perez de Castro
2020-09-17 20:44   ` Thomas Petazzoni
2020-09-18 14:06     ` Adrian Perez de Castro
2020-09-15 22:30 ` [Buildroot] [PATCH 4/6] package/wpebackend-fdo: switch over to Meson Adrian Perez de Castro
2020-09-15 22:30 ` [Buildroot] [PATCH 5/6] package/wpewebkit: bump to version 2.30.0 Adrian Perez de Castro
2020-09-21 20:16   ` Adrian Perez de Castro
2020-09-15 22:30 ` [Buildroot] [PATCH 6/6] package/cog: bump to version 0.8.0 Adrian Perez de Castro

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.