xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 28fa5dd5cad3a5fb51018250dfa2b605a8aea85c
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Apr 14 15:27:19 2014 +0200

    configure: require xproto 7.0.26 for pointer typedef removal
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index c70bd99..388e17c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,7 +789,7 @@ APPLEWMPROTO="applewmproto >= 1.4"
 XSHMFENCE="xshmfence >= 1.1"
 
 dnl Required modules
-XPROTO="xproto >= 7.0.22"
+XPROTO="xproto >= 7.0.26"
 RANDRPROTO="randrproto >= 1.4.0"
 RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.2.99.901"
commit d2274f2f46db300ac75ca0fdcba7f5655865b8b6
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Apr 14 15:27:18 2014 +0200

    configure: require fontsproto 2.1.3 for pointer typedef removal
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index bfe1fc9..c70bd99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -795,7 +795,7 @@ RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.2.99.901"
 INPUTPROTO="inputproto >= 2.3"
 KBPROTO="kbproto >= 1.0.3"
-FONTSPROTO="fontsproto"
+FONTSPROTO="fontsproto >= 2.1.3"
 FIXESPROTO="fixesproto >= 5.0"
 DAMAGEPROTO="damageproto >= 1.1"
 XCMISCPROTO="xcmiscproto >= 1.2.0"