From 701f8bb31cac8e6be5a4ccf5bc1d643a65c19327 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Fri, 15 May 2026 19:03:10 -0700 Subject: [PATCH] package/weston: add EGL dependency for XWayland BR2_PACKAGE_WESTON_XWAYLAND currently depends on BR2_PACKAGE_LIBEPOXY, which implicitly requires either libGL or libEGL. However, the XWayland glamor support uses libepoxy with EGL, so express that dependency directly. With only libGL and no libEGL, it fails to build. E.g., BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XWAYLAND=y BR2_PACKAGE_LIBEPOXY=y fails with: In file included from ../glamor/glamor_priv.h:73, from ../glamor/glamor_composite_glyphs.c:25: ../glamor/glamor_context.h:27:10: fatal error: epoxy/egl.h: No such file or directory 27 | #include | ^~~~~~~~~~~~~ Signed-off-by: Joseph Kogut Signed-off-by: Arnout Vandecappelle --- package/weston/Config.in | 6 ++++-- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 774b75d5fb..6f61c3c561 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -123,6 +123,7 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_LIBEPOXY depends on BR2_PACKAGE_XORG7 # xwayland depends on BR2_USE_MMU # xwayland @@ -136,8 +137,9 @@ config BR2_PACKAGE_WESTON_XWAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XWAYLAND -comment "XWayland support needs libepoxy and X.org enabled" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs libepoxy w/ EGL and X.org enabled" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_XORG7 || \ + !BR2_PACKAGE_LIBEPOXY comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8fa5260f47..5902f85d4f 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -30,7 +30,7 @@ XWAYLAND_CONF_OPTS = \ -Ddtrace=false \ -Ddocs=false -ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy) XWAYLAND_CONF_OPTS += -Dglamor=true XWAYLAND_DEPENDENCIES += libepoxy else