x11proto-composite: Changes to 'upstream-unstable'
ChangeLog | 88 -------------------------------------------------------
Makefile.am | 10 ++++++
README | 24 +++++++++++++++
compositeproto.h | 2 +
configure.ac | 8 +++--
5 files changed, 42 insertions(+), 90 deletions(-)
New commits:
commit 39612a7153ac3e800c5dbb11a7f760c53797bf73
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 18:59:54 2009 -0700
compositeproto 0.4.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index fedf760..0fd3fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([CompositeProto], [0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit ad173235db562b7f788ad82e5b4849c1519bd0b5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 18:57:51 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 7fa9070..fedf760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,11 @@ AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?pro
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_RELEASE_VERSION 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)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
compositeproto.pc])
commit bbdc2ae4f4115332337460631911857cbadaf603
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 18:52:44 2009 -0700
Add pointers to mailing list, git repo, and wiki to README
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index 9c03568..66b40a4 100644
--- a/README
+++ b/README
@@ -7,3 +7,27 @@ extension. Library and server implementations are separate.
Keith Packard
keithp@keithp.com
+
+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/compositeproto
+
+ http://cgit.freedesktop.org/xorg/proto/compositeproto
+
+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 961dbcda7fcfd15a3e60bfb905f05286ba33508f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 8 10:03:40 2009 -0400
compositeproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
Build break: Makefile.am: command not found: git-log
Adding the macro in configure.ac and use it in Makefile.am
Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
Tested: running autogen.sh, make and 'make dist'
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 105a360..4f4da59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 3a5fc5e..7fa9070 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,12 @@ AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?pro
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_RELEASE_VERSION 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
AC_OUTPUT([Makefile
compositeproto.pc])
commit 2ffb32d61cbed1452d67abb2028ac13910550392
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:57 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 89c8b5b..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,88 +0,0 @@
-2006-3-30 Deron Johnson <deron.johnson@sun.com>
-
- * composite.h
- * compositeproto.h
- * configure.ac
- Composite Version 0.3: CompositeGetOverlayWindow, CompositeReleaseOverlayWindow
- Moved Coordinate Transform Redirect defines to 0.4 and bumped request numbers
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2004-07-08 Keith Packard <keithp@keithp.com>
-
- * composite.h:
- * compositeproto.h:
- * protocol:
- Add NameWindowPixmap request.
- Bump protocol to 0.2
-
-2004-06-27 Eric Anholt <anholt@freedesktop.org>
-
- * protocol:
- Fix some apostrophe issues.
-
-2004-02-03 Jim Gettys <freedesktop.org>
-
- * AUTHORS: needed author's attribution
-
-2004-01-15 Daniel Stone <daniel@fooishbar.org>
- * Tag release 2.0 for first freedesktop.org clientside release.
-
-2003-11-08 Keith Packard <keithp@keithp.com>
-
- * protocol:
- Note that Manual Subwindows mode disables background painting.
-
-2003-11-06 Keith Packard <keithp@keithp.com>
-
- * composite.h:
- * compositeproto.h:
- Add update mode to Unredirect requests so clients
- can redirect multiple times (and then unredirect)
- Add CompositeNumberRequests
- Fix some typeos
-
-2003-11-04 Keith Packard <keithp@keithp.com>
-
- * COPYING:
- * INSTALL:
- * Makefile.am:
- * README:
- * composite.h:
- * compositeext.pc.in:
- * compositeproto.h:
- * configure.ac:
- * protocol:
- Change name from Apportion to Composite
- Clarify that root cannot be redirected.
- Add more error values.
-
-2003-10-29 Keith Packard <keithp@keithp.com>
-
- * COPYING:
- * INSTALL:
- * Makefile.am:
- * README:
- * apportion.h:
- * apportionext.pc.in:
- * apportionproto.h:
- * autogen.sh:
- * configure.ac:
- * protocol:
- autofoo
- Add protocol headers
- Use enum for update mode instead of bool
-
-2003-10-29 Keith Packard <keithp@keithp.com>
-
- * protocol:
- Define clipping while redirected
-
-2003-10-24 Keith Packard <keithp@keithp.com>
-
- * ChangeLog
- * protocol
- Initial protocol design imported
diff --git a/Makefile.am b/Makefile.am
index dfc4a1c..105a360 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,3 +33,13 @@ compositedocdir = $(datadir)/doc/$(PACKAGE)
compositedoc_DATA = compositeproto.txt
EXTRA_DIST = autogen.sh compositeproto.pc.in $(compositedoc_DATA)
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit 5ac473a9375fa43896e379da96d1955653960350
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Thu Aug 16 11:28:30 2007 -0500
Temporarily define Pixmap (just like Window and Region). (From pkgsrc.)
diff --git a/compositeproto.h b/compositeproto.h
index c57628c..2e392e2 100644
--- a/compositeproto.h
+++ b/compositeproto.h
@@ -51,6 +51,7 @@
#define Window CARD32
#define Region CARD32
+#define Pixmap CARD32
/*
* requests and replies
@@ -187,5 +188,6 @@ typedef struct {
#undef Window
#undef Region
+#undef Pixmap
#endif /* _COMPOSITEPROTO_H_ */
Reply to: