From 19b4e6c6daefcbe72afe57874d2e48c43c418321 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 18 Sep 2020 13:33:52 -0500 Subject: meta-raspberrypi: subtree update:cc6074c660..0e9c32c816 Andrzej Bednarski (1): docs: Correct minor spelling issues Khem Raj (6): linux-raspberrypi: Update to 5.4.59 raspberrypi-firmware: Upgrade to 20200819 xserver-xorg: Depend on userland when vc4graphics is disabled libsdl2: Add userland dependency when not using vc4graphics linux-raspberrypi_5.4.bb: Build ashmem and binder drivers README: Mention Yoe distro in supported distro list Luis Alfredo da Silva (1): Revert "mesa: querying dma_buf modifiers for specific formats" Martin Jansa (5): linux-raspberrypi-5.4: backport a fix for perf build with -fno-common from gcc-10 rpi-gpio: add -fcommon temporarily linux-raspberrypi-5.4: revert 1 commit from upstream to fix lttng-modules build raspberrypi-{firmware,tools}: set downloadfilename Revert "linux-raspberrypi-5.4: revert 1 commit from upstream to fix lttng-modules build" Pierre-Jean Texier (2): raspberrypi-firmware: update to current HEAD linux-raspberrypi: bump to Linux version 5.4.64 Signed-off-by: Andrew Geissler Change-Id: I5acc97c6612dd01922b1577537e555220f3b77e6 --- .../recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-raspberrypi/recipes-graphics/xorg-xserver') diff --git a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index fba163219e..9574fa5b8a 100644 --- a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/meta-raspberrypi/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