aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-20 09:35:03 +0200
committermarha <marha@users.sourceforge.net>2011-06-20 09:35:03 +0200
commit6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80 (patch)
treeb35ca00e86dfcff8ca05b8e4737cd10b7545c2fb /xorg-server
parent9bea2bf9069195c27824644331d4a275ea3df9f4 (diff)
parent4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff)
downloadvcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.gz
vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.bz2
vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/configure.ac2
-rw-r--r--xorg-server/doc/dtrace/Makefile.am2
-rw-r--r--xorg-server/docbook.am6
-rw-r--r--xorg-server/exa/exa_unaccel.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 9606e9926..f1c999d3e 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 1ed08d5b1..634d1a893 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);