From 7157e54d45c5c3710d21b845aa83d63013e3b39c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Aug 2020 20:49:34 -0700 Subject: xserver-xorg: Depend on userland when vc4graphics is disabled This helps in getting right headers, we have made a choice to let userland provide KHR/khrplatform.h when using it instead of mesa-gl which could have been another provider, xserver-xorg's glx implementation depends on virtual/libgl which in case of rpi-without-vc4 driver is provided by mesa-gl, as a result, compilation fails since no one is providing this header in this case. Fixes errors like usr/include/GL/glext.h:56:10: fatal error: KHR/khrplatform.h: No such file or directory | 56 | #include | | ^~~~~~~~~~~~~~~~~~~ Fixes issue #391 Signed-off-by: Khem Raj --- recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index fba1632..9574fa5 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1 +1,5 @@ OPENGL_PKGCONFIGS_rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" + +# when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where +# we explicitly delete KHR/khrplatform.h since its already coming from userland package +DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" -- cgit v1.2.3-54-g00ecf