Mesa (master): meson: fix deps and underlinkage of libGL

[Jon TURNEY]

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

Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Nov 23 13:51:43 2017 +0000

meson: fix deps and underlinkage of libGL

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 meson.build         | 6 ++++--
 src/glx/meson.build | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 9222e6ec23..aa923cd472 100644
--- a/meson.build
+++ b/meson.build
@@ -888,7 +888,7 @@ if with_platform_x11
     dep_x11 = dependency('x11')
     dep_xext = dependency('xext')
     dep_xcb = dependency('xcb')
-  elif with_glx == 'dri' and with_dri_platform == 'drm'
+  elif with_glx == 'dri'
     dep_x11 = dependency('x11')
     dep_xext = dependency('xext')
     dep_xdamage = dependency('xdamage', version : '>= 1.1')
@@ -896,9 +896,11 @@ 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' and with_dri_platform == 'drm')
+  if with_any_vk or with_glx == 'dri'
     dep_xcb = dependency('xcb')
     dep_x11_xcb = dependency('x11-xcb')
+  endif
+  if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
 
     if with_dri3
diff --git a/src/glx/meson.build b/src/glx/meson.build
index a7eb48a006..2ffef4cf22 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -168,6 +168,7 @@ if with_glx == 'dri'
     link_whole : libglx,
     link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl],
     dependencies : [dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11,
+                    dep_xcb_glx, dep_xcb, dep_x11_xcb,
                     dep_xcb_dri2, dep_xcb_dri3, extra_deps_libgl],
     version : gl_lib_version,
     install : true,