aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-27 20:49:34 -0700
committerAndrei Gherzan <andrei@gherzan.ro>2020-08-28 14:59:43 +0100
commit979fb504c30be19eb4867eb612e2187a66265775 (patch)
treeddddbc7d952bfc9e977769d049b94d1edec5ae67 /recipes-graphics
parent0433b69889d2c51180de5ae3f636140a10316556 (diff)
downloadmeta-raspberrypi-979fb504c30be19eb4867eb612e2187a66265775.tar.gz
meta-raspberrypi-979fb504c30be19eb4867eb612e2187a66265775.tar.bz2
meta-raspberrypi-979fb504c30be19eb4867eb612e2187a66265775.zip
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 <KHR/khrplatform.h> | | ^~~~~~~~~~~~~~~~~~~ Fixes issue #391 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend4
1 files changed, 4 insertions, 0 deletions
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)}"