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

[Jeremy Huddleston]

 hw/xquartz/mach-startup/Makefile.am |    1 -
 hw/xquartz/xpr/xprScreen.c          |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5bbe168761206a412d6777ae8bf22c1fb71f0fc8
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Thu Feb 5 13:04:55 2009 -0800

    Revert "XQuartz: Re-enable rlAccel"
    
    This reverts commit c962559889d1474aaa4396d565e59cbc779d0498.
    
    It's causing new crashes that I don't feel like debugging... Let EXA solve it in 1.6...

diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 2ed58d1..b011294 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -18,7 +18,6 @@ X11_bin_LDADD = \
 	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/miext/rootless/librootless.la \
-	$(top_builddir)/miext/rootless/accel/librlAccel.la \
 	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
 	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
 
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 52fb9c9..da262f6 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -364,7 +364,9 @@ xprSetupScreen(int index, ScreenPtr pScreen)
 {
     // Initialize accelerated rootless drawing
     // Note that this must be done before DamageSetup().
-    RootlessAccelInit(pScreen);
+
+    // These are crashing ugly... better to be stable and not crash for now.
+    //RootlessAccelInit(pScreen);
 
 #ifdef DAMAGE
     // The Damage extension needs to wrap underneath the