From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Fri, 3 May 2019 16:06:22 +0000 (-0400)
Subject: meson: Fix missing glproto dependency for gallium-glx
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a381dbf2537003c8bf7e32ad314c9266846a168f;p=mesa.git

meson: Fix missing glproto dependency for gallium-glx

Signed-off-by: Chuck Atkins <chuck.atkins@kitware.com>
Cc: mesa-stable <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
---

diff --git a/meson.build b/meson.build
index 2df33f26100..a637f3b1442 100644
--- a/meson.build
+++ b/meson.build
@@ -1400,12 +1400,14 @@ if with_platform_x11
       dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
     endif
   endif
-  if with_glx == 'dri'
+  if with_glx == 'dri' or with_glx == 'gallium-xlib'
+    dep_glproto = dependency('glproto', version : '>= 1.4.14')
+  endif
+  if with_glx == 'dri' 
     if with_dri_platform == 'drm'
       dep_dri2proto = dependency('dri2proto', version : '>= 2.8')
       dep_xxf86vm = dependency('xxf86vm')
     endif
-    dep_glproto = dependency('glproto', version : '>= 1.4.14')
   endif
   if (with_egl or (
       with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or
diff --git a/src/gallium/state_trackers/glx/xlib/meson.build b/src/gallium/state_trackers/glx/xlib/meson.build
index f4ee75426bc..34b93c94cf2 100644
--- a/src/gallium/state_trackers/glx/xlib/meson.build
+++ b/src/gallium/state_trackers/glx/xlib/meson.build
@@ -23,5 +23,5 @@ libxlib = static_library(
   files('glx_api.c', 'glx_getproc.c', 'glx_usefont.c', 'xm_api.c', 'xm_st.c'),
   c_args : c_vis_args,
   include_directories : [inc_common, inc_mapi, inc_mesa],
-  dependencies : [dep_x11, dep_xext, dep_xcb],
+  dependencies : [dep_x11, dep_xext, dep_xcb, dep_glproto],
 )