Update to compositeproto 0.4.1

5 files changed, 324 insertions, 16 deletions

diff --git a/proto/compositeproto/ChangeLog b/proto/compositeproto/ChangeLog
index c62e944c4..79babec9c 100644
--- a/proto/compositeproto/ChangeLog
+++ b/proto/compositeproto/ChangeLog
@@ -1,16 +1,232 @@
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+commit 39612a7153ac3e800c5dbb11a7f760c53797bf73
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 2 18:59:54 2009 -0700
 
-	* compositeproto.h:
-	Bug #1425: Fix the protocol definition on big-endian LP64.  (René Rebe)
+    compositeproto 0.4.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-2006-3-13   Deron Johnson  <deron.johnson@sun.com>
+commit ad173235db562b7f788ad82e5b4849c1519bd0b5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 2 18:57:51 2009 -0700
 
-	* composite.h
-	* compositeproto.h
-	* configure.ac
-	Composite Version 0.3: CompositeGetOverlayWindow, CompositeReleaseOverlayWindow
-	
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+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>
+
+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>
+
+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
+
+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.)
+
+commit 25e8047e25652be388dc66d85c180dcc4ccea4f6
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Tue Jul 3 14:11:10 2007 -0700
+
+    Bump version in configure.ac to 0.4
+
+commit 1838412121d0bac8ce443d362e75439d58a93a4d
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Tue Jul 3 14:09:41 2007 -0700
+
+    Define new manual-redirect clipping semantics and bump version to 0.4.
+    
+    Manual-redirect windows no longer clip their parents, nor do they affect
+    expose event computation. This makes it possible to create application-level
+    composited windows which can be damaged by other window manipulations.
+    
+    This patch also removes the coordinate transformation stuff which was never
+    released.
+
+commit bca9592612d60142e3c624b90649475b561b8eda
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Apr 17 20:48:18 2007 -0700
+
+    Add *~ to .gitignore to skip emacs/patch droppings
+
+commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Apr 17 20:47:50 2007 -0700
+
+    Protocol spec nit cleanups
+    
+    Fix versioning from 0.3/0.4 merge
+    Update description of RedirectWindow to match names in protocol diagrams
+
+commit dd2133540f8dd0f0f66ecf24e01113184045af83
+Author: Eric Anholt <eric@anholt.net>
+Date:   Tue Jan 9 10:42:31 2007 -0800
+
+    Update protocol spec for 0.3 -> 0.4 rename and new 0.3 request.
+    
+    The original overlay window text was from Deron Johnson, but I moved it
+    around to be where I understand the pieces of the description were meant to go.
+
+commit ea2c1d120e58e3eb5f2d8eedb3c32b2cfa052366
+Author: Eric Anholt <eric@anholt.net>
+Date:   Tue Jan 9 09:46:31 2007 -0800
+
+    Move composite protocol description to the new canonical location/name.
+
+commit 34251361a60c9e0c0f3c51416985e067c2aa255a
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Dec 5 12:39:15 2006 -0800
+
+    Have NameWindowPixmap return a Match error on unrealized windows.
+
+commit 5ecbf06cb7786009e8e1547f4bc2b0640599f655
+Author: root <root@explosivo.(none)>
+Date:   Tue Aug 15 14:30:32 2006 -0700
+
+    Correct the spelling of compositedocdir_DATA.  Otherwise automake complains.
+
+commit ba9ca99638fac157b126a2d9a3e57385bad32998
+Author: Deron <dj4236@chiru.it.sfbay.sun.com>
+Date:   Fri Mar 31 03:29:42 2006 -0800
+
+    Sync'd with modular proto/Composite (Version 0.3 definitions).
+    Also changed CTR definitions to Version 0.4 and increased the
+    request numbers to be above those of Version 0.3.
+
+commit 565c0bcc569f5ab9114314185316fe2129aa5a3e
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:55:19 2006 +0100
+
+    Add coordinate transform redirect protocol bits
+
+commit 8e0790045d33525ec182afd3997014b46ef77b66
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:06:13 2006 +0100
+
+    Clean up mistakes integrating xorg changes
+
+commit 1d43eaf21b32fef4aba8a58dee323344b7f48d16
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:03:25 2006 +0100
+
+    Remove .cvsignore
+
+commit 694da3931be9bb03e23e4fbaf54d331c2202b2fc
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:01:54 2006 +0100
+
+    Add .gitignore
+
+commit 369d28141b1b296abeb4365b5c57846d72faeb82
+Author: Keith Packard <keithp@evo.keithp.com>
+Date:   Fri Feb 24 02:01:10 2006 +0100
+
+    Paste Xorg changes on top of historical xlibs repository
+
+commit 7388d4f6dd9e0c71d79c33905135622be15ccd13
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon Feb 20 18:41:15 2006 +0000
+
+    Update to include CTR
+
+commit 90d453e5ab0cd140e936c71c118e442f6f6563f7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Mon Jan 3 05:16:04 2005 +0000
+
+    New autogen.sh from Thomas Fitzsimmons that works with srcdir != objdir.
+
+commit 734331f433e1d853aba942e17b3ed3efb0d972ab
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 8 07:20:55 2004 +0000
+
+    Add NameWindowPixmap request. Bump protocol to 0.2
+
+commit 19bb2c38370f5ef9296d451970f93e570b5a8546
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Jun 27 07:23:56 2004 +0000
+
+    Fix some apostrophe issues.
+
+commit 47c46ad42a57d1dc8f2cf2e9e5d8b1478e75cd3b
+Author: Jim Gettys <jg@freedesktop.org>
+Date:   Tue Feb 3 20:42:46 2004 +0000
+
+    Add author's information
+
+commit cad37f16480f8f3f51e5dd9d3b3314ec8f73cee9
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jan 15 03:42:08 2004 +0000
+
+    Tag release 2.0 for first freedesktop.org clientside release.
+
+commit 0acceb62100f3acb3a00615c51bfd8e3f57e3ff9
+Author: Carl Worth <cworth@cworth.org>
+Date:   Tue Nov 11 18:34:48 2003 +0000
+
+    Updated .cvsignore
+
+commit 35a9c80252b35720c1afc5dc53153228e2084b10
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Nov 9 07:07:21 2003 +0000
+
+    Note that Manual Subwindows mode disables background painting.
+
+commit 11105d870631fe5f858291fbf167f1da400d7fa9
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Nov 7 04:21:01 2003 +0000
+
+    Add update mode to Unredirect requests so clients can redirect multiple times (and then unredirect) Add CompositeNumberRequests Fix some typeos
+
+commit 0b7b69d3b678f584062ca352f60382325057d9f1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Nov 5 05:39:58 2003 +0000
+
+    Change name from Apportion to Composite Clarify that root cannot be redirected. Add more error values.
+
+commit 5113df7e49393afb5d9199f030b6f4e025a54039
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Oct 30 04:31:19 2003 +0000
+
+    autofoo Add protocol headers Use enum for update mode instead of bool
+
+commit 00b320e307a997677e74c73f9c856e7b08bc20e2
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Oct 29 23:48:40 2003 +0000
+
+    Define clipping while redirected
+
+commit 7cc591f9ffac4a01f7801d924beace89ed3460bb
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Oct 28 20:43:27 2003 +0000
+
+    spelling mistake
+
+commit faa486b819f8b3088201923541a1c0a71efa249a
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Oct 24 23:05:41 2003 +0000
+
+    Initial revision
diff --git a/proto/compositeproto/Makefile.am b/proto/compositeproto/Makefile.am
index 724a18610..711c60248 100644
--- a/proto/compositeproto/Makefile.am
+++ b/proto/compositeproto/Makefile.am
@@ -1,3 +1,26 @@
+# 
+#  $Id: Makefile.am,v 1.2 2010/04/24 19:49:04 matthieu Exp $
+# 
+#  Copyright © 2003 Keith Packard, Noah Levitt
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
 compositedir = $(includedir)/X11/extensions
 composite_HEADERS = \
 	composite.h \
