From: Dylan Baker <dylan@pnwbakers.com>
Date: Tue, 5 Dec 2017 17:40:03 +0000 (-0800)
Subject: meson: Fix building gallium media targets with gallium-xlib glx
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c34b53f13326c89e09447d759ee188fe9c4964d8;p=mesa.git

meson: Fix building gallium media targets with gallium-xlib glx

To demonstrate this bug run meson with the options:
-Ddri-drivers= -Dglx=gallium-xlib

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/meson.build b/meson.build
index 1ea63fb1291..6e5ae4d24e9 100644
--- a/meson.build
+++ b/meson.build
@@ -1110,9 +1110,9 @@ if with_platform_x11
     dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1')
     dep_xxf86vm = dependency('xxf86vm', required : false)
   endif
-  if with_any_vk or with_glx == 'dri' or
-      (with_gallium_vdpau or with_gallium_xvmc or with_gallium_omx or
-       with_gallium_xa)
+  if (with_any_vk or with_glx == 'dri' or
+       (with_gallium_vdpau or with_gallium_xvmc or with_gallium_omx or
+        with_gallium_xa))
     dep_xcb = dependency('xcb')
     dep_x11_xcb = dependency('x11-xcb')
   endif