From 6870d9097b137b0092fdbd77018a147653f1eeef Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 1 Apr 2021 10:04:33 +0200
Subject: [PATCH] meson: Fix missing xcb-xrandr dependency for Vulkan X11 WSI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a build failure when building any Vulkan driver for the X11
platform with -Dxlib-lease=disabled. For example:

  /usr/bin/ld: src/vulkan/wsi/libvulkan_wsi.a(wsi_common_x11.c.o): in function `wsi_x11_detect_xwayland':
  src/vulkan/wsi/wsi_common_x11.c:123: undefined reference to `xcb_randr_query_version_unchecked'

Fixes: 1de2fd0cf205 "wsi/x11: Always link against xcb-xrandr"
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9972>
(cherry picked from commit 2470bcb946d7009ef6b9f87672cfb3143bda6c98)
---
 .pick_status.json | 2 +-
 meson.build       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 694fd23298a..e70c60553e0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -220,7 +220,7 @@
         "description": "meson: Fix missing xcb-xrandr dependency for Vulkan X11 WSI",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "1de2fd0cf205eda4f26c97a323d1cc509f3668f9"
     },
diff --git a/meson.build b/meson.build
index 932eb136681..26cfd01a72c 100644
--- a/meson.build
+++ b/meson.build
@@ -1859,8 +1859,10 @@ if with_platform_x11
       with_gallium_omx != 'disabled'))
     dep_xcb_xfixes = dependency('xcb-xfixes')
   endif
-  if with_xlib_lease
+  if with_xlib_lease or with_any_vk
     dep_xcb_xrandr = dependency('xcb-randr')
+  endif
+  if with_xlib_lease
     dep_xlib_xrandr = dependency('xrandr', version : '>= 1.3')
   endif
 endif