[Mesa-dev] [PATCH 4/9] meson: require shared glapi when using DRI based libGL

Emil Velikov emil.l.velikov at gmail.com
Fri Feb 23 19:32:03 UTC 2018


From: Emil Velikov <emil.velikov at collabora.com>

Just like we do in the autotools build.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 417b9b4a79f..f97a3c56b09 100644
--- a/meson.build
+++ b/meson.build
@@ -347,8 +347,12 @@ if with_glx != 'disabled'
     if with_dri
       error('xlib conflicts with any dri driver')
     endif
-  elif with_glx == 'dri' and not with_dri
-    error('dri based GLX requires at least one DRI driver')
+  elif with_glx == 'dri'
+    if not with_dri
+      error('dri based GLX requires at least one DRI driver')
+    elif not with_shared_glapi
+      error('dri based GLX requires shared-glapi')
+    endif
   endif
 endif
 
-- 
2.16.0



More information about the mesa-dev mailing list