From: Rob Clark <robdclark@gmail.com>
Date: Tue, 13 Mar 2018 23:00:45 +0000 (-0400)
Subject: meson+dri3: allow building against older xcb (v3)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc5001325b876afbd9fbb7186174e085e0b06206;p=mesa.git

meson+dri3: allow building against older xcb (v3)

Similar to previous patch, make xcb 1.13 optional.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
---

diff --git a/meson.build b/meson.build
index 557e9ef3397..a59736f50ae 100644
--- a/meson.build
+++ b/meson.build
@@ -1235,9 +1235,14 @@ if with_platform_x11
     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
 
     if with_dri3
-      pre_args += '-DHAVE_DRI3 -DHAVE_DRI3_MODIFIERS'
-      dep_xcb_dri3 = dependency('xcb-dri3', version : '>= 1.13')
-      dep_xcb_present = dependency('xcb-present', version: '>= 1.13')
+      pre_args += '-DHAVE_DRI3'
+      dep_xcb_dri3 = dependency('xcb-dri3')
+      dep_xcb_present = dependency('xcb-present')
+      # until xcb-dri3 has been around long enough to make a hard-dependency:
+      if (dep_xcb_dri3.version().version_compare('>= 1.13') and
+          dep_xcb_present.version().version_compare('>= 1.13'))
+        pre_args += '-DHAVE_DRI3_MODIFIERS'
+      endif
       dep_xcb_sync = dependency('xcb-sync')
       dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
     endif