xserver: Branch 'master'

[Adam Jackson]

 hw/vfb/InitOutput.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 9f2a108051aad9b024ab737b45fc12290a113e37 (from a1ac0440bba690368aa4226468ce571be1a09d95)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Wed Aug 23 14:38:34 2006 -0400

    Make 'Xvfb -render' also disable Composite, lest we segfault on startup.

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index b8253f6..a2d8661 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -364,6 +364,9 @@ ddxProcessArgument(int argc, char *argv[
     if (strcmp (argv[i], "-render") == 0)	/* -render */
     {
 	Render = FALSE;
+#ifdef COMPOSITE
+	noCompositeExtension = TRUE;
+#endif
 	return 1;
     }