From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 15 Nov 2017 18:50:11 +0000 (-0800)
Subject: meson: Use driver dependencies for libgl-xlib target
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60283769ec3ad05f31d8f66576d5b3c94968a6de;p=mesa.git

meson: Use driver dependencies for libgl-xlib target

v2: - put driver_swrast in the right field
    - add dep_threads (dep_llvm requires threads, so it masked this
      previously)

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 825b7b4a0f1..c7587d30d80 100644
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -29,10 +29,7 @@ gallium_xlib_c_args = [
 ]
 gallium_xlib_ld_args = []
 gallium_xlib_link_with = []
-gallium_xlib_depends = []
 gallium_xlib_link_depends = []
-gallium_xlib_xlibvers = []
-gallium_xlib_sources = []
 
 if with_ld_version_script
   gallium_xlib_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'libgl-xlib.sym')]
@@ -41,11 +38,6 @@ endif
 if with_shared_glapi
   gallium_xlib_link_with += libglapi
 endif
-if with_llvm
-  gallium_xlib_c_args += '-DGALLIUM_LLVMPIPE'
-  gallium_xlib_depends += dep_llvm
-  gallium_xlib_link_with += libllvmpipe
-endif
 # TODO: SWR
 
 libgl = shared_library(
@@ -59,10 +51,10 @@ libgl = shared_library(
   link_args : [ld_args_bsymbolic, ld_args_gc_sections, gallium_xlib_ld_args],
   link_depends : gallium_xlib_link_depends,
   link_with : [
-    libxlib, libws_xlib, libsoftpipe, libtrace, librbug, libglapi_static,
+    libxlib, libws_xlib, libtrace, librbug, libglapi_static,
     libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with,
   ],
-  dependencies : [dep_clock, dep_unwind, gallium_xlib_depends],
+  dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast],
   install : true,
   version : '1.5.0',
 )