xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/dixmods/meson.build |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1dd14e7a499428cf7215b49a9319199545bcd6cb
Author: Eric Anholt <eric at anholt.net>
Date:   Mon May 8 10:36:30 2017 -0700

    meson: Use link_whole() not link_with(), for the Xorg dixmods.
    
    I clearly hadn't run ninja test, since fb no longer had any of the fb
    symbols in it.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 39276dc32..e4ffdba93 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -18,7 +18,7 @@ shared_module(
     include_directories: [inc, xorg_inc],
     c_args: xorg_c_args,
     dependencies: common_dep,
-    link_with: libxserver_fb,
+    link_whole: libxserver_fb,
 
     install: true,
     install_dir: module_dir,
@@ -31,7 +31,7 @@ shared_module(
     include_directories: [inc, xorg_inc],
     c_args: [ xorg_c_args, wfb_args ],
     dependencies: common_dep,
-    link_with: libxserver_wfb,
+    link_whole: libxserver_wfb,
 
     install: true,
     install_dir: module_dir,
@@ -43,7 +43,7 @@ shared_module(
     include_directories: [inc, xorg_inc],
     c_args: xorg_c_args,
     dependencies: common_dep,
-    link_with: libxserver_miext_shadow,
+    link_whole: libxserver_miext_shadow,
 
     install: true,
     install_dir: module_dir,
@@ -57,7 +57,7 @@ if build_glx
         include_directories: [ inc, xorg_inc, glx_inc ],
         c_args: [ xorg_c_args, glx_align64 ],
         dependencies: [ common_dep, dl_dep ],
-        link_with: libxserver_glx,
+        link_whole: libxserver_glx,
 
         install: true,
         install_dir: join_paths(module_dir, 'extensions')