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

1 files changed, 59 insertions, 67 deletions

diff --git a/libX11/specs/xmlrules.in b/libX11/specs/xmlrules.in
index b58ff5f08..8b105f334 100644
--- a/libX11/specs/xmlrules.in
+++ b/libX11/specs/xmlrules.in
@@ -1,67 +1,59 @@
-#

-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

-#

-# Permission is hereby granted, free of charge, to any person obtaining a

-# copy of this software and associated documentation files (the "Software"),

-# to deal in the Software without restriction, including without limitation

-# the rights to use, copy, modify, merge, publish, distribute, sublicense,

-# and/or sell copies of the Software, and to permit persons to whom the

-# Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-# DEALINGS IN THE SOFTWARE.

-#

-

-CLEANFILES =

-SUFFIXES =

-XMLTO_FLAGS =

-

-if HAVE_XMLTO

-spec_DATA = $(doc_sources:.xml=.html)

-

-if HAVE_FOP

-spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)

-endif

-

-if HAVE_XMLTO_TEXT

-spec_DATA += $(doc_sources:.xml=.txt)

-endif

-

-if HAVE_STYLESHEETS

-XMLTO_FLAGS += 			\

-	-m $(XSL_STYLESHEET)	\

-	--stringparam img.src.path=$(abs_builddir)/	\

-	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css

-endif

-

-CLEANFILES += $(spec_DATA)

-

-SUFFIXES += .xml .ps .pdf .txt .html

-

-%.txt: %.xml $(dist_spec_DATA)

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<

-

-%.html: %.xml $(dist_spec_DATA)

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<

-

-%.pdf: %.xml $(dist_spec_DATA)

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<

-

-%.ps: %.xml $(dist_spec_DATA)

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<

-

-chunked-html: $(doc_sources)

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)

-

-CLEANFILES += html

-

-endif HAVE_XMLTO

+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+if HAVE_XMLTO
+spec_DATA = $(doc_sources:.xml=.html)
+
+if HAVE_FOP
+spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
+endif
+
+if HAVE_XMLTO_TEXT
+spec_DATA += $(doc_sources:.xml=.txt)
+endif
+
+if HAVE_STYLESHEETS
+XMLTO_FLAGS = 			\
+	-m $(XSL_STYLESHEET)	\
+	--stringparam img.src.path=$(abs_builddir)/	\
+	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+endif
+
+CLEANFILES = $(spec_DATA)
+
+%.txt: %.xml $(dist_spec_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
+
+%.html: %.xml $(dist_spec_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+
+%.pdf: %.xml $(dist_spec_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+
+%.ps: %.xml $(dist_spec_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+
+chunked-html: $(doc_sources)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+
+endif HAVE_XMLTO