diff options
| -rw-r--r-- | proto/bigreqsproto/ChangeLog | 165 | ||||
| -rw-r--r-- | proto/bigreqsproto/Makefile | 4 | ||||
| -rw-r--r-- | proto/bigreqsproto/Makefile.am | 13 | ||||
| -rw-r--r-- | proto/bigreqsproto/autogen.sh | 12 | ||||
| -rw-r--r-- | proto/bigreqsproto/bigreqsproto.h | 67 | ||||
| -rw-r--r-- | proto/bigreqsproto/bigreqstr.h | 72 | ||||
| -rw-r--r-- | proto/bigreqsproto/configure.ac | 6 | ||||
| -rw-r--r-- | proto/bigreqsproto/mkinstalldirs | 158 |
8 files changed, 251 insertions, 246 deletions
diff --git a/proto/bigreqsproto/ChangeLog b/proto/bigreqsproto/ChangeLog index c722b519a..b020680e3 100644 --- a/proto/bigreqsproto/ChangeLog +++ b/proto/bigreqsproto/ChangeLog @@ -1,4 +1,163 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e19e245ff8e5ddedbcc5853786ca55b56f8ab40c +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Aug 11 10:28:21 2009 +1000 - * configure.ac: - Update package version number for final X11R7 release candidate. + bigreqsproto 1.1.0 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 04e6f43c2645419569325919b7c6e69e8d5244dd +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Aug 25 15:23:39 2009 +1000 + + Move bigreqstr.h to bigreqsproto.h. + + Leave a stub for bigreqstr.h to warn potential users. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 222389bd9daa750b4ea79dd9085dc66c5f914496 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Aug 25 15:12:36 2009 +1000 + + Remove RCS tags. + +commit ca477537b1f7807539e928bb1230098d963558f8 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 20:06:27 2009 -0200 + + Janitor: Correct make distcheck and dont distribute autogen.sh + +commit 403cbefd6af734884c4254666134ce6b01574efe +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:56 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit e8c0c8be01746b4306d4b791540c0ad4f852be13 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:59 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit f48a0bfa3378127acd37131fe2e0b95930ff7508 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jul 14 18:56:07 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit 4c9ed5d885a39fa78e3789c4e7b2465b78d6221a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:36 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 6242a2e0b2d8c9fb6e01a96a2029eb880d270f5e +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:13 2005 +0000 + + Update package version number for RC1 release. + +commit cc15ee9aeb69aff196a2fd3651aeb88261062066 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Aug 2 19:19:37 2005 +0000 + + Add basic .cvsignore files for proto modules. + +commit 58a1b1e0b98d1902b9214a4a425e0e90cdbbbce2 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:54 2005 +0000 + + 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 + +commit 41700c770a1687d1acab5531eee81ff251948f99 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat May 21 03:46:57 2005 +0000 + + Change version to 1.0. + +commit c009d17f803b8af11145803d3abf2433d1c87d55 +Author: Adam Jackson <ajax@nwnk.net> +Date: Thu May 19 00:22:38 2005 +0000 + + revert last change, didn't do right thing at all, sorry for the noise + +commit 2ed368b8b8fdc31712f5456ae27a66a4dc53d5ed +Author: Adam Jackson <ajax@nwnk.net> +Date: Thu May 19 00:10:12 2005 +0000 + + Require automake 1.7 in AM_INIT_AUTOMAKE + +commit ae7cf77b7a5261cc97a07deeaf1cce05895a27ed +Author: Josh Triplett <josh@speakeasy.net> +Date: Sat May 14 07:55:09 2005 +0000 + + Add some COPYING files. + +commit 7a08cc923ec903837ed23c2045b8227600fe3343 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Mon May 9 18:20:03 2005 +0000 + + Change all the protonames from <extension>Ext to <extension>Proto. + +commit 6629d05366b6d375397be21fd35ae28dd7da5d3d +Author: Kevin E Martin <kem@kem.org> +Date: Fri May 6 01:46:29 2005 +0000 + + Initial build system files for proto module. + +commit 15f8c805114c55274de8c76e98af06b8cfbc5bf6 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:06 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 1488710946b114406f05ef31a787fa80ec6a7c32 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:36 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 44275021333dbd3c9fefabdae1f32f200179fa2e +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:54 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit a1b848a3408aa1eac5be57b6f92dfeb4d037a141 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:11 2004 +0000 + + readding XFree86's cvs IDs + +commit 94e21f55a8c7d410694672af054ea32890ef33e9 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:28 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit ba70ef76128f24cd2a78ea6aa7ac496dad76cb71 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:28:02 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 12ac905fe0e3e26515b69f01ba43c4fd16cbb670 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:43 2003 +0000 + + XFree86 4.3.0.1 + +commit dbf5531e9aaded40d1e086ebe7fbf3b9030acc57 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/proto/bigreqsproto/Makefile b/proto/bigreqsproto/Makefile index 4832d23ca..bba179c6b 100644 --- a/proto/bigreqsproto/Makefile +++ b/proto/bigreqsproto/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2010/04/24 19:48:03 matthieu Exp $ HEADERS_SUBDIR= X11/extensions/ -HEADERS= bigreqstr.h +HEADERS= bigreqsproto.h bigreqstr.h PKGCONFIG= bigreqsproto.pc .include <bsd.xorg.mk> diff --git a/proto/bigreqsproto/Makefile.am b/proto/bigreqsproto/Makefile.am index c070e0575..d748fcb25 100644 --- a/proto/bigreqsproto/Makefile.am +++ b/proto/bigreqsproto/Makefile.am @@ -1,8 +1,19 @@ bigreqsdir = $(includedir)/X11/extensions bigreqs_HEADERS = \ + bigreqsproto.h \ bigreqstr.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bigreqsproto.pc -EXTRA_DIST = autogen.sh bigreqsproto.pc.in +EXTRA_DIST = bigreqsproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/proto/bigreqsproto/autogen.sh b/proto/bigreqsproto/autogen.sh deleted file mode 100644 index 904cd6746..000000000 --- a/proto/bigreqsproto/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /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/proto/bigreqsproto/bigreqsproto.h b/proto/bigreqsproto/bigreqsproto.h new file mode 100644 index 000000000..bd0f8e568 --- /dev/null +++ b/proto/bigreqsproto/bigreqsproto.h @@ -0,0 +1,67 @@ +/* + +Copyright 1992, 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 _BIGREQSPROTO_H_ +#define _BIGREQSPROTO_H_ + +#define X_BigReqEnable 0 + +#define XBigReqNumberEvents 0 + +#define XBigReqNumberErrors 0 + +#define XBigReqExtensionName "BIG-REQUESTS" + +typedef struct { + CARD8 reqType; /* always XBigReqCode */ + CARD8 brReqType; /* always X_BigReqEnable */ + CARD16 length B16; +} xBigReqEnableReq; +#define sz_xBigReqEnableReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad0; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 max_request_size B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xBigReqEnableReply; +#define sz_xBigReqEnableReply 32 + + +typedef struct { + CARD8 reqType; + CARD8 data; + CARD16 zero B16; + CARD32 length B32; +} xBigReq; + +#endif /* _BIGREQSPROTO_H_ */ diff --git a/proto/bigreqsproto/bigreqstr.h b/proto/bigreqsproto/bigreqstr.h index fc31eb8ae..0a023dbf1 100644 --- a/proto/bigreqsproto/bigreqstr.h +++ b/proto/bigreqsproto/bigreqstr.h @@ -1,69 +1,3 @@ -/* $Xorg: bigreqstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ -/* - -Copyright 1992, 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. - -*/ -/* $XFree86$ */ - -#ifndef _BIGREQSTR_H_ -#define _BIGREQSTR_H_ - -#define X_BigReqEnable 0 - -#define XBigReqNumberEvents 0 - -#define XBigReqNumberErrors 0 - -#define XBigReqExtensionName "BIG-REQUESTS" - -typedef struct { - CARD8 reqType; /* always XBigReqCode */ - CARD8 brReqType; /* always X_BigReqEnable */ - CARD16 length B16; -} xBigReqEnableReq; -#define sz_xBigReqEnableReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 max_request_size B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xBigReqEnableReply; -#define sz_xBigReqEnableReply 32 - - -typedef struct { - CARD8 reqType; - CARD8 data; - CARD16 zero B16; - CARD32 length B32; -} xBigReq; - -#endif /* _BIGREQSTR_H_ */ +#warning "bigreqstr.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/bigreqsproto.h> for the protocol defines." +#include <X11/extensions/bigreqsproto.h> diff --git a/proto/bigreqsproto/configure.ac b/proto/bigreqsproto/configure.ac index 902ce6c51..8ecc2297c 100644 --- a/proto/bigreqsproto/configure.ac +++ b/proto/bigreqsproto/configure.ac @@ -1,8 +1,12 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([BigReqsProto], [1.1.0], [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 bigreqsproto.pc]) diff --git a/proto/bigreqsproto/mkinstalldirs b/proto/bigreqsproto/mkinstalldirs deleted file mode 100644 index 259dbfcd3..000000000 --- a/proto/bigreqsproto/mkinstalldirs +++ /dev/null @@ -1,158 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2005-06-29.22 - -# Original author: Noah Friedman <friedman@prep.ai.mit.edu> -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to <bug-automake@gnu.org>." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: |