xserver: Branch 'xorg-server-1.2-apple' - 2 commits

[Ben Byer]

 configure.ac                      |    1 -
 hw/darwin/quartz/xpr/xprCursor.c  |   11 ++++++++++-
 hw/xfree86/os-support/Makefile.am |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 2c8e36ecd16bd7fea83f3adbd5bef9fef8587f44
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Mon Oct 29 16:18:48 2007 -0700

    Added patch fix yellow-cursor problem which appears on some Intel Macs

diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index 570ef0b..02260bd 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -83,8 +83,17 @@ load_cursor(CursorPtr src, int screen)
 #ifdef ARGB_CURSOR
     if (src->bits->argb != NULL)
     {
-        rowbytes = src->bits->width * sizeof(CARD32);
+#if BITMAP_BIT_ORDER == MSBFirst
+        rowbytes = src->bits->width * sizeof (CARD32);
         data = (uint32_t *) src->bits->argb;
+#else
+        const uint32_t *be_data=(uint32_t *) src->bits->argb;
+        unsigned i;
+        rowbytes = src->bits->width * sizeof (CARD32);
+        data=alloca (rowbytes * src->bits->height);
+        for(i=0;i<(src->bits->width*src->bits->height);i++)
+            data[i]=ntohl(be_data[i]);
+#endif
     }
     else
 #endif
commit 353d0de660bbb00b298efe59ba24b3196e087d39
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Mon Oct 29 16:15:22 2007 -0700

    Some autoconf hacks to make 'make dist' work correctly

diff --git a/configure.ac b/configure.ac
index 72cd2e5..d63b681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1959,7 +1959,6 @@ hw/xfree86/os-support/misc/Makefile
 hw/xfree86/os-support/linux/Makefile
 hw/xfree86/os-support/lynxos/Makefile
 hw/xfree86/os-support/sco/Makefile
-hw/xfree86/os-support/solaris/Makefile
 hw/xfree86/os-support/sysv/Makefile
 hw/xfree86/os-support/usl/Makefile
 hw/xfree86/parser/Makefile
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index 6cd9bb1..f40a662 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = bus @XORG_OS_SUBDIR@ misc
-DIST_SUBDIRS = bsd bus misc linux lynxos solaris sysv sco usl hurd
+DIST_SUBDIRS = bsd bus misc linux lynxos sysv sco usl hurd
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \
               assyntax.h xf86OSKbd.h xf86OSmouse.h