projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: db75632)
package/mesa3d: vulkan with x11 needs dri3
authorYann E. MORIN <yann.morin.1998@free.fr>
Thu, 23 Aug 2018 14:40:36 +0000 (16:40 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Fri, 24 Aug 2018 21:49:11 +0000 (23:49 +0200)
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" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/mesa3d/Config.in patch | blob | history
package/mesa3d/mesa3d.mk patch | blob | history

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index eec72654cd01de3c62d76d3dbc6cf091c071714d..06574ae5133a37d91c2e75f43bd273368872751f 100644 (file)
--- 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 5c01f92e22bb79211b8ab98593ee819f43b009b8..e1e21321b0f5090ac29710ad49e96c12df7e57b6 100644 (file)
--- 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