xserver: Branch 'master'

[Ben Byer]

 dix/devices.c                |    4 ++++
 dix/dixfonts.c               |    1 +
 hw/Makefile.am               |   13 ++++++++++++-
 hw/xfree86/common/xf86Init.c |    1 +
 mi/miinitext.c               |    9 ++++++---
 5 files changed, 24 insertions(+), 4 deletions(-)

New commits:
diff-tree cf4994b0db2fef4c10ce8804adef766bc5118daf (from cece0601571f6304e392a3a40505664544b249f3)
Author: Ben Byer <bbyer at apple.com>
Date:   Sat Feb 17 01:21:43 2007 -0800

    dix mods for Darwin

diff --git a/dix/devices.c b/dix/devices.c
index 9f42184..0739de6 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -213,7 +213,11 @@ CoreKeyboardBell(int volume, DeviceIntPt
 {
     KeybdCtrl *ctrl = arg;
 
+#ifdef __DARWIN__
+    // not yet implemented :(
+#else
     DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
+#endif
 }
 
 static void
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index d5b42dc..5f087a3 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -64,6 +64,7 @@ Equipment Corporation.
 #include "opaque.h"
 #include "dixfontstr.h"
 #include "closestr.h"
+#include "dixfont.h"
 
 #ifdef DEBUG
 #include	<stdio.h>
diff --git a/hw/Makefile.am b/hw/Makefile.am
index d00d6fb..99df8e2 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -1,10 +1,18 @@
 if DMX
+if BUILD_DARWIN
+# Darwin does not need the dmx subdir
+else
 DMX_SUBDIRS = dmx
 endif
+endif
 
 if XORG
+if BUILD_DARWIN
+# Darwin does not need the xfree86 subdir
+else
 XORG_SUBDIRS = xfree86
 endif
+endif
 
 if XVFB
 XVFB_SUBDIRS = vfb
@@ -30,12 +38,15 @@ if XPRINT
 XPRINT_SUBDIRS = xprint
 endif
 
-# need to add darwin support here
+if BUILD_DARWIN
+DARWIN_SUBDIRS = darwin
+endif
 
 SUBDIRS =			\
 	$(XORG_SUBDIRS)		\
 	$(XGL_SUBDIRS)		\
 	$(XWIN_SUBDIRS)		\
+	$(DARWIN_SUBDIRS)	\
 	$(XVFB_SUBDIRS)		\
 	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)          \
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index ff878d5..221ab9a 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -36,6 +36,7 @@
 #endif
 
 #include <stdlib.h>
+#include <errno.h>
 
 #undef HAS_UTSNAME
 #if !defined(WIN32) && !defined(__UNIXOS2__)
diff --git a/mi/miinitext.c b/mi/miinitext.c
index cb34473..2c560d5 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -338,12 +338,14 @@ extern void XFree86DGAExtensionInit(INIT
 #endif
 #ifdef GLXEXT
 typedef struct __GLXprovider __GLXprovider;
+#ifndef __DARWIN__
 extern __GLXprovider __glXMesaProvider;
 extern void GlxPushProvider(__GLXprovider *impl);
-#ifndef __DARWIN__
 extern void GlxExtensionInit(INITARGS);
 extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
 #else
+extern __GLXprovider* __DarwinglXMesaProvider;
+extern void DarwinGlxPushProvider(__GLXprovider *impl);
 extern void DarwinGlxExtensionInit(INITARGS);
 extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
 #endif
@@ -629,13 +631,14 @@ InitExtensions(argc, argv)
     if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
 #endif
 #endif
-#ifdef GLXEXT
 
-    GlxPushProvider(&__glXMesaProvider);
+#ifdef GLXEXT
 #ifndef __DARWIN__
+    GlxPushProvider(&__glXMesaProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #else
     if (!noGlxExtension) DarwinGlxExtensionInit();
+    GlxPushProvider(&__glXMesaProvider);
 #endif
 #endif
 #ifdef XFIXES