x11proto-randr: Changes to 'debian-experimental'
ChangeLog | 49 ++++++++++++++++++++++++++++++++++++++
Makefile.am | 5 +++
Makefile.in | 42 +++++++++++++++++++++++++-------
configure | 20 +++++++--------
configure.ac | 25 ++++++++++++++++++-
debian/changelog | 7 +++++
debian/rules | 2 -
debian/x11proto-randr-dev.install | 1
randrproto.h | 30 +++++++++++------------
randrproto.txt | 4 ++-
10 files changed, 147 insertions(+), 38 deletions(-)
New commits:
commit 741a04eb627e980b2f08d99ab59bc5e9eca6ffef
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 19 08:48:06 2007 +0100
Install randrproto.txt in the package.
diff --git a/debian/changelog b/debian/changelog
index d074eea..c2c0266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-randr (1.2.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Install randrproto.txt in the package.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 19 Feb 2007 08:46:03 +0100
+
x11proto-randr (1.2.0-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 7843d4e..ce74597 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PACKAGE=$(PACKAGE) install
# Build architecture-independent files here.
binary-indep: build install
diff --git a/debian/x11proto-randr-dev.install b/debian/x11proto-randr-dev.install
index 1b56dc2..c831e90 100644
--- a/debian/x11proto-randr-dev.install
+++ b/debian/x11proto-randr-dev.install
@@ -1,2 +1,3 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/randrproto.pc
+usr/share/doc/x11proto-randr-dev/*
commit fc52b7f39be11a20b5ae3ceb9a8dc42c50e05fa9
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 19 08:47:27 2007 +0100
Update ChangeLog to new upstream release.
diff --git a/ChangeLog b/ChangeLog
index 8ccd340..ec8882f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+commit aada204b1fc9ba6461efad3fe6bd032ee98536e1
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Sun Feb 18 21:02:30 2007 -0800
+
+ Bump version to 1.2.1.
+
+ And add copyright to configure.ac file
+
+commit 0e689cecd65f420ec175046e4bb2b5386bf7b7c5
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Sun Feb 18 21:02:10 2007 -0800
+
+ Fix wording about requesting ConfigureNotify events.
+
+commit 34ebf25a88972afdc561f4525d02b3fe41ac84bf
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Feb 1 15:08:10 2007 -0800
+
+ Fix the size of the padding fields of xRRGetCrtcGamma.
+
+commit 615f8077c55593a2001ca4c84ff3ede5c2c2842a
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 9 09:40:47 2007 -0800
+
+ Install the randr protocol description.
+
+commit 335639ba8f0df1364a6807187ba17eeae5b187e4
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Nov 30 13:25:35 2006 -0800
+
+ More bugs found by Ian Osgood during the XCB work.
+
+ ListOutputProperties has no nProperties field.
+ Pad fields not mentioned in Gamma requests.
+ sz_xRROUtputChangeNotifyEvent -> sz_xRROutputChangeNotifyEvent
+
+commit 504556a9f886c84798ae8e0e46896a7c74b95c61
+Merge: c27ece2... 3d521b3...
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Nov 30 09:44:20 2006 -0800
+
+ Merge branch 'multi-monitor'
+
+commit 3d521b3d38d10c5ec660d13514ef3e626bef90fa
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Nov 30 09:43:10 2006 -0800
+
+ Fix padding bugs discovered in XCB work
+
commit c27ece25924115448bf9e1dc461d5e7f4112f112
Merge: 3305f63... 7363d44...
Author: Eric Anholt <eric@anholt.net>
commit 3d6541923ae7ade5447e153b47074419cabbc573
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 19 08:47:00 2007 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index ad3f35c..ad73d03 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,9 +56,11 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(randrdir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(randrdocdir)" "$(DESTDIR)$(randrdir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
+randrdocDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA) $(randrdoc_DATA)
randrHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(randr_HEADERS)
ETAGS = etags
@@ -141,7 +143,9 @@ randr_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = randrproto.pc
-EXTRA_DIST = autogen.sh randrproto.pc.in randrproto.txt
+randrdocdir = $(datadir)/doc/$(PACKAGE)
+randrdoc_DATA = randrproto.txt
+EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
all: all-am
.SUFFIXES:
@@ -198,6 +202,23 @@ uninstall-pkgconfigDATA:
echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
done
+install-randrdocDATA: $(randrdoc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(randrdocdir)" || $(mkdir_p) "$(DESTDIR)$(randrdocdir)"
+ @list='$(randrdoc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(randrdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(randrdocdir)/$$f'"; \
+ $(randrdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(randrdocdir)/$$f"; \
+ done
+
+uninstall-randrdocDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(randrdoc_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(randrdocdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(randrdocdir)/$$f"; \
+ done
install-randrHEADERS: $(randr_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(randrdir)" || $(mkdir_p) "$(DESTDIR)$(randrdir)"
@@ -395,7 +416,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(randrdir)"; do \
+ for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(randrdocdir)" "$(DESTDIR)$(randrdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -441,7 +462,8 @@ info: info-am
info-am:
-install-data-am: install-pkgconfigDATA install-randrHEADERS
+install-data-am: install-pkgconfigDATA install-randrHEADERS \
+ install-randrdocDATA
install-exec-am:
@@ -470,7 +492,7 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \
- uninstall-randrHEADERS
+ uninstall-randrHEADERS uninstall-randrdocDATA
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
@@ -479,11 +501,13 @@ uninstall-am: uninstall-info-am uninstal
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
- install-pkgconfigDATA install-randrHEADERS install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-pkgconfigDATA install-randrHEADERS \
+ install-randrdocDATA install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
- uninstall-pkgconfigDATA uninstall-randrHEADERS
+ uninstall-pkgconfigDATA uninstall-randrHEADERS \
+ uninstall-randrdocDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/configure b/configure
index 48a7f7e..1a14ba1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for RandrProto 1.2.0.
+# Generated by GNU Autoconf 2.61 for RandrProto 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='RandrProto'
PACKAGE_TARNAME='randrproto'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='RandrProto 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='RandrProto 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1144,7 +1144,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures RandrProto 1.2.0 to adapt to many kinds of systems.
+\`configure' configures RandrProto 1.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1210,7 +1210,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of RandrProto 1.2.0:";;
+ short | recursive ) echo "Configuration of RandrProto 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1281,7 +1281,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-RandrProto configure 1.2.0
+RandrProto configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1295,7 +1295,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by RandrProto $as_me 1.2.0, which was
+It was created by RandrProto $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1965,7 +1965,7 @@ fi
# Define the identity of the package.
PACKAGE='randrproto'
- VERSION='1.2.0'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -2557,7 +2557,7 @@ # Save the log message, to keep $[0] and
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by RandrProto $as_me 1.2.0, which was
+This file was extended by RandrProto $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2600,7 +2600,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-RandrProto config.status 1.2.0
+RandrProto config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
commit aada204b1fc9ba6461efad3fe6bd032ee98536e1
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Feb 18 21:02:30 2007 -0800
Bump version to 1.2.1.
And add copyright to configure.ac file
diff --git a/configure.ac b/configure.ac
index ac3a617..6c338f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,28 @@
+dnl
+dnl Copyright © 2003 Keith Packard
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation, and that the name of Keith Packard not be used in
+dnl advertising or publicity pertaining to distribution of the software without
+dnl specific, written prior permission. Keith Packard makes no
+dnl representations about the suitability of this software for any purpose. It
+dnl is provided "as is" without express or implied warranty.
+dnl
+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 0e689cecd65f420ec175046e4bb2b5386bf7b7c5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Feb 18 21:02:10 2007 -0800
Fix wording about requesting ConfigureNotify events.
diff --git a/randrproto.txt b/randrproto.txt
index cf15159..345ef4e 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -974,7 +974,7 @@ dynamic changes in the display environme
Clients MAY select for ConfigureNotify on the root window to be
informed of screen changes. This may be advantageous if all your
-clients need to know is the size of the root window, as it avoids
+client needs to know is the size of the root window, as it avoids
round trips to set up the extension.
RRScreenChangeNotify is sent if RRSelectInput has requested it
commit 34ebf25a88972afdc561f4525d02b3fe41ac84bf
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 1 15:08:10 2007 -0800
Fix the size of the padding fields of xRRGetCrtcGamma.
diff --git a/randrproto.h b/randrproto.h
index 02680d9..abca369 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -539,11 +539,11 @@ typedef struct {
CARD32 length B32;
CARD16 size B16;
CARD16 pad1 B16;
- CARD16 pad2 B32;
- CARD16 pad3 B32;
- CARD16 pad4 B32;
- CARD16 pad5 B32;
- CARD16 pad6 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
} xRRGetCrtcGammaReply;
#define sz_xRRGetCrtcGammaReply 32
commit 615f8077c55593a2001ca4c84ff3ede5c2c2842a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 9 09:40:47 2007 -0800
Install the randr protocol description.
diff --git a/Makefile.am b/Makefile.am
index e741694..be38f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,7 @@ randr_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = randrproto.pc
-EXTRA_DIST = autogen.sh randrproto.pc.in randrproto.txt
+randrdocdir = $(datadir)/doc/$(PACKAGE)
+randrdoc_DATA = randrproto.txt
+
+EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
commit 335639ba8f0df1364a6807187ba17eeae5b187e4
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 30 13:25:35 2006 -0800
More bugs found by Ian Osgood during the XCB work.
ListOutputProperties has no nProperties field.
Pad fields not mentioned in Gamma requests.
sz_xRROUtputChangeNotifyEvent -> sz_xRROutputChangeNotifyEvent
diff --git a/randrproto.h b/randrproto.h
index 97ad28b..02680d9 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -293,7 +293,7 @@ #define sz_xRRListOutputPropertiesReq 8
typedef struct {
BYTE type;
- CARD8 nProperties;
+ CARD8 pad0;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD16 nAtoms B16;
@@ -407,7 +407,7 @@ #define sz_xRRCreateModeReq 40
typedef struct {
BYTE type;
- CARD8 status;
+ CARD8 pad0;
CARD16 sequenceNumber B16;
CARD32 length B32;
RRMode mode B32;
@@ -608,7 +608,7 @@ typedef struct {
CARD8 connection; /* connection status */
CARD8 subpixelOrder; /* subpixel order */
} xRROutputChangeNotifyEvent;
-#define sz_xRROUtputChangeNotifyEvent 32
+#define sz_xRROutputChangeNotifyEvent 32
typedef struct {
CARD8 type; /* always evBase + RRNotify */
@@ -624,7 +624,7 @@ typedef struct {
CARD32 pad3 B32;
CARD32 pad4 B32;
} xRROutputPropertyNotifyEvent;
-#define sz_xRROUtputPropertyNotifyEvent 32
+#define sz_xRROutputPropertyNotifyEvent 32
#undef RRModeFlags
#undef RRCrtc
diff --git a/randrproto.txt b/randrproto.txt
index bde1fdf..cf15159 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1664,6 +1664,7 @@ A.2.1 Protocol Requests added with versi
2n LISTofCARD16 red
2n LISTofCARD16 green
2n LISTofCARD16 blue
+ p unused, p=pad(6n)
â??â??â??â??
â??â??â??â??
RRSetCrtcGamma
@@ -1676,6 +1677,7 @@ A.2.1 Protocol Requests added with versi
2n LISTofCARD16 red
2n LISTofCARD16 green
2n LISTofCARD16 blue
+ p unused, p=pad(6n)
â??â??â??â??
A.3 Protocol Events
commit 3d521b3d38d10c5ec660d13514ef3e626bef90fa
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 30 09:43:10 2006 -0800
Fix padding bugs discovered in XCB work
diff --git a/randrproto.h b/randrproto.h
index fe40c0e..97ad28b 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -324,7 +324,7 @@ typedef struct {
BOOL range;
BOOL immutable;
BYTE pad1;
- CARD16 pad2 B16;
+ CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
@@ -516,11 +516,11 @@ typedef struct {
CARD32 length B32;
CARD16 size B16;
CARD16 pad1 B16;
- CARD16 pad2 B32;
- CARD16 pad3 B32;
- CARD16 pad4 B32;
- CARD16 pad5 B32;
- CARD16 pad6 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
} xRRGetCrtcGammaSizeReply;
#define sz_xRRGetCrtcGammaSizeReply 32
Reply to: