From f94f04a957ae8ff247571d505741faece7ef0ae6 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 10 Nov 2023 17:46:16 +0100 Subject: [PATCH] package/webkitgtk: select wpebackend-fdo if wayland target is enabled libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 egl is mandatory if ENABLE_WAYLAND_TARGET https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. Signed-off-by: Thomas Devoogdt Tested-By: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit b9c0e48f68ffb3ffa5ffc9d23edafc89c6a4d41f) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index d47d6a8c1b..dee13f8ea6 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index d5e983e403..881c2df07b 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -106,7 +106,7 @@ WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON endif endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON WEBKITGTK_DEPENDENCIES += wpebackend-fdo else