mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/glslsandbox-player: add wayland-protocols optional dependency

Browse Source 
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 f201ca9d0d:

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ee13e3fb41)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2023-02-20 11:30:01 +01:00
committed by Peter Korsgaard
parent ebd36288db
commit 4af566b5ad
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/glslsandbox-player/Config.in
View File

@@ -111,8 +111,11 @@ endchoice
if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL
config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI
bool "Wayland IVI shell support" 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 endif
comment "glslsandbox-player needs openGL ES and EGL driver" comment "glslsandbox-player needs openGL ES and EGL driver"

6
package/glslsandbox-player/glslsandbox-player.mk
View File

@@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi
else else
GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi
endif 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) else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y)
GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11
GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11