libxrandr: Changes to 'upstream-unstable'
.gitignore | 72 +++++++++++++++++----
COPYING | 45 +++++++++++++
INSTALL | 8 --
Makefile.am | 10 +-
configure.ac | 24 ++-----
include/X11/extensions/Xrandr.h | 1
man/Makefile.am | 114 +++++++++++++---------------------
man/XRRConfigCurrentConfiguration.man | 1
man/XRRConfigCurrentRate.man | 1
man/XRRConfigRates.man | 1
man/XRRConfigRotations.man | 1
man/XRRConfigSizes.man | 1
man/XRRConfigTimes.man | 1
man/XRRFreeScreenConfigInfo.man | 1
man/XRRGetScreenInfo.man | 1
man/XRRQueryExtension.man | 1
man/XRRQueryVersion.man | 1
man/XRRRootToScreen.man | 1
man/XRRSelectInput.man | 1
man/XRRSetScreenConfig.man | 1
man/XRRSetScreenConfigAndRate.man | 1
man/Xrandr.man | 3
src/Makefile.am | 6 +
src/Xrandrint.h | 2
src/XrrConfig.c | 3
src/XrrCrtc.c | 13 +--
src/XrrProperty.c | 2
27 files changed, 195 insertions(+), 122 deletions(-)
New commits:
commit b7e31c69d345d3cba359d7648c304cff43ff7437
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:34:26 2010 -0700
libXrandr 1.3.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 09fb306..773f4b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,8 @@ 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.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT([libXrandr], [1.3.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrandr])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f490ed44a1c85c75183d87d034b94f9973b88abd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:30:27 2010 -0700
Fix configure.ac comment for RandR instead of Render
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 29f509a..09fb306 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
dnl
-dnl Version should match the current Render version. XRenderQueryVersion
+dnl Version should match the current Randr version. XRRQueryVersion
dnl returns the version from randr.h, NOT the version we set here. But we
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
commit 95cf69bd452db86b6aefe3837e1f7010ebf21e80
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:27:30 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 5e7f29c..f3bc1b8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
# 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.
-#
+#
libmandir = $(LIB_MAN_DIR)
commit 12f22e0ae0cbd748b416c7e2486f289f89c5c77c
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:03 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Xrandr.man b/man/Xrandr.man
index f5b1034..23a3970 100644
--- a/man/Xrandr.man
+++ b/man/Xrandr.man
@@ -1,7 +1,4 @@
.\"
-.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $
-.\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.2 2004/04/23 18:43:47 eich Exp $
-.\"
.\" Copyright 2002 Hewlett-Packard Company.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
.\" documentation for any purpose is hereby granted without fee, provided that
commit 247ad2a3865ba503e6c77444f855c71e7a210f13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Aug 17 07:57:08 2010 -0400
man: store shadow man pages in git rather than generating them
Simplify the build process and the makefile.
Local fix in CVS for bug 5628 is not required
as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index 7370502..5e7f29c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,42 +23,33 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libman_PRE = Xrandr.man
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xrandr_shadowmen)
-
-BUILT_SOURCES = $(Xrandr_shadowmen)
+libman_PRE = \
+ Xrandr.man \
+ $(Xrandr_shadows:=.man)
+
+Xrandr_shadows = \
+ XRRQueryExtension \
+ XRRQueryVersion \
+ XRRGetScreenInfo \
+ XRRFreeScreenConfigInfo \
+ XRRSetScreenConfig \
+ XRRSetScreenConfigAndRate \
+ XRRConfigRotations \
+ XRRConfigTimes \
+ XRRConfigSizes \
+ XRRConfigRates \
+ XRRConfigCurrentConfiguration \
+ XRRConfigCurrentRate \
+ XRRRootToScreen \
+ XRRSelectInput
+
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
-
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(libman_DATA)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-Xrandr_shadows = \
- XRRQueryExtension \
- XRRQueryVersion \
- XRRGetScreenInfo \
- XRRFreeScreenConfigInfo \
- XRRSetScreenConfig \
- XRRSetScreenConfigAndRate \
- XRRConfigRotations \
- XRRConfigTimes \
- XRRConfigSizes \
- XRRConfigRates \
- XRRConfigCurrentConfiguration \
- XRRConfigCurrentRate \
- XRRRootToScreen \
- XRRSelectInput
-
-Xrandr_shadowmen = $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
-$(Xrandr_shadowmen):
- $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX)" > $@
diff --git a/man/XRRConfigCurrentConfiguration.man b/man/XRRConfigCurrentConfiguration.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigCurrentConfiguration.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigCurrentRate.man b/man/XRRConfigCurrentRate.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigCurrentRate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigRates.man b/man/XRRConfigRates.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigRates.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigRotations.man b/man/XRRConfigRotations.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigRotations.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigSizes.man b/man/XRRConfigSizes.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigSizes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigTimes.man b/man/XRRConfigTimes.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigTimes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRFreeScreenConfigInfo.man b/man/XRRFreeScreenConfigInfo.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRFreeScreenConfigInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRGetScreenInfo.man b/man/XRRGetScreenInfo.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRGetScreenInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRQueryExtension.man b/man/XRRQueryExtension.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRQueryVersion.man b/man/XRRQueryVersion.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRRootToScreen.man b/man/XRRRootToScreen.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRRootToScreen.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRSelectInput.man b/man/XRRSelectInput.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRSelectInput.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRSetScreenConfig.man b/man/XRRSetScreenConfig.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRSetScreenConfig.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRSetScreenConfigAndRate.man b/man/XRRSetScreenConfigAndRate.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRSetScreenConfigAndRate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
commit 8f23ad4703c7fcfdd7d53d52ddebb7590c3cb265
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 14:40:39 2010 -0700
Use make rules instead of shell for loops to generate shadow man pages
Allows parallel make and simpler build logs/error reporting
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index b10470b..7370502 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -28,9 +28,9 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = Xrandr.man
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
+ $(Xrandr_shadowmen)
-BUILT_SOURCES = shadows.DONE
+BUILT_SOURCES = $(Xrandr_shadowmen)
EXTRA_DIST = $(libman_PRE)
@@ -59,8 +59,6 @@ Xrandr_shadows = \
XRRRootToScreen \
XRRSelectInput
-shadows.DONE:
- -rm -f $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+Xrandr_shadowmen = $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
+$(Xrandr_shadowmen):
+ $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX)" > $@
commit 82bc24d6137cc4f03944af88e69c4d67b26d3cc9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 14:34:18 2010 -0700
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 6e350df..29f509a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,10 @@ AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
diff --git a/man/Makefile.am b/man/Makefile.am
index 4166709..b10470b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,20 +36,10 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
commit 2e5c60f477fc68634f1fa31a2fc4a166642ab318
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:01:47 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Xrandrint.h b/src/Xrandrint.h
index 75e38c9..7fb5831 100644
--- a/src/Xrandrint.h
+++ b/src/Xrandrint.h
@@ -25,8 +25,6 @@
#ifndef _XRANDRINT_H_
#define _XRANDRINT_H_
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h>
commit 18517a55d08cdcf9e29bed6761cf4311e1d4109f
Author: Leif Middelschulte <leif.middelschulte@gmail.com>
Date: Tue May 25 14:52:50 2010 -0300
Add parameter safety check
As mentioned in bugzilla ticket 28150.
Calling '_XRRValidateCache' with 'improper' arguments results in a SEGV.
This patch adds a parameter validation to the mentioned function.
Signed-off-by: Leif Middelschulte <leif.middelschulte@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/XrrConfig.c b/src/XrrConfig.c
index 34ff3ef..793d8b6 100644
--- a/src/XrrConfig.c
+++ b/src/XrrConfig.c
@@ -105,7 +105,7 @@ static XRRScreenConfiguration *_XRRValidateCache (Display *dpy,
XRRScreenConfiguration **configs;
XRandRInfo *xrri;
- if (XextHasExtension(info)) {
+ if ((screen >= 0) && (screen < ScreenCount(dpy)) && XextHasExtension(info)) {
xrri = (XRandRInfo *) info->data;
configs = xrri->config;
commit 7a7bac907ac15033c0ddb979202c7f3ddc368726
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:34 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6505afe..6e350df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
dnl Version should match the current Render version. XRenderQueryVersion
commit 883acff30b23c2bdf446988ff7b780cd61e49a5e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:49 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index f9681c9..860193e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrandr.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xrandr.pc.in
.PHONY: ChangeLog INSTALL
commit 74bb9072015b8a785f6b6458ba0605287a1ffcaf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 16 10:37:21 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 29bf172..6505afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,9 +52,6 @@ AC_PROG_LIBTOOL
RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RANDR_VERSION)
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
diff --git a/src/Makefile.am b/src/Makefile.am
index ab7e778..85b05da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,11 @@ libXrandr_la_SOURCES = \
XrrScreen.c
libXrandr_la_LIBADD = @RANDR_LIBS@
-AM_CFLAGS = @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+
+AM_CFLAGS = \
+ $(RANDR_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
commit 449d22180549d990ad3164c98b22968359b55df2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 14 09:41:26 2010 -0500
COPYING: add missing copyright notices
Refer to: Xrandr.h XrrConfig.c
Copyright © 2006 Intel Corporation
Copyright © 2008 Red Hat, Inc.
Copyright © 2006 Keith Packard
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index a2b0579..1552c1f 100644
--- a/COPYING
+++ b/COPYING
@@ -17,3 +17,48 @@ 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 © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett-Packard Company, Inc.
+Copyright © 2006 Intel Corporation
+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.
+
+Copyright © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett Packard Company, Inc.
+Copyright © 2006 Keith Packard
+
+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 51887f07a7722576933ddcc00c5380266d6fa37c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 21:02:20 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index f9928b3..4166709 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# 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 copyright holders 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 copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
#
libmandir = $(LIB_MAN_DIR)
commit cd6fcaeaf0da7ca66ec0ab63ce282def37c21c3b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:04 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 494d5f6..f9681c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrandr.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xrandr.pc.in
.PHONY: ChangeLog INSTALL
commit 61c4a57286b601ff266a15565740aea31e68d1bb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 835f608..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-Xrender is built with the traditional configure script:
-
- $ ./configure --prefix=/usr/X11R6
-
-This should generate valid Makefiles, then:
-
- $ make
- $ make install
diff --git a/Makefile.am b/Makefile.am
index 9882ed2..494d5f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,12 @@ pkgconfig_DATA = xrandr.pc
EXTRA_DIST = xrandr.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
commit 170a3efb274d473165a8d6085c185792b1c43005
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:25 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index 09c5d8d..29bf172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,15 +35,16 @@ AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign 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)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
# Check randr configuration, strip extra digits from package version to
# find the required protocol version
@@ -56,9 +57,6 @@ 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
commit 8567a45cb36857a8b5e2699a3d3ed7850b053281
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:43 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index 9dc4b53..9882ed2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrandr.pc
-EXTRA_DIST = xrandr.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = xrandr.pc.in
.PHONY: ChangeLog
commit 015687dbec93d954fb18981bc6e15937a206a4b7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:19 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index dceb0f3..be892c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,78 @@
-.deps
-.libs
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
Makefile
Makefile.in
+mdate-sh
missing
mkinstalldirs
-stamp-h1
-xrandr.pc
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.3
-*.o
-*.la
-*.lo
-libXrandr-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for libXrandr
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 2e07e9d4f300e8153e4e93cd78bc51e0d91dba6f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 9 17:51:03 2009 -0500
GetCrtcGamma: Fix error handling.
We didn't treat _XReply failure as fatal. Parsing an xError as a gamma
ramp reply doesn't work that often.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
index 3f048e2..697987a 100644
--- a/src/XrrCrtc.c
+++ b/src/XrrCrtc.c
@@ -179,7 +179,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRGetCrtcGammaReply rep;
xRRGetCrtcGammaReq *req;
- XRRCrtcGamma *crtc_gamma;
+ XRRCrtcGamma *crtc_gamma = NULL;
long nbytes;
long nbytesRead;
@@ -192,7 +192,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
req->crtc = crtc;
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
- rep.status = RRSetConfigFailed;
+ goto out;
nbytes = (long) rep.length << 2;
@@ -204,9 +204,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
if (!crtc_gamma)
{
_XEatData (dpy, (unsigned long) nbytes);
- UnlockDisplay (dpy);
- SyncHandle ();
- return NULL;
+ goto out;
}
_XRead16 (dpy, crtc_gamma->red, rep.size * 2);
_XRead16 (dpy, crtc_gamma->green, rep.size * 2);
@@ -214,7 +212,8 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
if (nbytes > nbytesRead)
_XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
-
+
+out:
UnlockDisplay (dpy);
SyncHandle ();
return crtc_gamma;
commit 7b41b589213293793182b61f20006229a89d5ba7
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 9 17:50:42 2009 -0500
GetCrtcGammaSize: Return 0, not garbage, on failure
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
index db9d0b4..3f048e2 100644
--- a/src/XrrCrtc.c
+++ b/src/XrrCrtc.c
@@ -167,7 +167,7 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc)
req->crtc = crtc;
Reply to: