xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 1f5742d27187fabba0c556b50ebfcd9fddfdcf2b
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Dec 17 12:01:59 2018 +0000

    meson: Fix building unit tests when protocol headers aren't in default include path

diff --git a/test/meson.build b/test/meson.build
index 344784734..784100cca 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -165,7 +165,7 @@ if build_xorg
     unit = executable('tests',
          unit_sources,
          c_args: unit_defines,
-         dependencies: pixman_dep,
+         dependencies: [pixman_dep, randrproto_dep, inputproto_dep],
          include_directories: unit_includes,
          link_args: ldwraps,
          link_with: xorg_link,