[src/trunk]: src teach the build about glamor and install glamor.h.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf0e91b83409
branches:  trunk
changeset: 347228:cf0e91b83409
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 18 18:42:09 2016 +0000

description:
teach the build about glamor and install glamor.h.
fix SDK_REQUIRED_MODULES for xorg-server 1.18.

diffstat:

 distrib/sets/lists/xcomp/mi                           |  3 ++-
 external/mit/xorg/server/xorg-server/Makefile         |  8 ++++++--
 external/mit/xorg/server/xorg-server/Makefile.Xserver |  3 ++-
 external/mit/xorg/server/xorg-server/glamor/Makefile  |  5 +----
 external/mit/xorg/server/xorg-server/include/Makefile |  6 +++---
 5 files changed, 14 insertions(+), 11 deletions(-)

diffs (105 lines):

diff -r a1ae215b67aa -r cf0e91b83409 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Thu Aug 18 18:40:23 2016 +0000
+++ b/distrib/sets/lists/xcomp/mi       Thu Aug 18 18:42:09 2016 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.181 2016/08/18 08:11:22 mrg Exp $
+#       $NetBSD: mi,v 1.182 2016/08/18 18:42:09 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5942,6 +5942,7 @@
 ./usr/X11R7/include/xorg/gc.h                          -unknown-       xorg
 ./usr/X11R7/include/xorg/gcstruct.h                    -unknown-       xorg
 ./usr/X11R7/include/xorg/geext.h                       -unknown-       xorg
+./usr/X11R7/include/xorg/glamor.h                      -unknown-       xorg,xorg_server_ver=118
 ./usr/X11R7/include/xorg/globals.h                     -unknown-       xorg
 ./usr/X11R7/include/xorg/glx_extinit.h                 -unknown-       xorg,xorg_server_ver=118
 ./usr/X11R7/include/xorg/glyphstr.h                    -unknown-       xorg
diff -r a1ae215b67aa -r cf0e91b83409 external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile     Thu Aug 18 18:40:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile     Thu Aug 18 18:42:09 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2016/08/14 00:03:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.25 2016/08/18 18:42:09 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -23,13 +23,17 @@
 SUBDIR+=       dri3
 .endif
 
+.if ${XORG_XSERVER_GLAMOR} != "no"
+SUBDIR+=       glamor
+.endif
+
 .PATH: ${X11SRCDIR.xorg-server}
 
 PKGCONFIG=     xorg-server
 # Use -fvisibility=hidden for symbol_visibility?
 PKGCONFIG_SED_FLAGS= \
        -e "s,@sysconfigdir@,${X11ETCDIR},; \
-           s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.17 randrproto >= 1.2.99.3 renderproto >= 0.11 xextproto >= 7.1.99 inputproto >= 1.9.99.902 kbproto >= 1.0.3 fontsproto,; \
+           s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 
damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
            s,@symbol_visibility@,,"
 
 .include <bsd.x11.mk>
diff -r a1ae215b67aa -r cf0e91b83409 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Thu Aug 18 18:40:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Thu Aug 18 18:42:09 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.18 2016/08/16 07:56:47 mrg Exp $
+#      $NetBSD: Makefile.Xserver,v 1.19 2016/08/18 18:42:09 mrg Exp $
 
 .for _SL in \
        mi \
@@ -7,6 +7,7 @@
        xfixes \
        Xext \
        dbe \
+       glamor \
        present \
        pseudoramiX \
        record \
diff -r a1ae215b67aa -r cf0e91b83409 external/mit/xorg/server/xorg-server/glamor/Makefile
--- a/external/mit/xorg/server/xorg-server/glamor/Makefile      Thu Aug 18 18:40:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/glamor/Makefile      Thu Aug 18 18:42:09 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2016/08/18 07:48:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/08/18 18:42:09 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -52,8 +52,5 @@
                -I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
-INCSDIR=       ${X11INCDIR}/xorg
-INCS=          glamor.h
-
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r a1ae215b67aa -r cf0e91b83409 external/mit/xorg/server/xorg-server/include/Makefile
--- a/external/mit/xorg/server/xorg-server/include/Makefile     Thu Aug 18 18:40:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/include/Makefile     Thu Aug 18 18:42:09 2016 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.16 2016/08/15 22:01:44 mrg Exp $
+#      $NetBSD: Makefile,v 1.17 2016/08/18 18:42:09 mrg Exp $
 
 .include <bsd.own.mk>
 
 XORGSRC=       ${X11SRCDIR.xorg-server}
 
-XORGINC_SUBDIR=        Xext composite dbe dri3 exa fb include mi \
+XORGINC_SUBDIR=        Xext composite dbe dri3 exa fb glamor include mi \
                miext/damage miext/shadow miext/sync \
                present randr render xkb record
 XF86_SUBDIR=   common ddc dri fbdevhw i2c int10 modes \
@@ -33,7 +33,7 @@
        edid.h exa.h exevents.h \
        eventconvert.h events.h eventstr.h list.h \
        extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
-       fbpict.h fbrop.h fourcc.h gc.h gcstruct.h geext.h globals.h \
+       fbpict.h fbrop.h fourcc.h gc.h gcstruct.h geext.h glamor.h globals.h \
        glx_extinit.h glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
        mi.h micmap.h micoord.h \
        migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \