xserver: Branch 'master' - 2 commits

[Adam Jackson]

 configure.ac        |    1 +
 dri3/meson.build    |    2 +-
 include/meson.build |    7 +++----
 meson.build         |    3 ---
 4 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit d770f9293296d2d3c4e49e94130ff68c0890f625
Author: Daniel Stone <daniels at collabora.com>
Date:   Wed Sep 20 07:22:13 2017 -0700

    meson: Use dependency version_compare()
    
    We can check the version on an existing dependency, rather than spinning
    up pkg-config again just to check the right version.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>

diff --git a/include/meson.build b/include/meson.build
index 05ef76930..5eefc5f07 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -72,13 +72,12 @@ conf_data.set_quoted('SHMDIR', '/tmp')
 conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found())
 conf_data.set('WITH_LIBDRM', libdrm_dep.found())
 conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2',
-              dependency('libdrm', version: '>= 2.4.74', required: false).found())
+              libdrm_dep.found() and libdrm_dep.version().version_compare('>= 2.4.74'))
 conf_data.set('GLXEXT', build_glx)
 conf_data.set('GLAMOR', build_glamor)
 conf_data.set('GLAMOR_HAS_GBM', gbm_dep.found())
-if gbm_dep.found() and dependency('gbm', version: '>= 10.6', required: false).found()
-    conf_data.set('GLAMOR_HAS_GBM_LINEAR', build_glamor)
-endif
+conf_data.set('GLAMOR_HAS_GBM_LINEAR',
+              gbm_dep.found() and gbm_dep.version().version_compare('>= 10.6'))
 
 conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
 conf_data.set_quoted('PROJECTROOT', get_option('prefix'))
diff --git a/meson.build b/meson.build
index ea2a01520..26fd9a893 100644
--- a/meson.build
+++ b/meson.build
@@ -210,9 +210,6 @@ endif
 gbm_dep = dependency('', required:false)
 if build_glamor
     gbm_dep = dependency('gbm', version: '>= 10.2', required: false)
-    if gbm_dep.found()
-        gbm_linear_dep = dependency('gbm', version: '>= 10.6', required: false)
-    endif
 endif
 
 # XXX: Add more sha1 options, because Linux is about choice
commit 86a89dd6020f59964c0e924acbfae9d5a51e3148
Author: Daniel Stone <daniels at collabora.com>
Date:   Wed Sep 20 07:22:12 2017 -0700

    Build: Use dri3proto/libdrm CFLAGS
    
    Make sure we get the CFLAGS required for building DRI3 into the
    command line.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>

diff --git a/configure.ac b/configure.ac
index f13a54ab9..ec98f52c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1197,6 +1197,7 @@ PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO,
 
 case "$DRI3,$HAVE_DRI3PROTO" in
 	yes,yes | auto,yes)
+		REQUIRED_MODULES="$REQUIRED_MODULES dri3proto"
 		;;
 	yes,no)
 		AC_MSG_ERROR([DRI3 requested, but dri3proto not found.])
diff --git a/dri3/meson.build b/dri3/meson.build
index 3d05020e6..0deec32aa 100644
--- a/dri3/meson.build
+++ b/dri3/meson.build
@@ -9,7 +9,7 @@ if build_dri3
     libxserver_dri3 = static_library('libxserver_dri3',
         srcs_dri3,
         include_directories: inc,
-        dependencies: common_dep,
+        dependencies: [ common_dep, libdrm_dep ],
         c_args: '-DHAVE_XORG_CONFIG_H'
         )
 endif