diff options
Diffstat (limited to 'package/mesa3d')
| -rw-r--r-- | package/mesa3d/Config.in | 11 | ||||
| -rw-r--r-- | package/mesa3d/mesa3d.mk | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 36a0304e27..ad41b1cd2a 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -31,8 +31,15 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER config BR2_PACKAGE_MESA3D_DRI_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO - select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO + # xlib-libxshmfence needs sync_4, so we cannot select it if + # BR2_TOOLCHAIN_HAS_SYNC_4 is false. xproto-presentproto + # doesn't need sync_4, but it is only needed in conjunction + # with xlib-libxshmfence and dri3proto to provide dri3 + # support, so we also only select it if sync_4 is available. + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ + (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4) + select BR2_PACKAGE_XPROTO_PRESENTPROTO if \ + (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4) config BR2_PACKAGE_MESA3D_VULKAN_DRIVER bool diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index a5ab84b160..9f190ba538 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -91,7 +91,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ --without-dri-drivers --disable-dri3 else -ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy) MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto MESA3D_CONF_OPTS += --enable-dri3 else |
