From f7178fd1ca0340d0fad34734ab5a462c7f95debd Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 10 Jan 2021 23:28:23 +0100 Subject: [PATCH] package/mesa3d: fix vulkan intel dependencies It is possible to build the vulkan intel driver without X11/GLX. - remove xorgproto dependency; it is already given via BR2_PACKAGE_MESA3D_OPENGL_GLX/BR2_PACKAGE_MESA3D_NEEDS_X11 and was already gone from the .mk file - enable DRI3 automatically when X11 is enabled, like we do for other drivers - libxshmfence is implied by DRI3 (both in Config.in and mesa3d.mk), but we need to propagate dependencies (RISCV_32 doesn't apply since it's x86 only) Signed-off-by: Peter Seiderer [Arnout: select DRI3 like other drivers though, which simplifies the whole thing] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 12 +++++------- package/mesa3d/mesa3d.mk | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 34b0352056..b9a5574b63 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -378,21 +378,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_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - depends on BR2_PACKAGE_XORG7 # xorgproto - select BR2_PACKAGE_MESA3D_DRI3 + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER - select BR2_PACKAGE_XORGPROTO 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.17" +comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 + !BR2_TOOLCHAIN_USES_GLIBC comment "Off-screen Rendering" diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e34ed4264f..aa365838ab 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -146,7 +146,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= else -MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif