xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/dixmods/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a530b6e8923f2b9153a773c8618a1e2f41619288
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 30 18:01:27 2019 -0400

    meson: Fix libshadow.so linkage
    
    Don't link against fb, it's the driver's responsibility to load that
    first. Underlinking like this is unpleasant but this matches what
    autotools does.
    
    Fixes: xorg/xserver#540

diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 835d23215..0562b630f 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -34,7 +34,7 @@ shared_module(
     c_args: xorg_c_args,
     dependencies: common_dep,
     link_whole: libxserver_miext_shadow,
-    link_with: [fb, e],
+    link_with: e,
 
     install: true,
     install_dir: module_dir,