libxrandr: Changes to 'debian-unstable'
.gitignore | 9
ChangeLog | 204
INSTALL | 237
Makefile.am | 8
Makefile.in | 725 -
README | 25
aclocal.m4 | 8207 ---------------
config.guess | 1526 --
config.h.in | 64
config.sub | 1658 ---
configure |21803 ----------------------------------------
configure.ac | 15
debian/changelog | 34
debian/control | 15
debian/copyright | 25
debian/libxrandr2.shlibs | 1
debian/libxrandr2.symbols | 8
debian/rules | 24
depcomp | 589 -
include/X11/extensions/Xrandr.h | 74
install-sh | 519
ltmain.sh | 6964 ------------
man/.gitignore | 3
man/Makefile.in | 452
missing | 367
mkinstalldirs | 161
src/.gitignore | 7
src/Makefile.am | 6
src/Makefile.in | 534
src/Xrandr.c | 38
src/Xrandrint.h | 11
src/XrrConfig.c | 2
src/XrrCrtc.c | 294
src/XrrMode.c | 3
src/XrrOutput.c | 64
src/XrrProperty.c | 18
src/XrrScreen.c | 25
37 files changed, 821 insertions(+), 43898 deletions(-)
New commits:
commit f31d8d2d189cd6bd11ad6ccc05a354c01b2998b0
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 17:12:59 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 32af7bd..6ec72b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxrandr (2:1.3.0-1) UNRELEASED; urgency=low
+libxrandr (2:1.3.0-1) unstable; urgency=low
* New upstream release.
* Bump randrproto build-dep to 1.3.
* Bump shlibs.
* Update debian/copyright.
- -- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 16:53:01 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 17:12:56 +0100
libxrandr (2:1.2.99.4-2) experimental; urgency=low
commit 13f41a61cd8eb673ddcc5c7bb34d4bb717b95de4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 17:08:50 2009 +0100
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 65dfcfc..32af7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxrandr (2:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump randrproto build-dep to 1.3.
* Bump shlibs.
+ * Update debian/copyright.
-- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 16:53:01 +0100
diff --git a/debian/copyright b/debian/copyright
index 80fd1df..cfe695f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,9 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/lib/
+Authors: Jim Gettys, HP Labs, HP.
+ Keith Packard, Intel Corporation.
+
Copyright © 2000, Compaq Computer Corporation,
Copyright © 2002, Hewlett Packard, Inc.
@@ -20,3 +23,25 @@ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright © 2006 Keith Packard
+Copyright © 2008 Red Hat, Inc.
+
+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, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holders make no representations
+about the suitability of this software for any purpose. It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
commit 939370c6299a29378bc160ac89b097d157b955a9
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 16:58:06 2009 +0100
Bump shlibs.
Set the shlibs version in the dh_makeshlibs call.
diff --git a/debian/changelog b/debian/changelog
index 834452d..65dfcfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxrandr (2:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump randrproto build-dep to 1.3.
+ * Bump shlibs.
-- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 16:53:01 +0100
diff --git a/debian/libxrandr2.shlibs b/debian/libxrandr2.shlibs
deleted file mode 100644
index 9edc977..0000000
--- a/debian/libxrandr2.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libXrandr 2 libxrandr2 (>= 2:1.2.0)
diff --git a/debian/rules b/debian/rules
index 007fe54..97375e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
- dh_makeshlibs
+ dh_makeshlibs -V'libxrandr2 (>= 2:1.3)'
dh_shlibdeps
dh_installdeb
dh_gencontrol
commit 27324fc21be060bb9e05b4209d7e1a2dadb3ff29
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 16:56:26 2009 +0100
Bump randrproto build-dep to 1.3.
diff --git a/debian/changelog b/debian/changelog
index f02a0de..834452d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxrandr (2:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump randrproto build-dep to 1.3.
-- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 16:53:01 +0100
diff --git a/debian/control b/debian/control
index 8f068f9..62243c8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
- x11proto-randr-dev (>= 1.2.99.3),
+ x11proto-randr-dev (>= 1.3),
x11proto-render-dev,
libxrender-dev (>= 1:0.9.0-2),
pkg-config,
commit 31dada820a552457edfb6beb9083aaeb6d3b0012
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 12 16:53:58 2009 +0100
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 5147f47..668c4d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit e3036766916d55d0c8ae72d5752fd1699ae7390d
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Mar 6 15:13:56 2009 +0100
+
+ Bump to 1.3.0
+
+commit 6bf8648e7e408be7a869fd4c4527a4fd73fc687d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:36 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 70d641c6d170cda44856579dfdcb42d3bb1f8221
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jan 30 20:12:43 2009 -0800
+
+ Send X_RRGetOutputPrimary when making an X_RRGetOutputPrimary request
+
+ Using X_RRGetOutputProperty does not yield success here.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bf284b043d4c5688da2207647126b095f8c2b0cd
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Fri Jan 30 16:38:03 2009 -0200
+
+ Janitor: make distcheck, compiler warnings, .gitignore
+
+ Warning corrections are either unused symbols or using an
+ integer as a pointer (generated by sparse).
+
+commit a0c45b798d2fa810167d64a92093840178f993b1
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Dec 21 16:32:17 2008 +0100
+
+ Fix thinkos
+
+ * XRRExtensionInfo can be static
+ * XRRExtensionName is not called XrandrExtensionName
+
commit 8574ffb20fa10b6f2e9a5f115f23506b93c64b12
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 17 11:33:37 2008 -0500
@@ -84,7 +126,7 @@ Date: Mon Dec 1 21:09:44 2008 +0100
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 83e567f427f68dc4ae2de796a1184748bbe0238e
-Merge: 908de8f... 00f2e30...
+Merge: 908de8f 00f2e30
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Dec 1 20:59:39 2008 +0100
@@ -206,7 +248,7 @@ Date: Thu Dec 6 16:38:42 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit e56fa06624dc240dbe8d3e127cc3b65da580fe6e
-Merge: 27b91d1... 0294912...
+Merge: 27b91d1 0294912
Author: James Cloos <cloos@jhcloos.com>
Date: Sun Nov 11 10:27:35 2007 -0500
@@ -258,7 +300,7 @@ Date: Thu Feb 15 16:56:11 2007 -0800
Must pass size information in SetCrtcGamma request.
commit 9c4fea702a0382689898fc14cbdab456fb18c403
-Merge: c85237a... 382b7a3...
+Merge: c85237a 382b7a3
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Jan 31 14:24:57 2007 -0800
@@ -309,7 +351,7 @@ Date: Sat Dec 30 13:11:10 2006 -0800
structure to the XRRCrtcInfo being returned, leaving the value uninitialized.
commit bc75a92cac23dad4a661a13e6af121f6072cecc8
-Merge: 7fcdcbb... 370fa28...
+Merge: 7fcdcbb 370fa28
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Dec 2 11:27:36 2006 +1100
@@ -324,7 +366,7 @@ Date: Thu Nov 30 21:56:59 2006 -0800
They build. More testing seems indicated.
commit 7fcdcbb0f9c4736bd678be7f9bf76d472293233f
-Merge: 875867f... 0dba1be...
+Merge: 875867f 0dba1be
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 15:41:03 2006 -0800
diff --git a/debian/changelog b/debian/changelog
index dd75c6d..f02a0de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxrandr (2:1.3.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Mar 2009 16:53:01 +0100
+
libxrandr (2:1.2.99.4-2) experimental; urgency=low
* Cherry-pick patch from upstream git to fix XRRGetOutputPrimary.
commit e3036766916d55d0c8ae72d5752fd1699ae7390d
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Mar 6 15:13:56 2009 +0100
Bump to 1.3.0
diff --git a/configure.ac b/configure.ac
index a8a4bfa..a018667 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 1.2.99.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 6bf8648e7e408be7a869fd4c4527a4fd73fc687d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:36 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index e69de29..b035b8b 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libXrandr - X Resize, Rotate and Reflection extension library
+
+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/lib/libXrandr
+
+ http://cgit.freedesktop.org/xorg/lib/libXrandr
+
+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
+
commit 5f6769358d632d5be48d0b2c6e6f7c51ca201440
Author: Julien Cristau <julien@radis.liafa.jussieu.fr>
Date: Sun Feb 1 14:47:34 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0dcc3af..dd75c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxrandr (2:1.2.99.4-2) experimental; urgency=low
+
+ * Cherry-pick patch from upstream git to fix XRRGetOutputPrimary.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 01 Feb 2009 14:47:29 +0100
+
libxrandr (2:1.2.99.4-1) experimental; urgency=low
[ Timo Aaltonen ]
commit 1f6e17b1e1ae2feef7d0c1e38ffa1e31785f92f5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 20:12:43 2009 -0800
Send X_RRGetOutputPrimary when making an X_RRGetOutputPrimary request
Using X_RRGetOutputProperty does not yield success here.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 70d641c6d170cda44856579dfdcb42d3bb1f8221)
diff --git a/src/XrrOutput.c b/src/XrrOutput.c
index 9545cbe..68c5336 100644
--- a/src/XrrOutput.c
+++ b/src/XrrOutput.c
@@ -180,7 +180,7 @@ XRRGetOutputPrimary(Display *dpy, Window window)
LockDisplay(dpy);
GetReq (RRGetOutputPrimary, req);
req->reqType = info->codes->major_opcode;
- req->randrReqType = X_RRGetOutputProperty;
+ req->randrReqType = X_RRGetOutputPrimary;
req->window = window;
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
commit 70d641c6d170cda44856579dfdcb42d3bb1f8221
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 20:12:43 2009 -0800
Send X_RRGetOutputPrimary when making an X_RRGetOutputPrimary request
Using X_RRGetOutputProperty does not yield success here.
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/src/XrrOutput.c b/src/XrrOutput.c
index 0c39a31..18863bd 100644
--- a/src/XrrOutput.c
+++ b/src/XrrOutput.c
@@ -176,7 +176,7 @@ XRRGetOutputPrimary(Display *dpy, Window window)
LockDisplay(dpy);
GetReq (RRGetOutputPrimary, req);
req->reqType = info->codes->major_opcode;
- req->randrReqType = X_RRGetOutputProperty;
+ req->randrReqType = X_RRGetOutputPrimary;
req->window = window;
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
commit bf284b043d4c5688da2207647126b095f8c2b0cd
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 16:38:03 2009 -0200
Janitor: make distcheck, compiler warnings, .gitignore
Warning corrections are either unused symbols or using an
integer as a pointer (generated by sparse).
diff --git a/.gitignore b/.gitignore
index a8f6f22..dceb0f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
compile
@@ -19,3 +21,10 @@ mkinstalldirs
stamp-h1
xrandr.pc
*~
+*.3
+*.o
+*.la
+*.lo
+libXrandr-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index bef1d41..9dc4b53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,15 @@
SUBDIRS = src man
-AM_CFLAGS = $(RANDR_CFLAGS) $(X_CFLAGS)
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrandr.pc
-EXTRA_DIST = xrandr.pc.in autogen.sh
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = xrandr.pc.in 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index d086cde..a8a4bfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,29 +35,30 @@ AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, 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)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-
-# Check for X
-PKG_CHECK_MODULES(X, x11)
-AC_SUBST(X_CFLAGS)
-AC_SUBST(X_LIBS)
+XORG_CWARNFLAGS
# Check randr configuration, strip extra digits from package version to
# find the required protocol version
RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RANDR_VERSION)
-PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xextproto xrender renderproto)
+PKG_CHECK_MODULES(RANDR, x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto)
+RANDR_CFLAGS="$CWARNFLAGS $RANDR_CFLAGS"
AC_SUBST(RANDR_CFLAGS)
AC_SUBST(RANDR_LIBS)
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 00409a0..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXrandr.la
-*.lo
-*.o
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 57aa59c..ab7e778 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,8 @@ libXrandr_la_SOURCES = \
XrrProperty.c \
XrrScreen.c
-libXrandr_la_LIBADD = @X_LIBS@ @RANDR_LIBS@
-AM_CFLAGS = @X_CFLAGS@ @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+libXrandr_la_LIBADD = @RANDR_LIBS@
+AM_CFLAGS = @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
INCLUDES = -I$(top_srcdir)/include/X11/extensions
diff --git a/src/Xrandr.c b/src/Xrandr.c
index c923e0f..8ab1eae 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -232,7 +232,7 @@ XRRFindDisplay (Display *dpy)
dpyinfo = XextAddDisplay (&XRRExtensionInfo, dpy,
XRRExtensionName,
&rr_extension_hooks,
- RRNumberEvents, 0);
+ RRNumberEvents, NULL);
numscreens = ScreenCount(dpy);
xrri = Xmalloc (sizeof(XRandRInfo) +
sizeof(char *) * numscreens);
diff --git a/src/XrrConfig.c b/src/XrrConfig.c
index 7784227..db7a1ae 100644
--- a/src/XrrConfig.c
+++ b/src/XrrConfig.c
@@ -69,7 +69,7 @@ short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates)
if (!nents)
{
*nrates = 0;
- return 0;
+ return NULL;
}
*nrates = (int) *r;
return r + 1;
diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
index 91b1671..db9d0b4 100644
--- a/src/XrrCrtc.c
+++ b/src/XrrCrtc.c
@@ -39,10 +39,9 @@ XRRGetCrtcInfo (Display *dpy, XRRScreenResources *resources, RRCrtc crtc)
xRRGetCrtcInfoReply rep;
xRRGetCrtcInfoReq *req;
int nbytes, nbytesRead, rbytes;
- int i;
XRRCrtcInfo *xci;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
GetReq (RRGetCrtcInfo, req);
@@ -128,7 +127,6 @@ XRRSetCrtcConfig (Display *dpy,
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRSetCrtcConfigReply rep;
xRRSetCrtcConfigReq *req;
- int i;
RRCheckExtension (dpy, info, 0);
@@ -159,7 +157,6 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc)
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRGetCrtcGammaSizeReply rep;
xRRGetCrtcGammaSizeReq *req;
- int i;
RRCheckExtension (dpy, info, 0);
@@ -182,12 +179,11 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRGetCrtcGammaReply rep;
xRRGetCrtcGammaReq *req;
- int i;
XRRCrtcGamma *crtc_gamma;
long nbytes;
long nbytesRead;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay(dpy);
GetReq (RRGetCrtcGamma, req);
@@ -358,7 +354,6 @@ XRRGetCrtcTransform (Display *dpy,
XRRCrtcTransformAttributes **attributes)
{
XExtDisplayInfo *info = XRRFindDisplay(dpy);
- XRandRInfo *xrri;
xRRGetCrtcTransformReply rep;
xRRGetCrtcTransformReq *req;
int major_version, minor_version;
@@ -472,7 +467,7 @@ XRRGetPanning (Display *dpy, XRRScreenResources *resources, RRCrtc crtc)
xRRGetPanningReq *req;
XRRPanning *xp;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
GetReq (RRGetPanning, req);
@@ -528,7 +523,6 @@ XRRSetPanning (Display *dpy,
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRSetPanningReply rep;
xRRSetPanningReq *req;
- int i;
RRCheckExtension (dpy, info, 0);
diff --git a/src/XrrMode.c b/src/XrrMode.c
index fce3037..58ef68b 100644
--- a/src/XrrMode.c
+++ b/src/XrrMode.c
@@ -54,7 +54,6 @@ XRRCreateMode (Display *dpy, Window window, XRRModeInfo *mode_info)
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRCreateModeReq *req;
xRRCreateModeReply rep;
- long channelSize;
RRCheckExtension (dpy, info, None);
diff --git a/src/XrrOutput.c b/src/XrrOutput.c
index 9545cbe..0c39a31 100644
--- a/src/XrrOutput.c
+++ b/src/XrrOutput.c
@@ -42,11 +42,9 @@ XRRGetOutputInfo (Display *dpy, XRRScreenResources *resources, RROutput output)
xRRGetOutputInfoReply rep;
xRRGetOutputInfoReq *req;
int nbytes, nbytesRead, rbytes;
- int i;
- xRRQueryVersionReq *vreq;
XRROutputInfo *xoi;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
GetReq (RRGetOutputInfo, req);
@@ -142,7 +140,6 @@ XRRSetOutputPrimary(Display *dpy, Window window, RROutput output)
{
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRSetOutputPrimaryReq *req;
- int i;
int major_version, minor_version;
RRSimpleCheckExtension (dpy, info);
@@ -168,7 +165,6 @@ XRRGetOutputPrimary(Display *dpy, Window window)
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRGetOutputPrimaryReq *req;
xRRGetOutputPrimaryReply rep;
- int i;
int major_version, minor_version;
RRCheckExtension (dpy, info, 0);
diff --git a/src/XrrProperty.c b/src/XrrProperty.c
index d3d3246..9554f9a 100644
--- a/src/XrrProperty.c
+++ b/src/XrrProperty.c
@@ -38,12 +38,10 @@ XRRListOutputProperties (Display *dpy, RROutput output, int *nprop)
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRListOutputPropertiesReply rep;
xRRListOutputPropertiesReq *req;
- int nbytes, nbytesRead, rbytes;
- int i;
- xRRQueryVersionReq *vreq;
+ int nbytes, rbytes;
Atom *props = NULL;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
GetReq (RRListOutputProperties, req);
@@ -87,11 +85,9 @@ XRRQueryOutputProperty (Display *dpy, RROutput output, Atom property)
xRRQueryOutputPropertyReply rep;
xRRQueryOutputPropertyReq *req;
int rbytes, nbytes;
- int i;
- xRRQueryVersionReq *vreq;
XRRPropertyInfo *prop_info;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
GetReq (RRQueryOutputProperty, req);
@@ -140,7 +136,6 @@ XRRConfigureOutputProperty (Display *dpy, RROutput output, Atom property,
{
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRConfigureOutputPropertyReq *req;
- xRRQueryVersionReq *vreq;
long len;
RRSimpleCheckExtension (dpy, info);
@@ -173,7 +168,6 @@ XRRChangeOutputProperty (Display *dpy, RROutput output,
{
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRChangeOutputPropertyReq *req;
- xRRQueryVersionReq *vreq;
long len;
RRSimpleCheckExtension (dpy, info);
@@ -258,9 +252,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRGetOutputPropertyReply rep;
xRRGetOutputPropertyReq *req;
- long nbytes, rbytes, nbytesRead;
- int i;
- xRRQueryVersionReq *vreq;
+ long nbytes, rbytes;
RRCheckExtension (dpy, info, 1);
diff --git a/src/XrrScreen.c b/src/XrrScreen.c
index df49bb5..54bc2ca 100644
--- a/src/XrrScreen.c
+++ b/src/XrrScreen.c
@@ -53,7 +53,7 @@ doGetScreenResources (Display *dpy, Window window, int poll)
Bool getting_version = False;
XRandRInfo *xrri;
- RRCheckExtension (dpy, info, 0);
+ RRCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
xrri = (XRandRInfo *) info->data;
commit 764d98ef2ce050709ef5ec3d7b765d7f45b5077f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 4 20:50:25 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1eb2081..0dcc3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxrandr (2:1.2.99.4-1) UNRELEASED; urgency=low
+libxrandr (2:1.2.99.4-1) experimental; urgency=low
[ Timo Aaltonen ]
* New upstream prerelease.
@@ -15,7 +15,7 @@ libxrandr (2:1.2.99.4-1) UNRELEASED; urgency=low
* Bump x11proto-randr-dev build and runtime dependencies to >= 1.2.99.3.
* debian/libxrandr2.symbols: add new symbols.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 08 Dec 2008 22:25:39 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 04 Jan 2009 20:50:22 +0100
libxrandr (2:1.2.3-1) unstable; urgency=low
commit bb34dbdffa7ed68e962ad141dd133256f29bff4d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 4 20:47:41 2009 +0100
Update from 1.2.99.2 to 1.2.99.4
* Bump x11proto-randr-dev build and runtime dependencies to >= 1.2.99.3.
* debian/libxrandr2.symbols: add new symbols.
* Update upstream changelog
diff --git a/ChangeLog b/ChangeLog
index 14f39b2..5147f47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,131 @@
+commit 8574ffb20fa10b6f2e9a5f115f23506b93c64b12
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 17 11:33:37 2008 -0500
+
+ libXrandr 1.2.99.4
+
+commit e2f075ea3927f83fb7ee8b359ef951222e8f894b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 17 11:29:05 2008 -0500
+
+ Define _XRRHasRates internally.
+
+commit 53bd07438d3671dca86df2bf3052f89ee8ce0891
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 17 11:27:19 2008 -0500
+
+ Be sure to return NULL when returning no properties.
+
+commit 7c1ccb19bd2545ccdf7099489e946e772a25649f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 17 11:25:20 2008 -0500
+
+ Use RRCheckExtension in function returning a value.
+
+commit 2db939e82c29fa3ab868bac9d2b54de18419004b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 17 11:24:33 2008 -0500
+
+ Fix type of GetReq() argument.
+
+commit c79e2aecab080d8f47b258ae3c4dd9394280ae2a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 17 11:23:51 2008 -0500
+
+ Use RRSimpleCheckExtension in functions returning void
+
+commit dda80ea67e33d18f7cc869c6f828c444c8966704
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Dec 12 13:04:57 2008 +0100
+
+ Bump to 1.2.99.3
+
+commit 59c8812099f33d56b43044f999ffe5df16adf5ff
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 8 15:37:53 2008 -0500
+
+ Add [GS]etOutputPrimary
+
+commit 0f11922bdc0d4e3929df4dc967379ea0b48338b8
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Dec 4 18:24:42 2008 +0100
+
+ Bump to 1.2.99.2.
+
+ Note the .99
+
+commit e788c1ed41e029e54470a2c79f1478c1be7bba92
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Dec 4 15:51:07 2008 +0100
+
+ Nuke config-timestamp for panning.
+
+commit 1de7212d9a945403f13f4dc15a66ec115c3be44c
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Nov 28 17:26:43 2008 +0100
+
+ Panning support
+
+commit 0dd24bd6ad3c437f320c5d8e922c479fb61b115f
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Dec 1 21:19:35 2008 +0100
+
+ Bump to 1.2.91
+
+commit 0fa7452220701ee44d8bafc57001e362afcedb0c
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Dec 1 21:09:44 2008 +0100
+
+ RRNotify subevents have 'window' at different offsets, the sequel
+
+ f176b2bda103f6f38aabab8207f47a02cc797659 fixed XRRWireToEvent, but
+ XRREventToWire had the same bug.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 83e567f427f68dc4ae2de796a1184748bbe0238e
+Merge: 908de8f... 00f2e30...
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Dec 1 20:59:39 2008 +0100
+
+ Merge branch 'transform-proposal' of git.freedesktop.org:/git/xorg/lib/libXrandr
+
+ Conflicts:
+
+ src/Xrandr.c
+
+commit 00f2e30d0b8296668776d62a4c47f96bf95faa08
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Nov 28 16:16:22 2008 +0100
+
+ Set attr->pendingNparams in XRRGetCrtcTransform()
+
+commit 908de8fc7228ecc7b02825ebede5fb937f3abf1b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 24 16:11:46 2008 -0500
+
+ Add GetScreenResourcesCurrent
+
+commit 377126fdaf1094354d54b1743f9d2bf1f2de1e0c
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 12 20:18:21 2008 -0700
+
+ Set NparamsFilter in XRRGetCrtcTransform return value.
+
+ Leaving this uninitialized isn't very helpful, and can cause segfaults.
+
+commit f176b2bda103f6f38aabab8207f47a02cc797659
+Author: Tomas Carnecky <tom@dbservice.com>
+Date: Wed Aug 13 10:24:11 2008 -0400
+
+ RRNotify subevents have 'window' at different offsets.
+
+commit d631e453d62104b4a4afdcf0b34e6f3aefd62644
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Aug 13 10:21:51 2008 -0400
+
+ Remove RCS tags.
+
commit bf476779616b24c6456339bc77896460f1a2545a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 15:28:08 2008 -0400
@@ -30,6 +158,32 @@ Date: Tue Feb 5 15:37:32 2008 +0100
It seems that they were never actually implemented.
Also remove the corresponding manpage symlinks.
+commit 7a21e7bc994c5fa7d3ab15ba7201667e134f1512
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Mar 18 16:02:36 2008 -0700
+
+ Eliminate inverse matrix from randr transform protocol
+
+ It is easier, and potentially more precise, to compute the inverse in the
+ server where everything can eventually be kept in floating point form.
+
+commit a6e5fa4ceb72795380496fcfe62c083866791dc1
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Mar 15 00:33:30 2008 -0700
+
+ Support CRTC Transform filters
+
+ XRRGetCrtcTransform now returns a giant struct containing all of the
+ transform and filter data.
+
+ XRRSetCrtcTransform now accepts filter parameters.
+
+commit 2a5fb0e58ed6ee1ff1f0ff00b5bf5b2623991132
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Mar 4 08:17:48 2008 -0800
+
+ Add support for new Transform requests.
+
commit dc0ce2e363dbdac560fc2a8c1296c5468d75f644
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:37:17 2008 +0100
diff --git a/debian/changelog b/debian/changelog
index c26656b..1eb2081 100644
--- a/debian/changelog
+++ b/debian/changelog
Reply to: