| Message ID | 20200915223053.3090447-4-aperez@igalia.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Update WPE stack to WebKit 2.30.0 | expand |
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
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
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))
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(-)