x11proto-bigreqs: Changes to 'upstream-unstable'
.gitignore | 4 +++
ChangeLog | 4 ---
Makefile.am | 13 +++++++++-
bigreqsproto.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
bigreqstr.h | 72 ++-------------------------------------------------------
configure.ac | 6 +++-
6 files changed, 91 insertions(+), 75 deletions(-)
New commits:
commit e19e245ff8e5ddedbcc5853786ca55b56f8ab40c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 10:28:21 2009 +1000
bigreqsproto 1.1.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ccf57d5..8ecc229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
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
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>
diff --git a/Makefile.am b/Makefile.am
index ea2ce67..d748fcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
bigreqsdir = $(includedir)/X11/extensions
bigreqs_HEADERS = \
+ bigreqsproto.h \
bigreqstr.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/bigreqsproto.h b/bigreqsproto.h
new file mode 100644
index 0000000..bd0f8e5
--- /dev/null
+++ b/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/bigreqstr.h b/bigreqstr.h
index bbbc10d..0a023db 100644
--- a/bigreqstr.h
+++ b/bigreqstr.h
@@ -1,67 +1,3 @@
-/*
-
-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 _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>
commit 222389bd9daa750b4ea79dd9085dc66c5f914496
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 15:12:36 2009 +1000
Remove RCS tags.
diff --git a/bigreqstr.h b/bigreqstr.h
index fc31eb8..bbbc10d 100644
--- a/bigreqstr.h
+++ b/bigreqstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: bigreqstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1992, 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 _BIGREQSTR_H_
#define _BIGREQSTR_H_
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
diff --git a/.gitignore b/.gitignore
index 6aa5b98..1b7309b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
bigreqsproto.pc
*~
+bigreqsproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 2417840..ea2ce67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ bigreqs_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = bigreqsproto.pc
-EXTRA_DIST = autogen.sh bigreqsproto.pc.in
+EXTRA_DIST = bigreqsproto.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 902ce6c..ccf57d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([BigReqsProto], [1.0.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
bigreqsproto.pc])
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
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c722b51..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index c070e05..2417840 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,3 +6,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = bigreqsproto.pc
EXTRA_DIST = autogen.sh bigreqsproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit e8c0c8be01746b4306d4b791540c0ad4f852be13
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:59 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index b10eb37..6aa5b98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
bigreqsproto.pc
+*~
Reply to: