Mesa (master): meson: Fix building gallium media targets with gallium-xlib glx

Dylan Baker dbaker at kemper.freedesktop.org
Thu Dec 7 18:25:08 UTC 2017


Module: Mesa
Branch: master
Commit: c34b53f13326c89e09447d759ee188fe9c4964d8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c34b53f13326c89e09447d759ee188fe9c4964d8

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Dec  5 09:40:03 2017 -0800

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 at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 1ea63fb129..6e5ae4d24e 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




More information about the mesa-commit mailing list