.gitignore | 4 ++ ChangeLog | 4 -- Makefile.am | 13 ++++++ configure.ac | 6 ++- xcmiscproto.h | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ xcmiscstr.h | 115 +--------------------------------------------------------- 6 files changed, 134 insertions(+), 118 deletions(-)
New commits: commit 7b89c288bf414de941983071bead012dc5927dcc Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 09:45:08 2009 +1000 xcmiscproto 1.2.0 diff --git a/configure.ac b/configure.ac index cb4ee19..5128ea8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XCMiscProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit 2a29d3058e588b4b12f3540a03ac0b68afb76b40 Author: Peter Hutterer <[email protected]> Date: Wed Aug 26 14:55:01 2009 +1000 Rename xcmiscstr.h to xcmiscproto.h for consistency with other modules. A stub xcmiscstr.h is provided to avoid clients breaking. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/Makefile.am b/Makefile.am index 4e04e92..e1827aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ xcmiscdir = $(includedir)/X11/extensions xcmisc_HEADERS = \ + xcmiscproto.h \ xcmiscstr.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/xcmiscproto.h b/xcmiscproto.h new file mode 100644 index 0000000..482c2dc --- /dev/null +++ b/xcmiscproto.h @@ -0,0 +1,110 @@ +/* + +Copyright 1993, 1994, 1998 The Open Group + +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. + +The above copyright notice and this permission notice 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 +OPEN GROUP 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. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifndef _XCMISCPROTO_H_ +#define _XCMISCPROTO_H_ + +#define X_XCMiscGetVersion 0 +#define X_XCMiscGetXIDRange 1 +#define X_XCMiscGetXIDList 2 + +#define XCMiscNumberEvents 0 + +#define XCMiscNumberErrors 0 + +#define XCMiscMajorVersion 1 +#define XCMiscMinorVersion 1 + +#define XCMiscExtensionName "XC-MISC" + +typedef struct { + CARD8 reqType; /* always XCMiscCode */ + CARD8 miscReqType; /* always X_XCMiscGetVersion */ + CARD16 length B16; + CARD16 majorVersion B16; + CARD16 minorVersion B16; +} xXCMiscGetVersionReq; +#define sz_xXCMiscGetVersionReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad0; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 majorVersion B16; + CARD16 minorVersion B16; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXCMiscGetVersionReply; +#define sz_xXCMiscGetVersionReply 32 + +typedef struct { + CARD8 reqType; /* always XCMiscCode */ + CARD8 miscReqType; /* always X_XCMiscGetXIDRange */ + CARD16 length B16; +} xXCMiscGetXIDRangeReq; +#define sz_xXCMiscGetXIDRangeReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad0; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 start_id B32; + CARD32 count B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; +} xXCMiscGetXIDRangeReply; +#define sz_xXCMiscGetXIDRangeReply 32 + +typedef struct { + CARD8 reqType; /* always XCMiscCode */ + CARD8 miscReqType; /* always X_XCMiscGetXIDList */ + CARD16 length B16; + CARD32 count B32; /* number of IDs requested */ +} xXCMiscGetXIDListReq; +#define sz_xXCMiscGetXIDListReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad0; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 count B32; /* number of IDs requested */ + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXCMiscGetXIDListReply; +#define sz_xXCMiscGetXIDListReply 32 + +#endif /* _XCMISCPROTO_H_ */ diff --git a/xcmiscstr.h b/xcmiscstr.h index 9a54e76..c2b6433 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -1,110 +1,3 @@ -/* - -Copyright 1993, 1994, 1998 The Open Group - -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. - -The above copyright notice and this permission notice 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 -OPEN GROUP 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. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -#ifndef _XCMISCSTR_H_ -#define _XCMISCSTR_H_ - -#define X_XCMiscGetVersion 0 -#define X_XCMiscGetXIDRange 1 -#define X_XCMiscGetXIDList 2 - -#define XCMiscNumberEvents 0 - -#define XCMiscNumberErrors 0 - -#define XCMiscMajorVersion 1 -#define XCMiscMinorVersion 1 - -#define XCMiscExtensionName "XC-MISC" - -typedef struct { - CARD8 reqType; /* always XCMiscCode */ - CARD8 miscReqType; /* always X_XCMiscGetVersion */ - CARD16 length B16; - CARD16 majorVersion B16; - CARD16 minorVersion B16; -} xXCMiscGetVersionReq; -#define sz_xXCMiscGetVersionReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xXCMiscGetVersionReply; -#define sz_xXCMiscGetVersionReply 32 - -typedef struct { - CARD8 reqType; /* always XCMiscCode */ - CARD8 miscReqType; /* always X_XCMiscGetXIDRange */ - CARD16 length B16; -} xXCMiscGetXIDRangeReq; -#define sz_xXCMiscGetXIDRangeReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 start_id B32; - CARD32 count B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; -} xXCMiscGetXIDRangeReply; -#define sz_xXCMiscGetXIDRangeReply 32 - -typedef struct { - CARD8 reqType; /* always XCMiscCode */ - CARD8 miscReqType; /* always X_XCMiscGetXIDList */ - CARD16 length B16; - CARD32 count B32; /* number of IDs requested */ -} xXCMiscGetXIDListReq; -#define sz_xXCMiscGetXIDListReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 count B32; /* number of IDs requested */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xXCMiscGetXIDListReply; -#define sz_xXCMiscGetXIDListReply 32 - -#endif /* _XCMISCSTR_H_ */ +#warning "xcmiscstr.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/xcmiscproto.h> for the protocol defines." +#include <X11/extensions/xcmiscproto.h> commit b069e32513c91b90fa326cac4f45606e309224f8 Author: Peter Hutterer <[email protected]> Date: Wed Aug 26 12:08:58 2009 +1000 Remove RCS tags Signed-off-by: Peter Hutterer <[email protected]> diff --git a/xcmiscstr.h b/xcmiscstr.h index 2aa45e6..9a54e76 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -1,4 +1,3 @@ -/* $Xorg: xcmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ commit 9608fe1d17de0beceac42587c6c00b9bc6b18f55 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh diff --git a/.gitignore b/.gitignore index d42d119..7973c44 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing xcmiscproto.pc *~ +xcmiscproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 987ed21..4e04e92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ xcmisc_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xcmiscproto.pc -EXTRA_DIST = autogen.sh xcmiscproto.pc.in +EXTRA_DIST = xcmiscproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -13,6 +13,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 8a290f7..cb4ee19 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XCMiscProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# 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 AC_OUTPUT([Makefile xcmiscproto.pc]) commit 71a08b86b37ce7dded10c7f12417d62ee78e486f Author: James Cloos <[email protected]> Date: Thu Dec 6 16:39:10 2007 -0500 Replace static ChangeLog with dist-hook to generate from git log diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index c96bbf8..987ed21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,3 +6,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xcmiscproto.pc EXTRA_DIST = autogen.sh xcmiscproto.pc.in + +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 526ed62ff0ba2dad6f8e81b31695f249e5aacf02 Author: James Cloos <[email protected]> Date: Mon Sep 3 05:54:24 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index 2109b0d..d42d119 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing xcmiscproto.pc +*~ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
