xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 hw/xquartz/mach-startup/bundle-main.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4411b8b4de396356bc3893fc8b49631babf7a48a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Aug 29 21:01:24 2008 -0700

    XQuartz: Disable GLX for now, since we don't have a working solution.

diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 6f1704e..258cef1 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -54,6 +54,7 @@
 void DarwinListenOnOpenFD(int fd);
 
 extern int noPanoramiXExtension;
+extern Bool noGlxExtension;
 
 #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
 #define DEFAULT_STARTX "/usr/X11/bin/startx"
@@ -401,6 +402,7 @@ int main(int argc, char **argv, char **envp) {
 
     // The server must not run the PanoramiX operations.
     noPanoramiXExtension = TRUE;
+    noGlxExtension = TRUE;
 
     /* Setup the initial crasherporter info */
     strlcpy(__crashreporter_info__, __crashreporter_info__base, __crashreporter_info__len);