diff --git a/package/weston/Config.in b/package/weston/Config.in index 614fef6bcc..bf7533da58 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 ef96a9b75e..28efc5126e 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