meson: replace last uses of libxmlconfig with idep_xmlconfig

[mesa.git] / src / gallium / targets / pipe-loader / meson.build

diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
index 25b26a34cac4f9fec7d7aaa9bb6bf058b958c07c..614cad6cecde887f36c5176d2ad6b2d292bb3473 100644 (file)
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-2018 Intel Corporation
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,20 +20,21 @@
 
 pipe_loader_link_args = [ld_args_gc_sections]
 pipe_loader_link_deps = []
-pipe_loader_link_with = [libgallium, libnir, libmesa_util, librbug, libtrace]
-pipe_loader_comp_args = ['-DGALLIUM_RBUG', '-DGALLIUM_TRACE']
+pipe_loader_link_with = [libgallium, libnir]
+pipe_loader_comp_args = []
 pipe_loader_incs = [
   inc_include, inc_src, inc_util, inc_gallium, inc_gallium_drivers,
   inc_gallium_winsys, inc_gallium_aux,
 ]
 
-if (with_gallium_va or with_gallium_vdpau or with_gallium_omx or
+if (with_gallium_va or with_gallium_vdpau or with_gallium_omx != 'disabled' or
     with_gallium_xvmc or with_dri)
   pipe_loader_link_with += libgalliumvl
 else
-  pipe_loader_link_with += libgalliumvl_stubs
+  pipe_loader_link_with += libgalliumvl_stub
 endif
-if with_gallium_va or with_gallium_vdpau or with_gallium_omx or with_gallium_xvmc
+if (with_gallium_va or with_gallium_vdpau or with_gallium_omx != 'disabled' or
+    with_gallium_xvmc)
   pipe_loader_link_with += libgalliumvlwinsys
 endif
 
@@ -51,7 +52,7 @@ pipe_loaders = [
   [with_gallium_nouveau, 'nouveau', driver_nouveau, [], []],
   [with_gallium_r300, 'r300', driver_r300, [], []],
   [with_gallium_r600, 'r600', driver_r600, [], []],
-  [with_gallium_radeonsi, 'radeonsi', driver_radeonsi, [libxmlconfig], [xmlpool_options_h]],
+  [with_gallium_radeonsi, 'radeonsi', [driver_radeonsi, idep_xmlconfig], [], []],
   [with_gallium_freedreno, 'msm', driver_freedreno, [], []],
   [with_gallium_svga, 'vmwgfx', driver_svga, [], []],
   [with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null], []],
@@ -68,7 +69,7 @@ foreach x : pipe_loaders
       link_depends : pipe_loader_link_deps,
       include_directories : pipe_loader_incs,
       link_with : [pipe_loader_link_with, x[3]],
-      dependencies : [dep_thread, x[2]],
+      dependencies : [idep_mesautil, dep_thread, x[2]],
       name_prefix : '',
       install : true,
       install_dir : pipe_loader_install_dir,