Module Name: src
Committed By: mrg
Date: Thu Aug 18 18:42:09 UTC 2016
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver
src/external/mit/xorg/server/xorg-server/glamor: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
Log Message:
teach the build about glamor and install glamor.h.
fix SDK_REQUIRED_MODULES for xorg-server 1.18.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.181 src/distrib/sets/lists/xcomp/mi:1.182
--- src/distrib/sets/lists/xcomp/mi:1.181 Thu Aug 18 08:11:22 2016
+++ src/distrib/sets/lists/xcomp/mi Thu Aug 18 18:42:09 2016
@@ -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
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.24 src/external/mit/xorg/server/xorg-server/Makefile:1.25
--- src/external/mit/xorg/server/xorg-server/Makefile:1.24 Sun Aug 14 00:03:57 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile Thu Aug 18 18:42:09 2016
@@ -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+= hw
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>
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.18 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.19
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.18 Tue Aug 16 07:56:47 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Thu Aug 18 18:42:09 2016
@@ -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 \
Index: src/external/mit/xorg/server/xorg-server/glamor/Makefile
diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.1 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.1 Thu Aug 18 07:48:14 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Thu Aug 18 18:42:09 2016
@@ -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 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
-INCSDIR= ${X11INCDIR}/xorg
-INCS= glamor.h
-
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.16 src/external/mit/xorg/server/xorg-server/include/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.16 Mon Aug 15 22:01:44 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Thu Aug 18 18:42:09 2016
@@ -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 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
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 \
