xserver: Branch 'master' - 2 commits

[Adam Jackson]

 glx/meson.build                |    2 +-
 hw/xfree86/dixmods/meson.build |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ea275cd3d5fb561c6aed7876f486e1124082426c
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Apr 28 15:09:38 2017 -0700

    meson: Fix glx build with DRI2 disabled.
    
    A common meson pattern is to use empty arrays for optional sources and
    dependencies, since it generally iterates over trees of arrays looking
    for values.  A value of '' will actually go looking for ''.
    
    Daniel Stone <daniels at collabora.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/glx/meson.build b/glx/meson.build
index c5f5ecc8f..a4af2b846 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -49,7 +49,7 @@ if build_glx
     )
 endif
 
-srcs_glxdri2 = ''
+srcs_glxdri2 = []
 if build_dri2 or build_dri3
     srcs_glxdri2 = files('glxdri2.c')
 endif
commit 62f727c7ea359b7bdf58d9b827731a082b47553d
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Apr 28 15:09:37 2017 -0700

    meson: use link_with for Xorg's shared modules as well as Xorg.
    
    I converted Xorg when meson 0.40 came out, but fumbled my grep and
    forgot that I had instances of the .extract_all_objects() workaround
    in dixmods, too.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 36027f045..39276dc32 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,
-    objects: libxserver_fb.extract_all_objects(),
+    link_with: 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,
-    objects: libxserver_wfb.extract_all_objects(),
+    link_with: 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,
-    objects: libxserver_miext_shadow.extract_all_objects(),
+    link_with: 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 ],
-        objects: libxserver_glx.extract_all_objects(),
+        link_with: libxserver_glx,
 
         install: true,
         install_dir: join_paths(module_dir, 'extensions')