From 0be0afff8c6ae5acee076e53ff6611873fbbbaca Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 15:54:35 +0000 Subject: R6.6 is the Xorg base-line --- xcmiscstr.h | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 xcmiscstr.h diff --git a/xcmiscstr.h b/xcmiscstr.h new file mode 100644 index 0000000..a13e4ed --- /dev/null +++ b/xcmiscstr.h @@ -0,0 +1,107 @@ +/* $Xorg: xcmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ +/* + +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. + +*/ + +#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 + -- cgit v1.2.3 -- cgit v1.2.3 From bcdb3b050a1b2e36768844d33306ad3c00981367 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:02 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- xcmiscstr.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xcmiscstr.h b/xcmiscstr.h index a13e4ed..f1ce46a 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,6 +24,10 @@ 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: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ + +#ifndef _XCMISCSTR_H_ +#define _XCMISCSTR_H_ #define X_XCMiscGetVersion 0 #define X_XCMiscGetXIDRange 1 @@ -105,3 +109,4 @@ typedef struct { } xXCMiscGetXIDListReply; #define sz_xXCMiscGetXIDListReply 32 +#endif /* _XCMISCSTR_H_ */ -- cgit v1.2.3 From c667023cbe965cc00f292854d36d42c7c01fb77d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 09:22:28 +0000 Subject: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 --- xcmiscstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcmiscstr.h b/xcmiscstr.h index f1ce46a..2aa45e6 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,7 +24,7 @@ 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: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ -- cgit v1.2.3 From 1c32c147d23764ce812421542d96830d131f5a48 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 13:35:14 +0000 Subject: readding XFree86's cvs IDs --- xcmiscstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcmiscstr.h b/xcmiscstr.h index 2aa45e6..f1ce46a 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,7 +24,7 @@ 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$ */ +/* $XFree86: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ -- cgit v1.2.3 From 7a8949b54c963b4409527fe293899caf88abf392 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:10:54 +0000 Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- xcmiscstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcmiscstr.h b/xcmiscstr.h index f1ce46a..2aa45e6 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,7 +24,7 @@ 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: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ -- cgit v1.2.3 From 1129bcd2569220ad510fb47a8fae9f2782681a9b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:31:36 +0000 Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- xcmiscstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcmiscstr.h b/xcmiscstr.h index 2aa45e6..f1ce46a 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,7 +24,7 @@ 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$ */ +/* $XFree86: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ -- cgit v1.2.3 From 9a46e678b105529eff79d8fbdab377dea66675ac Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:06 +0000 Subject: Merging XORG-CURRENT into trunk --- xcmiscstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcmiscstr.h b/xcmiscstr.h index f1ce46a..2aa45e6 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,7 +24,7 @@ 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: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ -- cgit v1.2.3 From 092cd91e62ec32afc245ba867398588f6612dab4 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:32 +0000 Subject: Initial build system files for proto module. --- Makefile.am | 8 ++++++++ autogen.sh | 12 ++++++++++++ configure.ac | 6 ++++++ xcmiscext.pc.in | 9 +++++++++ 4 files changed, 35 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 xcmiscext.pc.in diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..d57e2a4 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,8 @@ +xcmiscdir = $(includedir)/X11/extensions +xcmisc_HEADERS = \ + xcmiscstr.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xcmiscext.pc + +EXTRA_DIST = autogen.sh xcmiscext.pc.in diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..08418bd --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.57]) +AC_INIT([XCMiscExt], [7.0], [xorg@lists.freedesktop.org]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + xcmiscext.pc]) diff --git a/xcmiscext.pc.in b/xcmiscext.pc.in new file mode 100644 index 0000000..4e11878 --- /dev/null +++ b/xcmiscext.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCMiscExt +Description: XCMisc extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 46fff69a6fd6c930838ace5c7b0c651cb29d6273 Mon Sep 17 00:00:00 2001 From: Søren Sandmann Pedersen Date: Mon, 9 May 2005 18:20:06 +0000 Subject: Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- xcmiscext.pc.in | 9 --------- xcmiscproto.pc.in | 9 +++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 xcmiscext.pc.in create mode 100644 xcmiscproto.pc.in diff --git a/Makefile.am b/Makefile.am index d57e2a4..c96bbf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,6 @@ xcmisc_HEADERS = \ xcmiscstr.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xcmiscext.pc +pkgconfig_DATA = xcmiscproto.pc -EXTRA_DIST = autogen.sh xcmiscext.pc.in +EXTRA_DIST = autogen.sh xcmiscproto.pc.in diff --git a/configure.ac b/configure.ac index 08418bd..f6d8968 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT([XCMiscExt], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([XCMiscProto], [7.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile - xcmiscext.pc]) + xcmiscproto.pc]) diff --git a/xcmiscext.pc.in b/xcmiscext.pc.in deleted file mode 100644 index 4e11878..0000000 --- a/xcmiscext.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: XCMiscExt -Description: XCMisc extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/xcmiscproto.pc.in b/xcmiscproto.pc.in new file mode 100644 index 0000000..86b030a --- /dev/null +++ b/xcmiscproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCMiscProto +Description: XCMisc extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 8ebcd70260f575777c8ea6bccd0d2dd218c7298b Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 18 May 2005 07:58:49 +0000 Subject: Add COPYING file for XCMisc. --- COPYING | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..782a1ec --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +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. -- cgit v1.2.3 From c79671f87c3e3d618e0437b9f21b635b6e8c64a3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:10:19 +0000 Subject: Require automake 1.7 in AM_INIT_AUTOMAKE --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f6d8968..62cc647 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XCMiscProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) AC_OUTPUT([Makefile xcmiscproto.pc]) -- cgit v1.2.3 From 2007ff0aeeeaafe31711c26fc81d8bc4bc7e8568 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:22:40 +0000 Subject: revert last change, didn't do right thing at all, sorry for the noise --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 62cc647..f6d8968 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XCMiscProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile xcmiscproto.pc]) -- cgit v1.2.3 From 5ebf8724cb808c022a1abab3f694c96df802df14 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 21 May 2005 04:53:26 +0000 Subject: Set version to 1.1. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f6d8968..e00ec67 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XCMiscProto], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([XCMiscProto], [1.1], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile -- cgit v1.2.3 From 42957fe96031a8d83dfefa0b74f1a876ae485e03 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 29 Jul 2005 21:22:57 +0000 Subject: Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e00ec67..aea6cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([XCMiscProto], [1.1], [xorg@lists.freedesktop.org]) +AC_INIT([XCMiscProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - + +XORG_RELEASE_VERSION + AC_OUTPUT([Makefile xcmiscproto.pc]) -- cgit v1.2.3 From 7dda031d2e4603dc3492c415326d590d16eefa4d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2005 19:19:40 +0000 Subject: Add basic .cvsignore files for proto modules. --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..2109b0d --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +xcmiscproto.pc -- cgit v1.2.3 From d27dc9a0394314ac4612c50c93289adcee371fa3 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 19 Oct 2005 02:48:15 +0000 Subject: Update package version number for RC1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aea6cd1..34918e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XCMiscProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XCMiscProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From 8b2a1c812eb535f28a77ca5eec2a1f84fc38ae67 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 15 Dec 2005 00:24:39 +0000 Subject: Update package version number for final X11R7 release candidate. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c722b51 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2005-12-14 Kevin E. Martin + + * configure.ac: + Update package version number for final X11R7 release candidate. diff --git a/configure.ac b/configure.ac index 34918e0..8a290f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XCMiscProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XCMiscProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From e4ab6602688b88ddcbc735cddeb4d13467b45efe Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 14 Jul 2006 18:56:39 -0700 Subject: renamed: .cvsignore -> .gitignore --- .cvsignore | 10 ---------- .gitignore | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 2109b0d..0000000 --- a/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh -missing -xcmiscproto.pc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2109b0d --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +xcmiscproto.pc -- cgit v1.2.3 From 526ed62ff0ba2dad6f8e81b31695f249e5aacf02 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 3 Sep 2007 05:54:24 -0400 Subject: Add *~ to .gitignore to skip patch/emacs droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2109b0d..d42d119 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing xcmiscproto.pc +*~ -- cgit v1.2.3 From 71a08b86b37ce7dded10c7f12417d62ee78e486f Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:39:10 -0500 Subject: Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 4 ---- Makefile.am | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 ChangeLog 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 - - * 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 -- cgit v1.2.3 From 9608fe1d17de0beceac42587c6c00b9bc6b18f55 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:28 -0200 Subject: Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore | 3 +++ Makefile.am | 4 ++-- configure.ac | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) 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]) -- cgit v1.2.3 From b069e32513c91b90fa326cac4f45606e309224f8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 12:08:58 +1000 Subject: Remove RCS tags Signed-off-by: Peter Hutterer --- xcmiscstr.h | 2 -- 1 file changed, 2 deletions(-) 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_ -- cgit v1.2.3 From 2a29d3058e588b4b12f3540a03ac0b68afb76b40 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 14:55:01 +1000 Subject: 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 --- Makefile.am | 1 + xcmiscproto.h | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xcmiscstr.h | 113 ++-------------------------------------------------------- 3 files changed, 114 insertions(+), 110 deletions(-) create mode 100644 xcmiscproto.h 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 for the protocol defines." +#include -- cgit v1.2.3 From 7b89c288bf414de941983071bead012dc5927dcc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Aug 2009 09:45:08 +1000 Subject: xcmiscproto 1.2.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 590a53f771cf585587379442c4f00f8fe161053e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Nov 2009 18:26:47 -0500 Subject: .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. --- .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7973c44..ba72582 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 -xcmiscproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -xcmiscproto-*.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 xcmiscproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- cgit v1.2.3 From 7f50daf92ebfb08156b1fe82fcbff3402babd7c5 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 13:55:25 -0500 Subject: 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 --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 5128ea8..c88fb65 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([XCMiscProto], [1.2.0], [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])]) -- cgit v1.2.3 From 10b2b3fe9fa6b675219877dd42618f36a7679e5d Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:11:36 -0500 Subject: 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. --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index c88fb65..dbae5c4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?prod 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 xcmiscproto.pc]) -- cgit v1.2.3 From 5104b0f31b74fc7b218e2b778f37bee224c80e61 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:29 -0500 Subject: 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 --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e1827aa..ce2d109 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,12 @@ EXTRA_DIST = xcmiscproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL -- cgit v1.2.3 From bac51967621114c8314339c5db7a876bc9a724f0 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:27 -0500 Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index ce2d109..60e34b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,6 @@ pkgconfig_DATA = xcmiscproto.pc EXTRA_DIST = xcmiscproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From f1c491cb1cd56c7689fefbd8cf9e64b8fd9f2a54 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 16 Nov 2009 11:13:30 -0500 Subject: README: file created or updated #24206 Contains a set of URLs to freedesktop.org. --- README | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..12ce76e --- /dev/null +++ b/README @@ -0,0 +1,30 @@ + XC-MISC Extension + +This extension defines a protocol that provides Xlib two ways to query +the server for available resource IDs. + +Extension name: XC-MISC + +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/xcmiscproto + + http://cgit.freedesktop.org/xorg/proto/xcmiscproto + +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 + -- cgit v1.2.3 From 9844fba5c3db9afffd86604db81e76d89da69777 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:48 -0500 Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 60e34b0..1671823 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ pkgconfig_DATA = xcmiscproto.pc EXTRA_DIST = xcmiscproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From bf6d08091e350fa8069d74129fc8b61c4349314b Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:00:31 -0400 Subject: config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1671823..7937ee6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ xcmisc_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xcmiscproto.pc -EXTRA_DIST = xcmiscproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL -- cgit v1.2.3 From 4f05216edd9122d82c4a451914ee78a332b6a2e3 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:25:52 -0400 Subject: config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dbae5c4..7f355d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 3b999f69545b921738f3d51c55c427a83250ee5f Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Mon, 28 Jun 2010 08:46:21 -0400 Subject: specs: convert xc-misc.ms from xorg-docs module to DocBook XML Signed-off-by: Gaetan Nadon --- Makefile.am | 2 + configure.ac | 11 ++- specs/.gitignore | 6 ++ specs/Makefile.am | 64 +++++++++++++++++ specs/xc-misc.xml | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 285 insertions(+), 3 deletions(-) create mode 100644 specs/.gitignore create mode 100644 specs/Makefile.am create mode 100644 specs/xc-misc.xml diff --git a/Makefile.am b/Makefile.am index 7937ee6..08d6331 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=specs + xcmiscdir = $(includedir)/X11/extensions xcmisc_HEADERS = \ xcmiscproto.h \ diff --git a/configure.ac b/configure.ac index 7f355d8..2abc4dc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,16 @@ AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?prod AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros minimum of 1.10 for DocBook XML documentation m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) AC_OUTPUT([Makefile + specs/Makefile xcmiscproto.pc]) diff --git a/specs/.gitignore b/specs/.gitignore new file mode 100644 index 0000000..12fe512 --- /dev/null +++ b/specs/.gitignore @@ -0,0 +1,6 @@ +# Add & Override for this directory and it's subdirectories +*.html +*.ps +*.pdf +*.txt +*.css diff --git a/specs/Makefile.am b/specs/Makefile.am new file mode 100644 index 0000000..5b3225d --- /dev/null +++ b/specs/Makefile.am @@ -0,0 +1,64 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# + +if ENABLE_SPECS +doc_sources = xc-misc.xml +dist_doc_DATA = $(doc_sources) + +if HAVE_XMLTO +doc_DATA = $(doc_sources:.xml=.html) + +if HAVE_FOP +doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) +endif + +if HAVE_XMLTO_TEXT +doc_DATA += $(doc_sources:.xml=.txt) +endif + +if HAVE_STYLESHEETS +XMLTO_FLAGS = -m $(XSL_STYLESHEET) + +doc_DATA += xorg.css +xorg.css: $(STYLESHEET_SRCDIR)/xorg.css + $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ +endif + +CLEANFILES = $(doc_DATA) + +SUFFIXES = .xml .ps .pdf .txt .html + +.xml.txt: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< + +.xml.html: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< + +.xml.pdf: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< + +.xml.ps: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< + +endif HAVE_XMLTO +endif ENABLE_SPECS diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml new file mode 100644 index 0000000..65ba0d2 --- /dev/null +++ b/specs/xc-misc.xml @@ -0,0 +1,205 @@ + + + + + + + + XC-MISC Extension + X Consortium Standard + X Version 11, Release 6.9/7.0 + + + BobScheifler + + +DavidWiggins + X Consortium Standard + 1994X Consortium + Version 1.1 + X Consortium + X Version 11, Release 6.9/7.0 + + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +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 X CONSORTIUM 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 X Consortium 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 X Consortium. + +X Window System is a trademark of The Open Group. + + + + + +Overview + +When an X client connects to an X server, it receives a fixed range of +resource IDs to use to identify the client's resources inside the X +server. Xlib hands these out sequentially as needed. When it +overruns the end of the range, an IDChoice protocol error results. +Long running clients, or clients that use resource IDs at a rapid +rate, may encounter this circumstance. When it happens, there are +usually many resource IDs available, but Xlib doesn't know about them. + +One approach to solving this problem would be to have Xlib notice when +a resource is freed and recycle its ID for future use. This strategy +runs into difficulties because sometimes freeing one resource causes +others to be freed (for example, when a window is destroyed, so are +its children). To do a complete job, Xlib would have to maintain a +large amount of state that currently resides only in the server (the +entire window tree in the above example). Even if a less +comprehensive strategy was adopted, such as recycling only those IDs +that Xlib can identify without maintaining additional state, the +additional bookkeeping at resource creation and destruction time +would likely introduce unacceptable overhead. + +To avoid the problems listed above, the server's complete knowledge of +all resource IDs in use by a client is leveraged. This extension +provides two ways for Xlib to query the server for available resource +IDs. Xlib can use these extension requests behind the scenes when it has +exhausted its current pool of resource IDs. + + + +Requests + +XCMiscGetVersion + + + client_major_version: CARD16 + client_minor_version: CARD16 + + => + + client_major_version: CARD16 + client_minor_version: CARD16 + + +If supplied, the client_major_version and +client_minor_version indicate what version of +the protocol the client wants the server to implement. The server version +numbers returned indicate the protocol this extension actually supports. This +might not equal the version sent by the client. An implementation can +(but need not) support more than one version simultaneously. The +server_major_version and the server_minor_version are a +mechanism to support future revisions of the XC-MISC protocol +which may be necessary. In general, the major version would increment +for incompatible changes, and the minor version would increment for +small, upward-compatible changes. Servers that support the protocol +defined in this document will return a +server_major_version of one (1), and a +server_minor_version of one (1). + +XCMiscGetXIDRange + + => + + start_id: XID + count: CARD32 + + +This request returns a range of available resource IDs for the client +issuing the request. start_id is the first +ID in the range. count is the number of IDs +in the range. The returned range may or may not be the largest possible +range. + +XCMiscGetXIDList + + + count: CARD32 + + => + + ids: LISTofXID + + +This request returns the a list of individual resource IDs in +ids. +count is the number of resource IDs requested. +The number returned may be smaller than the number requested. + + + +Events and Errors + +No new events or errors are defined by this extension. + + + +Encoding + +Please refer to the X11 Protocol Encoding document as this document uses +conventions established there. + +The name of this extension is “XC-MISC”. + + +XCMiscGetVersion + 1 CARD8 opcode + 1 0 XC-MISC opcode + 2 2 request length + 2 CARD16 client_major_version + 2 CARD16 client_minor_version + + + + => + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 0 length + 2 CARD16 server_major_version + 2 CARD16 server_minor_version + 20 unused + + + + +XCMiscGetXIDRange + 1 CARD8 opcode + 1 1 XC-MISC opcode + 2 1 request length + + + + => + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 0 length + 4 XID start_id + 4 CARD32 count + 16 unused + + + + +XCMiscGetXIDList + 1 CARD8 opcode + 1 2 XC-MISC opcode + 2 2 request length + 4 CARD32 count + + + + => + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 CARD32 length + 4 CARD32 number of XIDs in ids + 20 unused + 4n LISTofXID ids + + + + + -- cgit v1.2.3 From bd15ca56e689a63832cd6aa63b638fcdbe406b04 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 30 Oct 2010 00:03:21 -0700 Subject: xc-misc.xml: Misc. markup cleanups Signed-off-by: Alan Coopersmith --- specs/xc-misc.xml | 74 +++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 65ba0d2..f3f8f62 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -13,16 +13,17 @@ BobScheifler + + DavidWiggins + + X Consortium -DavidWiggins - X Consortium Standard 1994X Consortium Version 1.1 X Consortium X Version 11, Release 6.9/7.0 -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -70,60 +71,61 @@ exhausted its current pool of resource IDs. Requests -XCMiscGetVersion + +XCMiscGetVersion - client_major_version: CARD16 - client_minor_version: CARD16 + client_major_version: CARD16 + client_minor_version: CARD16 => - client_major_version: CARD16 - client_minor_version: CARD16 + client_major_version: CARD16 + client_minor_version: CARD16 -If supplied, the client_major_version and -client_minor_version indicate what version of -the protocol the client wants the server to implement. The server version +If supplied, the client_major_version and +client_minor_version indicate what version of +the protocol the client wants the server to implement. The server version numbers returned indicate the protocol this extension actually supports. This might not equal the version sent by the client. An implementation can (but need not) support more than one version simultaneously. The -server_major_version and the server_minor_version are a +server_major_version and the server_minor_version are a mechanism to support future revisions of the XC-MISC protocol which may be necessary. In general, the major version would increment for incompatible changes, and the minor version would increment for small, upward-compatible changes. Servers that support the protocol -defined in this document will return a -server_major_version of one (1), and a -server_minor_version of one (1). +defined in this document will return a +server_major_version of one (1), and a +server_minor_version of one (1). XCMiscGetXIDRange => - start_id: XID - count: CARD32 + start_id: XID + count: CARD32 This request returns a range of available resource IDs for the client -issuing the request. start_id is the first -ID in the range. count is the number of IDs -in the range. The returned range may or may not be the largest possible +issuing the request. start_id is the first +ID in the range. count is the number of IDs +in the range. The returned range may or may not be the largest possible range. XCMiscGetXIDList - count: CARD32 + count: CARD32 => - ids: LISTofXID + ids: LISTofXID -This request returns the a list of individual resource IDs in -ids. -count is the number of resource IDs requested. +This request returns the a list of individual resource IDs in +ids. +count is the number of resource IDs requested. The number returned may be smaller than the number requested. @@ -141,16 +143,14 @@ conventions established there. The name of this extension is “XC-MISC”. - + XCMiscGetVersion 1 CARD8 opcode 1 0 XC-MISC opcode 2 2 request length 2 CARD16 client_major_version 2 CARD16 client_minor_version - - - + => 1 1 Reply 1 unused @@ -160,16 +160,13 @@ conventions established there. 2 CARD16 server_minor_version 20 unused - - + XCMiscGetXIDRange 1 CARD8 opcode 1 1 XC-MISC opcode 2 1 request length - - - + => 1 1 Reply 1 unused @@ -179,17 +176,15 @@ conventions established there. 4 CARD32 count 16 unused - - + + XCMiscGetXIDList 1 CARD8 opcode 1 2 XC-MISC opcode 2 2 request length 4 CARD32 count - - - + => 1 1 Reply 1 unused @@ -199,7 +194,6 @@ conventions established there. 20 unused 4n LISTofXID ids - -- cgit v1.2.3 From bff39d1e68056ffdf83924e708e55730236655dd Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 30 Oct 2010 00:04:11 -0700 Subject: XCMiscProto 1.2.1 Signed-off-by: Alan Coopersmith --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2abc4dc..9bed793 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XCMiscProto], [1.2.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 357c04268c4801fb17e4f1f495ec113d565b5be2 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 9 Nov 2010 15:19:09 -0500 Subject: config: HTML file generation: use the installed copy of xorg.css Currenlty the xorg.css file is copied in each location where a DocBook/XML file resides. This produces about 70 copies in the $(docdir) install tree. Signed-off-by: Gaetan Nadon --- specs/.gitignore | 2 -- specs/Makefile.am | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/specs/.gitignore b/specs/.gitignore index 12fe512..6fa5c31 100644 --- a/specs/.gitignore +++ b/specs/.gitignore @@ -1,6 +1,4 @@ -# Add & Override for this directory and it's subdirectories *.html *.ps *.pdf *.txt -*.css diff --git a/specs/Makefile.am b/specs/Makefile.am index 5b3225d..00aa954 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -37,11 +37,8 @@ doc_DATA += $(doc_sources:.xml=.txt) endif if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) - -doc_DATA += xorg.css -xorg.css: $(STYLESHEET_SRCDIR)/xorg.css - $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ +XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css endif CLEANFILES = $(doc_DATA) -- cgit v1.2.3 From 56424da60f0587a0fba8bcbf81536dd043412e87 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 16 Dec 2010 13:37:28 -0200 Subject: Use docbookx.dtd version 4.3 for all docs Signed-off-by: Paulo Zanoni Signed-off-by: Alan Coopersmith --- specs/xc-misc.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index f3f8f62..bbd2cf0 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3 From 485c361562e986efa1cf05d2c70553e99c1b9382 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 25 Feb 2011 08:44:47 -0500 Subject: Docbook: change the book id to match the xml file basename This is required for the up-coming external references support. Signed-off-by: Gaetan Nadon --- specs/xc-misc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index bbd2cf0..7e5a46e 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> - + XC-MISC Extension -- cgit v1.2.3 From fd4973cb7986e69bf47264430fbd17c58be9d0cd Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 27 Feb 2011 15:06:18 -0500 Subject: Documentation: add Docbook external references support When writing technical documentation, it is often necessary to cross reference to other information. When that other information is not in the current document, additional support is needed, namely . A new feature with version 1.7 of xorg-sgml-doctools adds references to other documents within or outside this package. This patch adds technical support for this feature but does not change the content of the documentation as seen by the end user. Each book or article must generate a database containing the href of sections that can be referred to from another document. This database is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that the value of DATAROOTDIR for xorg-sgml-doctools and for the package documentation is the same. This forms a virtual document tree. This database is consulted by other documents while they are being generated in order to fulfill the missing information for linking. Refer to the xorg-sgml-doctools for further technical information. Co-authored-by: Matt Dew Signed-off-by: Gaetan Nadon --- configure.ac | 11 ++++--- docbook.am | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ specs/.gitignore | 1 + specs/Makefile.am | 58 ++++----------------------------- 4 files changed, 108 insertions(+), 57 deletions(-) create mode 100644 docbook.am diff --git a/configure.ac b/configure.ac index 9bed793..f344411 100644 --- a/configure.ac +++ b/configure.ac @@ -4,15 +4,16 @@ AC_INIT([XCMiscProto], [1.2.1], AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.7) AC_OUTPUT([Makefile specs/Makefile diff --git a/docbook.am b/docbook.am new file mode 100644 index 0000000..3cf21e8 --- /dev/null +++ b/docbook.am @@ -0,0 +1,95 @@ +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +# DocBook/XML generated output formats to be installed +shelf_DATA = + +# DocBook/XML file with chapters, appendix and images it includes +dist_shelf_DATA = $(docbook) $(chapters) + +# +# Generate DocBook/XML output formats with or without stylesheets +# + +# Stylesheets are available if the package xorg-sgml-doctools is installed +if HAVE_STYLESHEETS + +# The location where all cross reference databases are installed +sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs +masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" +XMLTO_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --stringparam target.database.document=$(masterdb) \ + --stringparam current.docid="$(<:.xml=)" \ + --stringparam collect.xref.targets="no" + +XMLTO_XHTML_FLAGS = \ + -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css + +XMLTO_FO_FLAGS = \ + -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +endif HAVE_STYLESHEETS + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< + +if HAVE_FOP +shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $< +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP + +if HAVE_XMLTO_TEXT +shelf_DATA += $(docbook:.xml=.txt) +%.txt: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $< +endif HAVE_XMLTO_TEXT + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed +if HAVE_STYLESHEETS +if HAVE_XSLTPROC + +# DocBook/XML generated document cross-reference database +sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) + +# Generate DocBook/XML document cross-reference database +# Flags for the XSL Transformation processor generating xref target databases +XSLTPROC_FLAGS = \ + --path "$(XORG_SGML_PATH)/X11" \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --nonet --xinclude + +%.html.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ + http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< + +%.fo.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ + http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< + +endif HAVE_XSLTPROC +endif HAVE_STYLESHEETS + +CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) diff --git a/specs/.gitignore b/specs/.gitignore index 6fa5c31..92946c9 100644 --- a/specs/.gitignore +++ b/specs/.gitignore @@ -2,3 +2,4 @@ *.ps *.pdf *.txt +*.db diff --git a/specs/Makefile.am b/specs/Makefile.am index 00aa954..b31bfdb 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -1,61 +1,15 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. -# if ENABLE_SPECS -doc_sources = xc-misc.xml -dist_doc_DATA = $(doc_sources) - if HAVE_XMLTO -doc_DATA = $(doc_sources:.xml=.html) - -if HAVE_FOP -doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif - -if HAVE_XMLTO_TEXT -doc_DATA += $(doc_sources:.xml=.txt) -endif - -if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css -endif - -CLEANFILES = $(doc_DATA) - -SUFFIXES = .xml .ps .pdf .txt .html - -.xml.txt: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< -.xml.html: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< +# Main DocBook/XML files (DOCTYPE book) +docbook = xc-misc.xml -.xml.pdf: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -.xml.ps: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif HAVE_XMLTO endif ENABLE_SPECS -- cgit v1.2.3 From 4179eb64ad35ab425cf00447bff334c387e23306 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 5 Jun 2011 16:27:37 -0400 Subject: Install target dbs alongside generated documents This matches a change in xorg-sgml-docs whereby the masterdb will look for the target dbs into the same location as the generated documents. The target dbs are now installed alongside the generated documents. Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which has the potential of installing outside the package prefix and cause distcheck to fail when user does not have write permission in this package. Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 --- configure.ac | 2 +- docbook.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f344411..1ce26a3 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ XORG_ENABLE_SPECS XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.7) +XORG_CHECK_SGML_DOCTOOLS(1.8) AC_OUTPUT([Makefile specs/Makefile diff --git a/docbook.am b/docbook.am index 3cf21e8..5864c9e 100644 --- a/docbook.am +++ b/docbook.am @@ -71,7 +71,7 @@ if HAVE_STYLESHEETS if HAVE_XSLTPROC # DocBook/XML generated document cross-reference database -sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @@ -92,4 +92,4 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA) -- cgit v1.2.3 From 905336a989f14dbbcc0c8d1648a2a51724203a09 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 12 Jun 2011 17:54:50 -0400 Subject: Install xml versions of specs even if HAVE_XMLTO is false DocBook/XML input source is also a usefull output format that can be viewed with an XML viewer or editor and by some O/S help system. Signed-off-by: Gaetan Nadon --- docbook.am | 2 ++ specs/Makefile.am | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docbook.am b/docbook.am index 5864c9e..2ffb7e6 100644 --- a/docbook.am +++ b/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO CLEANFILES = $(shelf_DATA) diff --git a/specs/Makefile.am b/specs/Makefile.am index b31bfdb..69d3f7f 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xc-misc.xml @@ -11,5 +10,4 @@ shelfdir = $(docdir) # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS -- cgit v1.2.3 From d8e1aee8520fe74d921bef604f2acbb4c0899900 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 7 Sep 2011 10:31:04 -0400 Subject: docbook.am: global maintenance update - entities, images and olinking Adding support in libX11 for html chunking caused a reorg of docbook.am as well as the xorg-sgml-doctools masterdb for olinking. The parameter img.src.path is added for pdf images. A searchpath to the root builddir is added for local entities, if present. The docbook.am makefile hides all the details and is identical for all 22 modules having DocBook documentation. It is included by a thin Makefile.am which requires no docbook knowledge. Signed-off-by: Gaetan Nadon --- docbook.am | 114 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/docbook.am b/docbook.am index 2ffb7e6..9377f5b 100644 --- a/docbook.am +++ b/docbook.am @@ -21,74 +21,84 @@ shelf_DATA = dist_shelf_DATA = $(docbook) $(chapters) if HAVE_XMLTO -# -# Generate DocBook/XML output formats with or without stylesheets -# - -# Stylesheets are available if the package xorg-sgml-doctools is installed if HAVE_STYLESHEETS -# The location where all cross reference databases are installed -sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs -masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" -XMLTO_FLAGS = \ - --searchpath "$(XORG_SGML_PATH)/X11" \ - --stringparam target.database.document=$(masterdb) \ - --stringparam current.docid="$(<:.xml=)" \ - --stringparam collect.xref.targets="no" - -XMLTO_XHTML_FLAGS = \ - -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css - -XMLTO_FO_FLAGS = \ - -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -endif HAVE_STYLESHEETS +XMLTO_SEARCHPATH_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --searchpath "$(abs_top_builddir)" +XMLTO_HTML_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XMLTO_HTML_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) shelf_DATA += $(docbook:.xml=.html) -%.html: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< - -if HAVE_FOP -shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -%.pdf: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $< -%.ps: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $< -endif HAVE_FOP +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< if HAVE_XMLTO_TEXT + shelf_DATA += $(docbook:.xml=.txt) %.txt: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $< + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< endif HAVE_XMLTO_TEXT -# -# Generate documents cross-reference target databases -# +if HAVE_FOP +XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +XMLTO_PDF_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +XMLTO_FO_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_FO_STYLESHEET_FLAGS) \ + $(XMLTO_FO_IMAGEPATH_FLAGS) \ + $(XMLTO_PDF_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.pdf) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< -# This is only possible if the xorg-sgml-doctools package is installed -if HAVE_STYLESHEETS -if HAVE_XSLTPROC +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP -# DocBook/XML generated document cross-reference database -shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +# Generate documents cross-reference target databases +if HAVE_XSLTPROC -# Generate DocBook/XML document cross-reference database -# Flags for the XSL Transformation processor generating xref target databases -XSLTPROC_FLAGS = \ +XSLT_SEARCHPATH_FLAGS = \ --path "$(XORG_SGML_PATH)/X11" \ - --stringparam targets.filename "$@" \ - --stringparam collect.xref.targets "only" \ - --nonet --xinclude - + --path "$(abs_top_builddir)" +XSLT_OLINK_FLAGS = \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --stringparam olink.base.uri "$(@:.db=)" + +XSLT_HTML_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XSLT_PDF_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +shelf_DATA += $(docbook:.xml=.html.db) %.html.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< -%.fo.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< endif HAVE_XSLTPROC endif HAVE_STYLESHEETS -- cgit v1.2.3 From e3affab380afc20a7d202ec40896ad43e65a477e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 8 Sep 2011 20:00:00 -0400 Subject: docbook.am: embed css styles inside the HTML HEAD element Rather than referring to the external xorg.css stylesheet, embed the content of the file in the html output produced. This is accomplished by using version 1.10 of xorg-xhtml.xsl. This makes the whole html docs tree much more relocatable. In addition, it eliminates xorg.css as a runtime file which makes xorg-sgml-doctools a build time only package. Signed-off-by: Gaetan Nadon --- docbook.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/docbook.am b/docbook.am index 9377f5b..bba4d54 100644 --- a/docbook.am +++ b/docbook.am @@ -30,11 +30,9 @@ XMLTO_HTML_OLINK_FLAGS = \ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ --stringparam current.docid="$(<:.xml=)" XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl -XMLTO_HTML_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css XMLTO_HTML_FLAGS = \ $(XMLTO_SEARCHPATH_FLAGS) \ $(XMLTO_HTML_STYLESHEET_FLAGS) \ - $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \ $(XMLTO_HTML_OLINK_FLAGS) shelf_DATA += $(docbook:.xml=.html) -- cgit v1.2.3 From 4ecb4f1559d2ce1c74a1ff2763b1ad2746961d53 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 11 Sep 2011 19:49:54 -0400 Subject: docs: remove which is not used by default This element is not rendered by default on the title. A template customization is required to display it. X Window System does not have a product number. Signed-off-by: Gaetan Nadon --- specs/xc-misc.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 7e5a46e..f643da6 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -21,7 +21,6 @@ 1994X Consortium Version 1.1 X Consortium - X Version 11, Release 6.9/7.0 -- cgit v1.2.3 From 2d793cc635ca8a20a9ee0c99bcc0337c4f82bd7b Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 12 Sep 2011 16:54:45 -0400 Subject: docs: use the &fullrelvers; entity to set X11 release information Signed-off-by: Gaetan Nadon --- specs/xc-misc.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index f643da6..5f81856 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -1,6 +1,9 @@ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + %defs; +]> @@ -8,7 +11,7 @@ XC-MISC Extension X Consortium Standard - X Version 11, Release 6.9/7.0 + X Version 11, Release &fullrelvers; BobScheifler -- cgit v1.2.3 From 7252c99f0bdfb560efe980f6f87786f4ccedeccd Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 20 Sep 2011 20:20:46 -0400 Subject: specs: fix author affiliation Signed-off-by: Gaetan Nadon --- specs/xc-misc.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 5f81856..94c426f 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -11,19 +11,19 @@ XC-MISC Extension X Consortium Standard - X Version 11, Release &fullrelvers; BobScheifler + X Consortium - DavidWiggins + DavidP.Wiggins + X Consortium - X Consortium - 1994X Consortium + X Version 11, Release &fullrelvers; Version 1.1 - X Consortium + 1994X Consortium -- cgit v1.2.3 From 8bdaa79348896ecbf4f69df9773ec4681eb46410 Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Sun, 2 Oct 2011 20:29:17 -0600 Subject: 1 - fix the capitalization of the ID attriutes to match either the or <funcdef> string it goes with. 2 - fix any <linkend>'s that were affected by 1. 3 - any <function> in the docs that has an actual funcdef, will become an olink. Signed-off-by: Matt Dew <marcoz@osource.org> --- specs/xc-misc.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 94c426f..f2dfec2 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -40,7 +40,7 @@ </bookinfo> -<chapter id='overview'> +<chapter id='Overview'> <title>Overview When an X client connects to an X server, it receives a fixed range of @@ -70,7 +70,7 @@ IDs. Xlib can use these extension requests behind the scenes when it has exhausted its current pool of resource IDs. - + Requests @@ -131,13 +131,13 @@ range. The number returned may be smaller than the number requested. - + Events and Errors No new events or errors are defined by this extension. - + Encoding Please refer to the X11 Protocol Encoding document as this document uses -- cgit v1.2.3 From f18667046964759f1fe086ade26829f6ced4fea7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 22 Mar 2012 20:52:02 -0700 Subject: xcmiscproto 1.2.2 Signed-off-by: Alan Coopersmith --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1ce26a3..b6301ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([XCMiscProto], [1.2.1], +AC_INIT([XCMiscProto], [1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 6a1a88bfbbb5071bcc86a02061ea4b635f24eedb Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Jan 2013 14:01:10 -0500 Subject: configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index b6301ee..7b11048 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,6 @@ AC_PREREQ([2.60]) AC_INIT([XCMiscProto], [1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], -- cgit v1.2.3 From 83549077a3c2140b9862709004cd873f1c55e395 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Jan 2012 17:37:06 -0500 Subject: autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson --- autogen.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi -- cgit v1.2.3 From c27c82576531db6117d8a389a9b1c75702ea67b4 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 26 Oct 2013 09:42:05 -0400 Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Fix Automake warning: AC_OUTPUT should be used without arguments. www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files Signed-off-by: Gaetan Nadon --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7b11048..5ffaa09 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ XORG_WITH_FOP XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile specs/Makefile xcmiscproto.pc]) +AC_OUTPUT -- cgit v1.2.3 From 324a197fa726c09e6fd6e0dbb3bc5a657868f774 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 24 Jan 2017 10:32:07 +1000 Subject: autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index fc34bd5..fd9c59a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,5 +10,5 @@ autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec $srcdir/configure "$@" fi -- cgit v1.2.3 From 6258e44ffeefc189eab8132a28f001317ffce755 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 9 Mar 2015 12:00:52 +0000 Subject: autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index fd9c59a..0006de8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,14 +1,14 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? if test -z "$NOCONFIGURE"; then - exec $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi -- cgit v1.2.3 From 141dc81354b48f7cf284411a299a3ce5aa95cfb0 Mon Sep 17 00:00:00 2001 From: Mihail Konev Date: Thu, 26 Jan 2017 13:52:49 +1000 Subject: autogen: add default patch prefix Signed-off-by: Mihail Konev --- autogen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autogen.sh b/autogen.sh index 0006de8..20600db 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,6 +9,9 @@ cd "$srcdir" autoreconf -v --install || exit 1 cd "$ORIGDIR" || exit $? +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xcmiscproto" + if test -z "$NOCONFIGURE"; then exec "$srcdir"/configure "$@" fi -- cgit v1.2.3