x11proto-render: Changes to 'debian-unstable'
.gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
Makefile.am | 14 ++++-----
README | 30 +++++++++++++++++++++
configure.ac | 15 +++++-----
debian/changelog | 8 ++++-
render.h | 2 +
renderproto.txt | 7 ++--
7 files changed, 128 insertions(+), 26 deletions(-)
New commits:
commit 411a4df723f0353a3572de4989d36a09f52707cf
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue Nov 2 19:42:06 2010 -0400
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 10d0e03..f31c5c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-x11proto-render (2:0.11-2) UNRELEASED; urgency=low
+x11proto-render (2:0.11.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Install the protocol spec in the package.
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
- -- Julien Cristau <jcristau@debian.org> Mon, 07 Dec 2009 00:15:02 +0100
+ [ Robert Hooker ]
+ * New upstream release.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:41:44 -0400
x11proto-render (2:0.11-1) unstable; urgency=low
commit 7c31f0bc6c3d71bd63d45df4f0457c3ed7b75e7d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:12:49 2010 -0400
renderproto 0.11.1
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 8779274..68549c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RenderProto], [0.11.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 89289190032cb7f17a392ef0fe8237bdb54edcf6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:10:48 2010 -0400
Make recursive alpha maps undefined
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/renderproto.txt b/renderproto.txt
index 70bf260..9f1f231 100644
--- a/renderproto.txt
+++ b/renderproto.txt
@@ -616,9 +616,7 @@ CreatePicture
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). If the alpha-map picture
- itself already has an alpha-map, that alpha-map is used instead. If
- the alpha-map picture points to the same drawable as the picture
- itself, None is used instead.
+ 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
commit 6122aa1ed38adbdf65e3ac11cff60bf075e85c0d
Author: Sami Farin <safari-ml-freedesktop-bugzilla-kv7oy2vp4mc4jvudr6vccb7oetrzzqe7fwnhahno@u.safari.iki.fi>
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
diff --git a/render.h b/render.h
index 1afb1ca..7e35bd6 100644
--- a/render.h
+++ b/render.h
@@ -26,6 +26,8 @@
#ifndef _RENDER_H_
#define _RENDER_H_
+#include <X11/Xdefs.h>
+
typedef XID Glyph;
typedef XID GlyphSet;
typedef XID Picture;
commit e44c308a0a268de2be2110c38a0a29d5b4101d10
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 11 10:45:09 2010 -0400
Clarify alpha-map loop prevention (#23581)
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/renderproto.txt b/renderproto.txt
index a736ba7..70bf260 100644
--- a/renderproto.txt
+++ b/renderproto.txt
@@ -615,7 +615,10 @@ 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, that alpha-map is used instead. If
+ the alpha-map picture points to the same drawable as the picture
+ itself, None is used instead.
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
commit 724feb119aa1906f6a7a2f62fccb1b76bb56857c
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index bae789c..a1a75ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ pkgconfig_DATA = renderproto.pc
dist_doc_DATA = renderproto.txt
-EXTRA_DIST = renderproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 2c7bf7d8481706d208bdebf93568cb478762f080
Author: Rémi Cardona <remi@gentoo.org>
Date: Thu Dec 17 08:41:27 2009 +0100
Use $(docdir) for renderproto.txt install path
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 29cb9fb..bae789c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,9 @@ 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 = renderproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 94abcfe..8779274 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 958987e56a304ff96cb1b4904c3b9b61015f985c
Author: Gaetan Nadon <memsize@videotron.ca>
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.
diff --git a/Makefile.am b/Makefile.am
index ee03b59..29cb9fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,8 @@ renderdoc_DATA = renderproto.txt
EXTRA_DIST = renderproto.pc.in $(renderdoc_DATA)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
INSTALL:
commit 8dd4c99017d64f66e7540501e165fc8738af7a7c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 16 11:13:30 2009 -0500
README: file created or updated #24206
Contains a set of URLs to freedesktop.org.
diff --git a/README b/README
new file mode 100644
index 0000000..c5e9de8
--- /dev/null
+++ b/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
+
commit 9dca7ab976c7f003f18c839a4fd9b095e1d4fcd9
Author: Gaetan Nadon <memsize@videotron.ca>
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.
diff --git a/Makefile.am b/Makefile.am
index f2265cc..ee03b59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,6 @@ renderdoc_DATA = renderproto.txt
EXTRA_DIST = renderproto.pc.in $(renderdoc_DATA)
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
.PHONY: ChangeLog INSTALL
INSTALL:
commit f3bdf8ad3179fd2e7e75bf7c6a8aa5023a2ac356
Author: Gaetan Nadon <memsize@videotron.ca>
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
diff --git a/Makefile.am b/Makefile.am
index dc2602b..f2265cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,12 @@ EXTRA_DIST = renderproto.pc.in $(renderdoc_DATA)
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit 149cf98b2b9fb52c47742846509b2c08141c43b8
Author: Gaetan Nadon <memsize@videotron.ca>
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.
diff --git a/configure.ac b/configure.ac
index be32bd4..94abcfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,11 +3,11 @@ AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?produ
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])
commit 253a7fb4c4a88437ca31285bf6448d73013d0d74
Author: Gaetan Nadon <memsize@videotron.ca>
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
diff --git a/configure.ac b/configure.ac
index 102abc9..be32bd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
AC_PREREQ([2.57])
AC_INIT([RenderProto], [0.11], [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])])
commit 3396f4ca2df61e330dbcabd8e584e103f86449e5
Author: Gaetan Nadon <memsize@videotron.ca>
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.
diff --git a/.gitignore b/.gitignore
index bc4a016..466a66e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,78 @@
-Makefile
-Makefile.in
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
+config.sub
configure
+configure.scan
+depcomp
+.deps/
+INSTALL
install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-renderproto.pc
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-renderproto-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for renderproto
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 2a336d0528e2f88a940d003edc6655a1d65e6bd7
Author: Peter Hutterer <peter.hutterer@who-t.net>
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 <peter.hutterer@who-t.net>
diff --git a/renderproto.txt b/renderproto.txt
index 5249e6c..a736ba7 100644
--- a/renderproto.txt
+++ b/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
Reply to: