Import Mesa 18.3.2

4 files changed, 17 insertions, 28 deletions

diff --git a/lib/mesa/src/gallium/targets/graw-null/meson.build b/lib/mesa/src/gallium/targets/graw-null/meson.build
index 594798aab..8a294f413 100644
--- a/lib/mesa/src/gallium/targets/graw-null/meson.build
+++ b/lib/mesa/src/gallium/targets/graw-null/meson.build
@@ -21,21 +21,14 @@
 libgraw_util = static_library(
   'graw_util',
   ['graw_util.c'],
-  c_args : [c_msvc_compat_args],
-  gnu_symbol_visibility : 'hidden',
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-  dependencies : idep_mesautil,
+  include_directories : inc_common,
 )
 
 libgraw_null = shared_library(
   'graw_null',
   ['graw_null.c'],
-  c_args : [c_msvc_compat_args],
-  gnu_symbol_visibility : 'hidden',
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-  link_with : libgallium,
-  dependencies : idep_mesautil,
-  name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libgraw_null.dll
+  include_directories : inc_common,
+  link_with : [libmesa_util, libgallium],
 )
 
 libgraw = libgraw_null
diff --git a/lib/mesa/src/gallium/targets/graw-xlib/meson.build b/lib/mesa/src/gallium/targets/graw-xlib/meson.build
index c3308d90b..aab99ba64 100644
--- a/lib/mesa/src/gallium/targets/graw-xlib/meson.build
+++ b/lib/mesa/src/gallium/targets/graw-xlib/meson.build
@@ -21,12 +21,11 @@
 libgraw_xlib = shared_library(
   'graw_xlib',
   ['graw_xlib.c'],
-  gnu_symbol_visibility : 'hidden',
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys],
+  include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys],
   link_with : [
-    libgraw_util, libgallium, libws_xlib
+    libgraw_util, libmesa_util, libgallium, libws_xlib
   ],
-  dependencies : [idep_mesautil, driver_swrast, dep_x11],
+  dependencies : [dep_thread, driver_swrast],
   version : '1.0',
 )
 
diff --git a/lib/mesa/src/gallium/targets/xvmc/meson.build b/lib/mesa/src/gallium/targets/xvmc/meson.build
index 9fa0f659c..0af5b6477 100644
--- a/lib/mesa/src/gallium/targets/xvmc/meson.build
+++ b/lib/mesa/src/gallium/targets/xvmc/meson.build
@@ -34,33 +34,30 @@ endif
 libxvmc_gallium = shared_library(
   'XvMCgallium',
   'target.c',
-  gnu_symbol_visibility : 'hidden',
+  c_args : c_vis_args,
+  cpp_args : cpp_vis_args,
   link_args : [xvmc_link_args, ld_args_gc_sections],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
   link_whole : [libxvmc_st],
   link_with : [
-    libgalliumvlwinsys, libgalliumvl, libgallium,
+    libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
     libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
   ],
-  dependencies : [idep_mesautil, driver_r600, driver_nouveau],
+  dependencies : [dep_thread, driver_r600, driver_nouveau],
   link_depends : xvmc_link_depends,
-  # Will be deleted during installation, see install_megadrivers.py
-  install : true,
-  install_dir : xvmc_drivers_path,
-  name_suffix : 'so',
-  version : '@0@.@1@.0'.format(XVMC_MAJOR, XVMC_MINOR),
 )
 
 foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']]
   if d[0]
-    xvmc_drivers += 'libXvMC@0@.so.@1@.@2@.0'.format(d[1], XVMC_MAJOR, XVMC_MINOR)
+    xvmc_drivers += 'libXvMC@0@.so'.format(d[1])
   endif
 endforeach
 
 meson.add_install_script(
-  install_megadrivers_py.path(),
+  prog_python.path(),
+  join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
   libxvmc_gallium.full_path(),
   xvmc_drivers_path,
   xvmc_drivers,
diff --git a/lib/mesa/src/gallium/tests/graw/meson.build b/lib/mesa/src/gallium/tests/graw/meson.build
index 6d6840eb1..fd416c162 100644
--- a/lib/mesa/src/gallium/tests/graw/meson.build
+++ b/lib/mesa/src/gallium/tests/graw/meson.build
@@ -29,8 +29,8 @@ foreach t : progs
   executable(
     'graw-' + t,
     t + '.c',
-    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-    link_with : [libgraw, libgraw_util, libgallium],
-    dependencies : [dep_m, idep_mesautil],
+    include_directories : inc_common,
+    link_with : [libgraw, libgraw_util, libmesa_util, libgallium],
+    dependencies : [dep_m, dep_thread]
   )
 endforeach