From 8a180e8b160a5f363e66abfebaf5a884e1191857 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 4 Sep 2010 09:39:18 +0000 Subject: Update to renderproto 0.11.1 --- proto/renderproto/ChangeLog | 121 ++++++++++++++++++++++++++++++++++++++ proto/renderproto/Makefile.am | 14 ++--- proto/renderproto/README | 30 ++++++++++ proto/renderproto/configure.ac | 15 ++--- proto/renderproto/render.h | 2 + proto/renderproto/renderproto.txt | 7 ++- 6 files changed, 172 insertions(+), 17 deletions(-) create mode 100644 proto/renderproto/README diff --git a/proto/renderproto/ChangeLog b/proto/renderproto/ChangeLog index 1cbb52188..4c598827d 100644 --- a/proto/renderproto/ChangeLog +++ b/proto/renderproto/ChangeLog @@ -1,3 +1,124 @@ +commit 89289190032cb7f17a392ef0fe8237bdb54edcf6 +Author: Adam Jackson +Date: Tue Aug 10 10:10:48 2010 -0400 + + Make recursive alpha maps undefined + + Signed-off-by: Adam Jackson + +commit 6122aa1ed38adbdf65e3ac11cff60bf075e85c0d +Author: Sami Farin +Date: Wed Sep 26 11:31:00 2007 -0700 + + Bug 12578 - renderproto-0.9.3: render.h does not compile + + https://bugs.freedesktop.org/show_bug.cgi?id=12578 + +commit e44c308a0a268de2be2110c38a0a29d5b4101d10 +Author: Adam Jackson +Date: Tue May 11 10:45:09 2010 -0400 + + Clarify alpha-map loop prevention (#23581) + + Signed-off-by: Adam Jackson + +commit 724feb119aa1906f6a7a2f62fccb1b76bb56857c +Author: Gaetan Nadon +Date: Sun Mar 28 19:00:31 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon + +commit 2c7bf7d8481706d208bdebf93568cb478762f080 +Author: Rémi Cardona +Date: Thu Dec 17 08:41:27 2009 +0100 + + Use $(docdir) for renderproto.txt install path + + Signed-off-by: Rémi Cardona + Reviewed-by: Gaetan Nadon + Reviewed-by: Alan Coopersmith + Reviewed-by: Dan Nicholson + +commit 958987e56a304ff96cb1b4904c3b9b61015f985c +Author: Gaetan Nadon +Date: Sun Nov 22 19:24:48 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 8dd4c99017d64f66e7540501e165fc8738af7a7c +Author: Gaetan Nadon +Date: Mon Nov 16 11:13:30 2009 -0500 + + README: file created or updated #24206 + + Contains a set of URLs to freedesktop.org. + +commit 9dca7ab976c7f003f18c839a4fd9b095e1d4fcd9 +Author: Gaetan Nadon +Date: Sun Nov 15 19:45:27 2009 -0500 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit f3bdf8ad3179fd2e7e75bf7c6a8aa5023a2ac356 +Author: Gaetan Nadon +Date: Sun Nov 15 18:31:29 2009 -0500 + + Makefile.am: INSTALL file is missing or incorrect #24206 + + The standard GNU file on building/installing tarball is copied + using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS + Add INSTALL target + +commit 149cf98b2b9fb52c47742846509b2c08141c43b8 +Author: Gaetan Nadon +Date: Sun Nov 15 18:11:36 2009 -0500 + + configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 253a7fb4c4a88437ca31285bf6448d73013d0d74 +Author: Gaetan Nadon +Date: Sun Nov 15 13:55:25 2009 -0500 + + configure.ac: AM_MAINTAINER_MODE missing #24238 + + This turns off maintainer mode build rules in tarballs. + Works in conjunction with autogen.sh --enable-maintainer-mode + +commit 3396f4ca2df61e330dbcabd8e584e103f86449e5 +Author: Gaetan Nadon +Date: Sat Nov 14 18:26:47 2009 -0500 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 2a336d0528e2f88a940d003edc6655a1d65e6bd7 +Author: Peter Hutterer +Date: Mon Aug 24 11:42:17 2009 +1000 + + Update date/version on Render protocol spec to match last update (0.11) + + 533e22db3088bb75e58b6d977ec82a13c4680b54 added blend modes and the bump to + 0.11. + + Signed-off-by: Peter Hutterer + commit d889aa6c766e2691e1a6a8189c730661023e4de4 Author: Fredrik Höglund Date: Wed Jul 15 00:16:32 2009 +0200 diff --git a/proto/renderproto/Makefile.am b/proto/renderproto/Makefile.am index dc2602b6c..a1a75ef33 100644 --- a/proto/renderproto/Makefile.am +++ b/proto/renderproto/Makefile.am @@ -6,17 +6,17 @@ render_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = renderproto.pc -renderdocdir = $(datadir)/doc/$(PACKAGE) -renderdoc_DATA = renderproto.txt +dist_doc_DATA = renderproto.txt -EXTRA_DIST = renderproto.pc.in $(renderdoc_DATA) -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/proto/renderproto/README b/proto/renderproto/README new file mode 100644 index 000000000..c5e9de843 --- /dev/null +++ b/proto/renderproto/README @@ -0,0 +1,30 @@ + X Rendering Extension + +This extension defines the protcol for a digital image composition as +the foundation of a new rendering model within the X Window System. + +Extension name: RENDER + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/renderproto + + http://cgit.freedesktop.org/xorg/proto/renderproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/proto/renderproto/configure.ac b/proto/renderproto/configure.ac index 102abc95d..68549c6a7 100644 --- a/proto/renderproto/configure.ac +++ b/proto/renderproto/configure.ac @@ -1,12 +1,13 @@ -AC_PREREQ([2.57]) -AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_PREREQ([2.60]) +AC_INIT([RenderProto], [0.11.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile renderproto.pc]) diff --git a/proto/renderproto/render.h b/proto/renderproto/render.h index 1afb1ca43..7e35bd663 100644 --- a/proto/renderproto/render.h +++ b/proto/renderproto/render.h @@ -26,6 +26,8 @@ #ifndef _RENDER_H_ #define _RENDER_H_ +#include + typedef XID Glyph; typedef XID GlyphSet; typedef XID Picture; diff --git a/proto/renderproto/renderproto.txt b/proto/renderproto/renderproto.txt index 5249e6c9e..9f1f23144 100644 --- a/proto/renderproto/renderproto.txt +++ b/proto/renderproto/renderproto.txt @@ -1,6 +1,6 @@ The X Rendering Extension - Version 0.10 - 2005-07-01 + Version 0.11 + 2009-07-15 Keith Packard keithp@keithp.com @@ -615,7 +615,8 @@ CreatePicture Rendering is additionally clipped by the geometry and clip mask of alpha-map. Exposures to the window do not affect the contents of alpha-map. Alpha-map must refer to a picture containing a Pixmap, - not a Window (or a Match error results). + not a Window (or a Match error results). If the alpha-map picture + itself already has an alpha-map, the result is undefined. The clip-mask restricts reads and writes to drawable. Only pixels where the clip-mask has bits set to 1 are read or written. Pixels -- cgit v1.2.3