x11proto-randr: Changes to 'upstream-unstable'
Makefile.am | 10 ++++++++++
configure.ac | 2 +-
randrproto.h | 8 ++++++--
randrproto.txt | 2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 2be5a52d5f6bdd2aa70efcb06bd99a149c6db6ba
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 15:34:31 2008 -0400
randrproto 1.2.2
diff --git a/configure.ac b/configure.ac
index 6c338f0..7a3c61c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 9ab3d5cca3cf9a76c6873007b8d4345c838cc297
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 23 14:52:12 2008 -0400
Bug #16149: Make the field not be named 'delete' in C++ mode.
Thanks for the upward compatibility, Bjarne.
diff --git a/randrproto.h b/randrproto.h
index cf7a022..3fb2e45 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -376,7 +376,11 @@ typedef struct {
Atom type B32;
CARD32 longOffset B32;
CARD32 longLength B32;
+#ifdef __cplusplus
+ BOOL _delete;
+#else
BOOL delete;
+#endif
BOOL pending;
CARD16 pad1 B16;
} xRRGetOutputPropertyReq;
commit 2df8499d24d15bfca3c928b681f64b6e8a05f0af
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:39:05 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/Makefile.am b/Makefile.am
index be38f92..59e0378 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,13 @@ randrdocdir = $(datadir)/doc/$(PACKAGE)
randrdoc_DATA = randrproto.txt
EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
+
+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 3243afaa593f95bb89b1381dac2b920111ce36b1
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Tue Apr 17 14:25:38 2007 -0700
Correct a copy'n'paste error in RRGetOutputInfo spec text.
diff --git a/randrproto.txt b/randrproto.txt
index 345ef4e..6719cf8 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -547,7 +547,7 @@ dynamic changes in the display environment.
widthInMillimeters, heightInMillimeters: CARD32
crtcs: LISTofCRTC
clones: LISTofOUTPUT
- modes: LISTofOUTPUT
+ modes: LISTofMODE
num-preferred: CARD16
└───
Errors: Output
commit d1c5739ae19f7cc01a6a5603d3fae93e1f9ee3d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 9 14:31:10 2007 -0700
Delete duplicate B32's in xRRScreenChangeNotifyEvent
Caused compiler warnings:
"randrproto.h", line 567: warning: syntax error: empty member declaration
"randrproto.h", line 568: warning: syntax error: empty member declaration
diff --git a/randrproto.h b/randrproto.h
index abca369..cf7a022 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -564,8 +564,8 @@ typedef struct {
CARD8 type; /* always evBase + ScreenChangeNotify */
CARD8 rotation; /* new rotation */
CARD16 sequenceNumber B16;
- Time timestamp B32; B32; /* time screen was changed */
- Time configTimestamp B32; B32; /* time config data was changed */
+ Time timestamp B32; /* time screen was changed */
+ Time configTimestamp B32; /* time config data was changed */
Window root B32; /* root window */
Window window B32; /* window requesting notification */
SizeID sizeID B16; /* new size ID */
Reply to: