Bring in Xfixes, Xdamage, and Xcomposite userland from xserver CVS:

- Update Xfixes headers to protocol major version 3.
- Add composite headers.
- Add libXfixes, libXdamage, and libXcomposite.
- Add imake glue for new libraries, but leave Composite off by default
    until issues are resolved.

1 files changed, 97 insertions, 2 deletions

diff --git a/X11.tmpl b/X11.tmpl
index aeb0db4..4ea3ab5 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.19 2004/07/26 16:54:21 alanc Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.20 2004/07/31 01:38:58 stukreit Exp $
 XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
 XCOMM
 XCOMM
@@ -657,6 +657,15 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
 #define BuildDamageLibrary	!BuildServersOnly
 #endif
 
+#ifndef BuildComposite
+XCOMM Composite is disabled until it gets all merged.
+#define BuildComposite		(NO && BuildXfixes && BuildDamage)
+#endif
+#ifndef BuildCompositeLibrary
+#define BuildCompositeLibrary	!BuildServersOnly && (BuildXfixesLibrary && \
+				BuildDamageLibrary)
+#endif
+
 #ifndef BuildXevie
 #define BuildXevie		YES
 #endif
@@ -1205,6 +1214,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #endif
 #endif
 
+#ifndef CompositeDefines
+#if BuildComposite
+#define CompositeDefines -DCOMPOSITE
+#else
+#define CompositeDefines /**/
+#endif
+#endif
+
 #ifndef XevieDefines
 #if BuildXevie
 #define XevieDefines -DXEVIE
@@ -1223,7 +1240,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 	XF86BigfontExtensionDefines DPMSDefines \
 	LowMemDefines XprintDefines XineramaDefines \
 	SitePervasiveExtensionDefines RenderDefines RandRDefines \
-	XfixesDefines XDamageDefines XevieDefines
+	XfixesDefines XDamageDefines CompositeDefines XevieDefines
 #endif
 #ifndef SiteExtensionDefines
 #define SiteExtensionDefines /**/
@@ -2153,6 +2170,30 @@ ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir)
 # define ProfileLibXrandr	NO
 #endif
 
+#if BuildXfixesLibrary
+#ifndef SharedLibXfixes
+#define SharedLibXfixes		HasSharedLibraries
+#endif
+#ifndef NormalLibXfixes
+#define NormalLibXfixes		(!SharedLibXfixes || ForceNormalLib)
+#endif
+#ifndef DebugLibXfixes
+#define DebugLibXfixes		NO
+#endif
+#ifndef ProfileLibXfixes
+#define ProfileLibXfixes	NO
+#endif
+#else
+#undef  SharedLibXfixes
+#define SharedLibXfixes		NO
+#undef  NormalLibXfixes
+#define NormalLibXfixes		NO
+#undef  DebugLibXfixes
+#define DebugLibXfixes		NO
+#undef  ProfileLibXfixes
+#define ProfileLibXfixes	NO
+#endif
+
 #if BuildDamageLibrary
 #ifndef SharedLibXdamage
 #define SharedLibXdamage	HasSharedLibraries
@@ -2177,6 +2218,30 @@ ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir)
 #define ProfileLibXdamage	NO
 #endif
 
+#if BuildCompositeLibrary
+#ifndef SharedLibXcomposite
+#define SharedLibXcomposite	HasSharedLibraries
+#endif
+#ifndef NormalLibXcomposite
+#define NormalLibXcomposite	(!SharedLibXcomposite || ForceNormalLib)
+#endif
+#ifndef DebugLibXcomposite
+#define DebugLibXcomposite	NO
+#endif
+#ifndef ProfileLibXcomposite
+#define ProfileLibXcomposite	NO
+#endif
+#else
+#undef  SharedLibXcomposite
+#define SharedLibXcomposite	NO
+#undef  NormalLibXcomposite
+#define NormalLibXcomposite	NO
+#undef  DebugLibXcomposite
+#define DebugLibXcomposite	NO
+#undef  ProfileLibXcomposite
+#define ProfileLibXcomposite	NO
+#endif
+
 #if BuildXcursorLibrary
 #ifndef SharedLibXcursor
 #define SharedLibXcursor	HasSharedLibraries
@@ -2581,6 +2646,36 @@ SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
 ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
 #endif
 
+    XFIXESRLIBSRC = $(LIBSRC)/Xfixes
+#if SharedLibXfixes
+#ifndef SharedXfixesRev
+#define SharedXfixesRev 3.0
+#endif
+SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev)
+#else
+ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
+#endif
+
+   XDAMAGERLIBSRC = $(LIBSRC)/Xdamage
+#if SharedLibXdamage
+#ifndef SharedXdamageRev
+#define SharedXdamageRev 1.0
+#endif
+SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
+#else
+ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
+#endif
+
+XCOMPOSITERLIBSRC = $(LIBSRC)/Xcomposite
+#if SharedLibXcomposite
+#ifndef SharedXcompositeRev
+#define SharedXcompositeRev 1.0
+#endif
+SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev)
+#else
+ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir)
+#endif
+
    XCURSORRLIBSRC = $(LIBSRC)/Xcursor
 #if SharedLibXcursor
 #ifndef SharedXcursorRev