xserver: Branch 'master'

[Adam Jackson]

 hw/xwin/glx/meson.build          |    2 +-
 hw/xwin/winclipboard/meson.build |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2d29daf4c69385513a322002570ec2c41cfc838f
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Jan 18 16:18:12 2018 +0000

    meson.build: Fix hw/xwin build when dependencies are installed in a non-default location
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/hw/xwin/glx/meson.build b/hw/xwin/glx/meson.build
index e9969536d..57cce039d 100644
--- a/hw/xwin/glx/meson.build
+++ b/hw/xwin/glx/meson.build
@@ -75,7 +75,7 @@ xwin_glx = static_library(
         top_srcdir_inc,
         include_directories('../'),
     ],
-    dependencies: pixman_dep,
+    dependencies: common_dep,
     c_args: xwin_glx_c_args,
 )
 
diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
index 1c784c384..dd7b2d20e 100644
--- a/hw/xwin/winclipboard/meson.build
+++ b/hw/xwin/winclipboard/meson.build
@@ -27,5 +27,6 @@ executable(
     srcs_xwinclip,
     link_with: xwin_clipboard,
     link_args: ['-lgdi32', '-lpthread'],
+    dependencies: [dependency('x11')],
     install: true,
 )