@@ -6,4 +29,17 @@ composite_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = compositeproto.pc
 
-EXTRA_DIST = autogen.sh compositeproto.pc.in
+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:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/compositeproto/README b/proto/compositeproto/README
index 9c03568f1..66b40a4ae 100644
--- a/proto/compositeproto/README
+++ b/proto/compositeproto/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
+
diff --git a/proto/compositeproto/compositeproto.h b/proto/compositeproto/compositeproto.h
index e7137bfda..c831064fe 100644
--- a/proto/compositeproto/compositeproto.h
+++ b/proto/compositeproto/compositeproto.h
@@ -1,5 +1,6 @@
 /*
- * $Id: compositeproto.h,v 1.1 2006/11/25 15:43:20 matthieu Exp $
+ * $Id: compositeproto.h,v 1.2 2010/04/24 19:49:04 matthieu Exp $
+ *
  *
  * Copyright © 2006 Sun Microsystems
  *
diff --git a/proto/compositeproto/configure.ac b/proto/compositeproto/configure.ac
index 9af031e45..0794f25f3 100644
--- a/proto/compositeproto/configure.ac
+++ b/proto/compositeproto/configure.ac
@@ -1,8 +1,39 @@
+dnl 
+dnl  $Id: configure.ac,v 1.2 2010/04/24 19:49:04 matthieu Exp $
+dnl 
+dnl  Copyright © 2003 Keith Packard, Noah Levitt
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Keith Packard not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Keith Packard makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
 AC_PREREQ([2.57])
-AC_INIT([CompositeProto], [0.3.1], [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
+
+# 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_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
            compositeproto.pc])
+