From 4703c93aaecf0d5794eca723cd5b1b72b04d04ee Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 20 Jun 2011 09:33:04 +0200
Subject: libX11 xserver mesa git update 20 June 2011

---
 xorg-server/configure.ac           | 2 +-
 xorg-server/doc/dtrace/Makefile.am | 2 --
 xorg-server/docbook.am             | 6 ++++--
 xorg-server/exa/exa_unaccel.c      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'xorg-server')

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 22566c9ef..145e4c32c 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -38,7 +38,7 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.14)
 XORG_DEFAULT_OPTIONS
 XORG_WITH_DOXYGEN(1.6.1)
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
 XORG_ENABLE_DOCS
 XORG_ENABLE_DEVEL_DOCS
 XORG_WITH_XMLTO(0.0.20)
diff --git a/xorg-server/doc/dtrace/Makefile.am b/xorg-server/doc/dtrace/Makefile.am
index aaf5a1267..df26d2b9e 100644
--- a/xorg-server/doc/dtrace/Makefile.am
+++ b/xorg-server/doc/dtrace/Makefile.am
@@ -1,6 +1,5 @@
 
 if ENABLE_DOCS
-if HAVE_XMLTO
 if XSERVER_DTRACE
 
 # Main DocBook/XML files (DOCTYPE book)
@@ -13,5 +12,4 @@ shelfdir = $(docdir)
 include $(top_srcdir)/docbook.am
 
 endif XSERVER_DTRACE
-endif HAVE_XMLTO
 endif ENABLE_DOCS
diff --git a/xorg-server/docbook.am b/xorg-server/docbook.am
index 7ab7a0050..f1861c0e1 100644
--- a/xorg-server/docbook.am
+++ b/xorg-server/docbook.am
@@ -20,6 +20,7 @@ shelf_DATA =
 # DocBook/XML file with chapters, appendix and images it includes
 dist_shelf_DATA = $(docbook) $(chapters)
 
+if HAVE_XMLTO
 #
 # Generate DocBook/XML output formats with or without stylesheets
 #
@@ -72,7 +73,7 @@ if HAVE_STYLESHEETS
 if HAVE_XSLTPROC
 
 # DocBook/XML generated document cross-reference database
-sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
 
 # Generate DocBook/XML document cross-reference database
 # Flags for the XSL Transformation processor generating xref target databases
@@ -92,5 +93,6 @@ XSLTPROC_FLAGS =					\
 
 endif HAVE_XSLTPROC
 endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
 
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)
diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index 078b91c77..df416d5ac 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -143,7 +143,7 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, DrawablePtr pDst,  GCPtr pGC,
 	RegionInitBoxes (&reg, pbox, nbox)) {
 	PixmapPtr pPixmap = exaGetDrawablePixmap(pDst);
 
-	exaGetDrawableDeltas(pSrc, pPixmap, &xoff, &yoff);
+	exaGetDrawableDeltas(pDst, pPixmap, &xoff, &yoff);
 	RegionTranslate(&reg, xoff, yoff);
 	pExaScr->prepare_access_reg(pPixmap, EXA_PREPARE_DEST, &reg);
 	RegionUninit(&reg);
-- 
cgit v1.2.3