xserver ChangeLog,3.191,3.192 configure.ac,3.82,3.83

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv724

Modified Files:
	ChangeLog configure.ac 
Log Message:
2004-06-04  Keith Packard  <keithp at keithp.com>

	* configure.ac:
	* hw/Makefile.am:
	Add top-level build support for GL X server (not working yet)

	* composite/compinit.c: (compAddAlternateVisuals):
	Fix a few allocation bugs with alternate visual ids
	Allow for non-8/8/8 alternate visuals
	
	* hw/kdrive/src/kshadow.c: (KdShadowSet):
	Turn off any existing shadow before enabling it again
	(avoids re-registering existing damage)

	* miext/damage/damage.c: (damageRemoveDamage),
	(damageInsertDamage), (DamageRegister), (DamageUnregister):
	Add some validation code to catch re-registered damages


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.191
retrieving revision 3.192
diff -u -d -r3.191 -r3.192
--- a/ChangeLog	3 Jun 2004 13:39:19 -0000	3.191
+++ b/ChangeLog	4 Jun 2004 16:10:49 -0000	3.192
@@ -1,3 +1,21 @@
+2004-06-04  Keith Packard  <keithp at keithp.com>
+
+	* configure.ac:
+	* hw/Makefile.am:
+	Add top-level build support for GL X server (not working yet)
+
+	* composite/compinit.c: (compAddAlternateVisuals):
+	Fix a few allocation bugs with alternate visual ids
+	Allow for non-8/8/8 alternate visuals
+	
+	* hw/kdrive/src/kshadow.c: (KdShadowSet):
+	Turn off any existing shadow before enabling it again
+	(avoids re-registering existing damage)
+
+	* miext/damage/damage.c: (damageRemoveDamage),
+	(damageInsertDamage), (DamageRegister), (DamageUnregister):
+	Add some validation code to catch re-registered damages
+
 2004-06-03  Philip Blundell  <philb at gnu.org>
 
 	* configure.ac: New options --disable-unix-transport,

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.82
retrieving revision 3.83
diff -u -d -r3.82 -r3.83
--- a/configure.ac	3 Jun 2004 13:39:19 -0000	3.82
+++ b/configure.ac	4 Jun 2004 16:10:49 -0000	3.83
@@ -98,6 +98,7 @@
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])
 AC_ARG_ENABLE(xsdlserver,    [  --enable-xsdlserver ],[XSDLSERVER=$enableval],[XSDLSERVER=no])
 AC_ARG_ENABLE(xorgserver,    [  --enable-xorgserver ],[XORGSERVER=$enableval],[XORGSERVER=no])
+AC_ARG_ENABLE(xglserver,     [  --enable-xglserver ],[XGLSERVER=$enableval],[XGLSERVER=no])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
@@ -188,6 +189,11 @@
 fi
 AC_SUBST([XKB])
 
+AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes])
+if test "$XGLSERVER" = yes; then
+	AC_DEFINE(XGLSERVER,1,[Build GL X server])
+fi
+
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
 if test "$XTRAP" = yes; then
 	AC_DEFINE(XTRAP,1,[Support XTrap extension])
@@ -510,6 +516,24 @@
 AC_SUBST([XORG_OS_SUBDIR])
 AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes])
 
+XGL_LIBS=
+XGL_INCS=
+XGL_PURE_LIBS=
+XGL_PURE_INCS=
+if test "$XGLSERVER" = yes; then
+	XGL_PURE_LIBS="$DIX_LIB $OS_LIB \
+	                  $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB \
+			  $SHADOW_LIB $XPSTUBS_LIB"
+	XGL_PURE_INCS="$XGL_INC $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \
+	                  $MI_INC"
+	XGL_LIBS="$XGL_PURE_LIBS $XGL_OS_LIB"
+	XGL_INCS="$XGL_PURE_INCS $XGL_OS_INC"
+fi
+AC_SUBST([XGL_PURE_LIBS])
+AC_SUBST([XGL_PURE_INCS])
+AC_SUBST([XGL_LIBS])
+AC_SUBST([XGL_INCS])
+
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
 XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include -I${top_srcdir}/Xext'
@@ -608,4 +632,5 @@
 hw/xorg/vbe/Makefile
 hw/xorg/vgahw/Makefile
 hw/xorg/xaa/Makefile
+hw/xgl/Makefile
 ])