Import Mesa 18.3.5

6 files changed, 6 insertions, 6 deletions

diff --git a/lib/mesa/src/gallium/targets/d3dadapter9/meson.build b/lib/mesa/src/gallium/targets/d3dadapter9/meson.build
index bc72b1110..b3c31c5dc 100644
--- a/lib/mesa/src/gallium/targets/d3dadapter9/meson.build
+++ b/lib/mesa/src/gallium/targets/d3dadapter9/meson.build
@@ -68,5 +68,5 @@ pkg.generate(
   description : 'Native D3D driver modules',
   version : '.'.join(nine_version),
   requires_private : 'libdrm >= ' + dep_libdrm.version(),
-  variables : ['moduledir=${prefix}/@0@'.format(d3d_drivers_path)],
+  variables : ['moduledir=@0@'.format(d3d_drivers_path)],
 )
diff --git a/lib/mesa/src/gallium/targets/omx/meson.build b/lib/mesa/src/gallium/targets/omx/meson.build
index 6811e6ff9..7772ae47b 100644
--- a/lib/mesa/src/gallium/targets/omx/meson.build
+++ b/lib/mesa/src/gallium/targets/omx/meson.build
@@ -32,7 +32,7 @@ endif
 
 libomx_gallium = shared_library(
   'omx_mesa',
-  'target.c',
+  ['target.c', xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [omx_link_args, ld_args_gc_sections],
diff --git a/lib/mesa/src/gallium/targets/va/meson.build b/lib/mesa/src/gallium/targets/va/meson.build
index ded689b46..8786c80b8 100644
--- a/lib/mesa/src/gallium/targets/va/meson.build
+++ b/lib/mesa/src/gallium/targets/va/meson.build
@@ -33,7 +33,7 @@ endif
 
 libva_gallium = shared_library(
   'gallium_drv_video',
-  'target.c',
+  ['target.c', xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [va_link_args, ld_args_gc_sections],
diff --git a/lib/mesa/src/gallium/targets/vdpau/meson.build b/lib/mesa/src/gallium/targets/vdpau/meson.build
index 22e3f5ffd..b53a4c232 100644
--- a/lib/mesa/src/gallium/targets/vdpau/meson.build
+++ b/lib/mesa/src/gallium/targets/vdpau/meson.build
@@ -38,7 +38,7 @@ endif
 
 libvdpau_gallium = shared_library(
   'vdpau_gallium',
-  'target.c',
+  ['target.c', xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [vdpau_link_args, ld_args_gc_sections],
diff --git a/lib/mesa/src/gallium/targets/xa/meson.build b/lib/mesa/src/gallium/targets/xa/meson.build
index 733ef54ff..582d5ef67 100644
--- a/lib/mesa/src/gallium/targets/xa/meson.build
+++ b/lib/mesa/src/gallium/targets/xa/meson.build
@@ -34,7 +34,7 @@ _xa_version = '.'.join(xa_version)
 
 libxatracker = shared_library(
   'xatracker',
-  'target.c',
+  ['target.c', xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [xa_link_args, ld_args_gc_sections],
diff --git a/lib/mesa/src/gallium/targets/xvmc/meson.build b/lib/mesa/src/gallium/targets/xvmc/meson.build
index 0af5b6477..f91ac4e8c 100644
--- a/lib/mesa/src/gallium/targets/xvmc/meson.build
+++ b/lib/mesa/src/gallium/targets/xvmc/meson.build
@@ -33,7 +33,7 @@ endif
 
 libxvmc_gallium = shared_library(
   'XvMCgallium',
-  'target.c',
+  ['target.c', xmlpool_options_h],
   c_args : c_vis_args,
   cpp_args : cpp_vis_args,
   link_args : [xvmc_link_args, ld_args_gc_sections],