meson: Fix building gallium media targets with gallium-xlib glx
authorDylan Baker <dylan@pnwbakers.com>
Tue, 5 Dec 2017 17:40:03 +0000 (09:40 -0800)
committerDylan Baker <dylan@pnwbakers.com>
Thu, 7 Dec 2017 18:22:27 +0000 (10:22 -0800)
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>
meson.build

index 1ea63fb12915c93a67d5e3a6f8d277451039205f..6e5ae4d24e9e55b1b2d3702300095b9516f26111 100644 (file)
@@ -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