From c9837870dab8c61e2801b39cc20b167fa4709c25 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 23 Aug 2018 16:40:36 +0200 Subject: [PATCH] package/mesa3d: vulkan with x11 needs dri3 Vulcan with X11 needs DRI3, which in turn requires xlib-libxshmfence. Fixes: http://autobuild.buildroot.org/results/356/35653fc6f57dc169a8aae6baedb1acd1049b50ec/ Signed-off-by: "Yann E. MORIN" Cc: Bernd Kuhls Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 3 +++ package/mesa3d/mesa3d.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index eec72654cd..06574ae513 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -210,16 +210,19 @@ comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert depends on BR2_PACKAGE_XORG7 # xorgproto select BR2_PACKAGE_MESA3D_VULKAN_DRIVER select BR2_PACKAGE_XORGPROTO + select BR2_PACKAGE_XLIB_LIBXSHMFENCE help Vulkan driver for Intel hardware from Ivy Bridge onward. comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.18" depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 || \ !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5c01f92e22..e1e21321b0 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -130,7 +130,9 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ --without-vulkan-drivers else +MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ + --enable-dri3 \ --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif -- 2.30.2