package/cog: add a variant with WebKitGTK
PATCH 1/1 package/cog: add a variant with WebKitGTK
wayland is useful only with wpewebkit.BR2_PACKAGE_WAYLAND is already selected by BR2_PACKAGE_WPEWEBKIT. backend options BR2_PACKAGE_COG_PLATFORM_* depend on BR2_PACKAGE_WPEWEBKIT.
--- package/cog/Config.in | 11 +++++++---- package/cog/cog.mk | 10 +++++++++- 2 files changed, 16 insertions(+), 5 deletions(-)
package/cog/Config.in +7 -4
@@ -1,14 +1,13 @@ -comment "cog needs wpewebkit and a toolchain w/ threads" +comment "cog needs [wpe]webkit[gtk] and a toolchain w/ threads" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_WPEWEBKIT || !BR2_TOOLCHAIN_HAS_THREADS + depends on (!BR2_PACKAGE_WPEWEBKIT && !BR2_PACKAGE_WEBKITGTK) || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_COG bool "cog" - depends on BR2_PACKAGE_WPEWEBKIT + depends on BR2_PACKAGE_WPEWEBKIT || BR2_PACKAGE_WEBKITGTK depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS - select BR2_PACKAGE_WAYLAND help Single "window" launcher for the WebKit WPE port, and helper library for implementing WPE launcher. It does
@@ -27,6 +26,8 @@ config BR2_PACKAGE_COG_PROGRAMS_HOME_URI string is used, there is no default and the URI to open must be always specified in the command line. +if BR2_PACKAGE_WPEWEBKIT + config BR2_PACKAGE_COG_PLATFORM_FDO bool "FreeDesktop.org backend" default y
@@ -51,3 +52,5 @@ comment "DRM platform needs mesa3d w/ EGL driver and GBM" depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL endif + +endif
package/cog/cog.mk +9 -1
@@ -8,7 +8,7 @@ COG_VERSION = 0.6.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland +COG_DEPENDENCIES = dbus COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \
@@ -17,6 +17,14 @@ COG_CONF_OPTS = \ -DINSTALL_MAN_PAGES=OFF \ -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' +ifeq ($(BR2_PACKAGE_WEBKITGTK),y) +COG_CONF_OPTS += -DCOG_USE_WEBKITGTK=ON +COG_DEPENDENCIES += webkitgtk +else +COG_CONF_OPTS += -DCOG_USE_WEBKITGTK=OFF +COG_DEPENDENCIES += wpewebkit wpebackend-fdo wayland +endif + ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) COG_CONF_OPTS += -DCOG_PLATFORM_FDO=ON COG_DEPENDENCIES += libxkbcommon wayland-protocols
Signature · 1 line
2.25.1
PATCH 1/1 package/cog: add a variant with WebKitGTK
Hello Francois,
Quoted 9 lines · On Mon, 07 Sep 2020 18:21:56 +0200 Francois Perrad <[email protected]> wrote:
wayland is useful only with wpewebkit.
BR2_PACKAGE_WAYLANDis already selected byBR2_PACKAGE_WPEWEBKIT. backend options BR2_PACKAGE_COG_PLATFORM_* depend onBR2_PACKAGE_WPEWEBKIT.Signed-off-by Francois Perrad <[email protected]>--- package/cog/Config.in | 11 +++++++---- package/cog/cog.mk | 10 +++++++++- 2 files changed, 16 insertions(+), 5 deletions(-)
Let me put on my ?WPE/Cog developer hat? for a moment and let you know about the roadmap for Cog: The WebKitGTK support will be eventually disappearing, and Cog will be WPE-only, because the WebKitGTK support has been a bit of a burden to maintain and has been broken a few times (and went unnoticed).
We are have in the back burner a big refactoring which will bring in support for multiple web views to Cog (mainly) and a number of other improvements. The development branch [1] where the work is progressing already removes the WebKitGTK support, as a matter of fact.
Therefore I think adding support in Buildroot to compile Cog using WebKitGTK is dead end, and in my opinion it would be better to not merge this patch.
Regards,
?Adri?n
---
[1] https://github.com/Igalia/cog/commits/devel/multiple-views
-------------- 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/20200908/c46e1508/attachment.asc>