xserver: Branch 'master' - 2 commits

[Eric Anholt]

 hw/xfree86/Makefile.am |    3 +++
 miext/cw/cw_ops.c      |    4 ++++
 2 files changed, 7 insertions(+)

New commits:
diff-tree 868e2cab706e317618646e064b0559d4e68c7b32 (from 53f74b6aa95fe57fda45fd8a051595e772f00402)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Fri Jun 16 10:17:51 2006 -0700

    Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries
    (such as libcw.la) that we link into the server, causing it to be rebuild
    automatically when they're updated.  Some system libraries are included, but
    don't appear to cause any harm.  You would think this would be automatic...

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 8665926..77d1dd8 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -43,6 +43,9 @@ XORG_LIBS = \
 	    dixmods/libdixmods.la \
             @XORG_LIBS@
 
+Xorg_DEPENDENCIES = \
+	$(XORG_LIBS)
+
 Xorg_LDADD = $(XORG_LIBS) \
              @XSERVER_LIBS@ \
 	     dixmods/libxorgxkb.la
diff-tree 53f74b6aa95fe57fda45fd8a051595e772f00402 (from b90088321e6ef84970aa97d7c851af93f49bf4b7)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Fri Jun 16 10:14:30 2006 -0700

    Bugzilla #5120, #7246: In CW's GC ops, validate the backing GC against the
    backing drawable if the serial numbers differ.  Fixes crash in XAA which
    occurred when the DDX bumped the serial number on the backing drawable and
    expected it to get re-validated, and we didn't because the wrapped drawable
    hadn't been bumped.

diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c
index 6ba804b..80b7280 100644
--- a/miext/cw/cw_ops.c
+++ b/miext/cw/cw_ops.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 
 #include "gcstruct.h"
+#include "pixmapstr.h"
 #include "cw.h"
 
 #define SETUP_BACKING_DST(_pDst, _pGC) \
@@ -43,6 +44,9 @@
 	&src_off_y)
 
 #define PROLOGUE(pGC) do { \
+    if (pBackingGC->serialNumber != pBackingDst->serialNumber) { \
+	ValidateGC(pBackingDst, pBackingGC); \
+    } \
     pGC->funcs = pGCPrivate->wrapFuncs;\
     pGC->ops = pGCPrivate->wrapOps;\
 } while (0)