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

[Jeremy Huddleston]

 configure.ac                          |    1 +
 glx/Makefile.am                       |    1 -
 hw/xquartz/mach-startup/bundle-main.c |    2 --
 hw/xquartz/quartzKeyboard.c           |    3 ++-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8ad55e484f0ba9073ce07a03de660cc546a7b668
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Aug 30 14:19:47 2008 -0700

    XQuartz: Fixed missing symbol in quartzKeyboard debugging

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index d26fbd3..264f6f8 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -1180,12 +1180,13 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
     int is_uchr = 1, i, j;
     OSStatus err;
     KeySym *k;
+    CFDataRef currentKeyLayoutDataRef = NULL;
 
     TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();
     keyboard_type = LMGetKbdType();
 
     if (currentKeyLayoutRef) {
-      CFDataRef currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
+      currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
       if (currentKeyLayoutDataRef)
           chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);
     }
commit 3739525d57dff2b3b034b5768f357b1c25577909
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Aug 30 14:18:07 2008 -0700

    XQuartz: Don't even build with GLX support since swrast now depends on libdrm

diff --git a/configure.ac b/configure.ac
index b146b7c..164bb1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,6 +669,7 @@ case $host_os in
 			XQUARTZ=yes
 			XVFB=no
 			XNEST=no
+			GLX=no
 
 			COMPOSITE=no
 			DGA=no
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 258cef1..6f1704e 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -54,7 +54,6 @@
 void DarwinListenOnOpenFD(int fd);
 
 extern int noPanoramiXExtension;
-extern Bool noGlxExtension;
 
 #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
 #define DEFAULT_STARTX "/usr/X11/bin/startx"
@@ -402,7 +401,6 @@ 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);
commit 780613b7f735ed9ab5dfdcdbb8d9c26addd1ddd9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Aug 29 22:26:46 2008 -0700

    XQuartz: Removed dead entry in Makefile.am

diff --git a/glx/Makefile.am b/glx/Makefile.am
index db05c08..39b96d7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -53,7 +53,6 @@ libglxdri_la_SOURCES = \
         extension_string.h
 
 libglx_la_SOURCES = \
-	$(XQUARTZ_libglx_la_SOURCES) \
 	$(indirect_sources) \
 	$(glapi_sources) \
 	indirect_util.c \