[Xquartz-changes] xserver: Branch 'master' - 3 commits

[Jeremy Huddleston]

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

New commits:
commit acf2173b321749c42d29d858d3521a4d506c732e
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Jun 16 20:12:03 2011 -0400

    Install xml versions of specs even if HAVE_XMLTO is false
    
    DocBook/XML input source is also a useful output format that can be viewed
    with an XML viewer or editor and by some O/S help system.
    
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/doc/dtrace/Makefile.am b/doc/dtrace/Makefile.am
index aaf5a12..df26d2b 100644
--- a/doc/dtrace/Makefile.am
+++ b/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/docbook.am b/docbook.am
index 3af09f3..f1861c0 100644
--- a/docbook.am
+++ b/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
 #
@@ -92,5 +93,6 @@ XSLTPROC_FLAGS =					\
 
 endif HAVE_XSLTPROC
 endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
 
 CLEANFILES = $(shelf_DATA)
commit 44890b3e266116ae71bfca2590e5fd9cdfbdb69b
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Jun 16 20:11:52 2011 -0400

    Install target dbs alongside generated documents
    
    This matches a change in xorg-sgml-docs whereby the masterdb will look for
    the target dbs into the same location as the generated documents.
    
    The target dbs are now installed alongside the generated documents.
    Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
    has the potential of installing outside the package prefix and cause
    distcheck to fail when user does not have write permission in this package.
    
    Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 22566c9..145e4c3 100644
--- a/configure.ac
+++ b/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/docbook.am b/docbook.am
index 7ab7a00..3af09f3 100644
--- a/docbook.am
+++ b/docbook.am
@@ -72,7 +72,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
@@ -93,4 +93,4 @@ XSLTPROC_FLAGS =					\
 endif HAVE_XSLTPROC
 endif HAVE_STYLESHEETS
 
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)
commit a42ef6c940604172e54de110b7d989cb2208f7ef
Author: Rob Clark <robdclark at gmail.com>
Date:   Tue Jun 14 11:45:38 2011 -0500

    EXA: fix typo
    
    The incorrect drawable deltas were applied if dst was a redirected
    window.  Resulting in a bogus region passed to prepare_access_reg().
    
    Signed-off-by: Rob Clark <rob at ti.com>
    Reviewed-by: Michel Dänzer <michel at daenzer.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 078b91c..df416d5 100644
--- a/exa/exa_unaccel.c
+++ b/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);