xserver: Branch 'master'

[GitLab Mirror]

 configure.ac        |    2 +-
 present/meson.build |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e39dc0f5b7c88c9ba670383658846a1f658cbc47
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jun 20 12:15:31 2019 -0400

    present: Require presentproto 1.2
    
    The PresentOptionSuboptimal support code is not optional (once you've
    enabled building Present at all), so require a protocol package version
    that defines what we need.
    
    Fixes: xorg/xserver#821

diff --git a/configure.ac b/configure.ac
index 55bb6942a..9148b94f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -754,7 +754,7 @@ DAMAGEPROTO="damageproto >= 1.1"
 XCMISCPROTO="xcmiscproto >= 1.2.0"
 BIGREQSPROTO="bigreqsproto >= 1.1.0"
 XTRANS="xtrans >= 1.3.5"
-PRESENTPROTO="presentproto >= 1.1"
+PRESENTPROTO="presentproto >= 1.2"
 
 dnl List of libraries that require a specific version
 LIBAPPLEWM="applewm >= 1.4"
diff --git a/present/meson.build b/present/meson.build
index e316af20d..3dc1fc04b 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -22,7 +22,7 @@ libxserver_present = static_library('libxserver_present',
     include_directories: inc,
     dependencies: [
         common_dep,
-        dependency('presentproto', version: '>= 1.1')
+        dependency('presentproto', version: '>= 1.2')
     ],
     c_args: '-DHAVE_XORG_CONFIG_H'
 )