From ee13e3fb41dc7c0c001127733b5a599c1e509747 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 11:30:01 +0100 Subject: [PATCH] package/glslsandbox-player: add wayland-protocols optional dependency wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 132705584e..530c158fc3 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -111,8 +111,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11