Update to libXrandr 1.3.1. No functional change, except for a small bug fix.
This commit is contained in:
parent
6ac99b1380
commit
6eadfc6665
@ -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.
|
||||
|
@ -1,3 +1,275 @@
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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>
|
||||
|
||||
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>
|
||||
|
||||
commit 5e94f071f45ca504ccafe083e2e289351ba6eab4
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Nov 9 17:49:40 2009 -0500
|
||||
|
||||
GetScreenSizeRange: Document funky return code in the header
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
||||
|
||||
commit f98cbea8b33356a0de1f777c3a862ecbf163cfd3
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Nov 9 17:49:10 2009 -0500
|
||||
|
||||
SetScreenConfigAndRate: Document error handling better
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
||||
|
||||
commit a8af918c0db758a667345b7c3055075124197f6c
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Nov 9 17:48:22 2009 -0500
|
||||
|
||||
GetOutputProperty: Return the error code, not BadRequest
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
Reviewed-by: Jamey Sharp <jamey@minilop.net>
|
||||
|
||||
commit 7f463b2a2221065c03b6122c0cffd2fa5cb13427
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Wed Oct 21 12:47:26 2009 -0700
|
||||
|
||||
This is not a GNU project, so declare it foreign.
|
||||
|
||||
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
|
||||
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
|
||||
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
|
||||
> > was quite annoying to work around since 'autoreconf -fvi' replaces
|
||||
> > it and git wants to commit it. Should these files even be in git?
|
||||
> > Can I nuke them for the betterment of humanity and since they get
|
||||
> > created by autoreconf anyways?
|
||||
>
|
||||
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
|
||||
|
||||
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
|
||||
of the INSTALL file. It is also part of the 24206 solution.
|
||||
|
||||
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
|
||||
commit e3036766916d55d0c8ae72d5752fd1699ae7390d
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Fri Mar 6 15:13:56 2009 +0100
|
||||
@ -126,7 +398,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
|
||||
|
||||
@ -248,7 +520,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
|
||||
|
||||
@ -300,7 +572,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
|
||||
|
||||
@ -351,7 +623,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
|
||||
|
||||
@ -366,7 +638,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
|
||||
|
||||
|
@ -26,12 +26,14 @@ SUBDIRS = src man
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xrandr.pc
|
||||
|
||||
EXTRA_DIST = xrandr.pc.in ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
.PHONY: ChangeLog
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
@ -104,12 +104,14 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -144,6 +146,8 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -161,6 +165,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -183,16 +188,11 @@ SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -209,24 +209,30 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -234,8 +240,7 @@ target_alias = @target_alias@
|
||||
SUBDIRS = src man
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xrandr.pc
|
||||
EXTRA_DIST = xrandr.pc.in ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -246,15 +251,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
||||
cd $(srcdir) && $(AUTOMAKE) --gnu \
|
||||
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
|
||||
cd $(srcdir) && $(AUTOMAKE) --foreign \
|
||||
&& exit 0; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu Makefile
|
||||
$(AUTOMAKE) --foreign Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@ -700,12 +705,15 @@ uninstall-info: uninstall-info-recursive
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
.PHONY: ChangeLog
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
dist-hook: ChangeLog INSTALL
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
924
lib/libXrandr/aclocal.m4
vendored
924
lib/libXrandr/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
10921
lib/libXrandr/configure
vendored
10921
lib/libXrandr/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
dnl
|
||||
dnl $Id: configure.ac,v 1.2 2009/05/02 15:20:43 matthieu Exp $
|
||||
dnl $Id: configure.ac,v 1.3 2010/10/31 15:52:40 matthieu Exp $
|
||||
dnl
|
||||
dnl Copyright © 2003 Keith Packard, Noah Levitt
|
||||
dnl
|
||||
@ -23,29 +23,31 @@ 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
|
||||
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
|
||||
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([dist-bzip2])
|
||||
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 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.8 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
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
|
||||
@ -53,14 +55,8 @@ XORG_CWARNFLAGS
|
||||
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
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
src/Makefile
|
||||
|
@ -197,6 +197,7 @@ Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
|
||||
|
||||
/* Version 1.2 additions */
|
||||
|
||||
/* despite returning a Status, this returns 1 for success */
|
||||
Status
|
||||
XRRGetScreenSizeRange (Display *dpy, Window window,
|
||||
int *minWidth, int *minHeight,
|
||||
|
@ -1,80 +1,56 @@
|
||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:52 matthieu Exp $
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# 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"),
|
||||
# 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)
|
||||
|
||||
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
|
||||
libman_PRE = \
|
||||
Xrandr.man \
|
||||
$(Xrandr_shadows:=.man)
|
||||
|
||||
libman_PRE = Xrandr.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@) \
|
||||
$(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
|
||||
|
||||
BUILT_SOURCES = shadows.DONE
|
||||
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
|
||||
|
||||
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'
|
||||
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):
|
||||
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
|
||||
|
||||
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)
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
@ -16,30 +16,27 @@
|
||||
|
||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:52 matthieu Exp $
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# 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"),
|
||||
# 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.
|
||||
#
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@ -90,6 +87,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -124,6 +122,8 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -141,6 +141,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -157,22 +158,17 @@ RANDR_CFLAGS = @RANDR_CFLAGS@
|
||||
RANDR_LIBS = @RANDR_LIBS@
|
||||
RANDR_VERSION = @RANDR_VERSION@
|
||||
RANLIB = @RANLIB@
|
||||
SED = sed
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -189,66 +185,60 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
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_shadows:=.@LIB_MAN_SUFFIX@)
|
||||
libman_PRE = \
|
||||
Xrandr.man \
|
||||
$(Xrandr_shadows:=.man)
|
||||
|
||||
BUILT_SOURCES = shadows.DONE
|
||||
EXTRA_DIST = $(libman_PRE)
|
||||
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
|
||||
|
||||
# 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
|
||||
|
||||
# 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
|
||||
XRRQueryExtension \
|
||||
XRRQueryVersion \
|
||||
XRRGetScreenInfo \
|
||||
XRRFreeScreenConfigInfo \
|
||||
XRRSetScreenConfig \
|
||||
XRRSetScreenConfigAndRate \
|
||||
XRRConfigRotations \
|
||||
XRRConfigTimes \
|
||||
XRRConfigSizes \
|
||||
XRRConfigRates \
|
||||
XRRConfigCurrentConfiguration \
|
||||
XRRConfigCurrentRate \
|
||||
XRRRootToScreen \
|
||||
XRRSelectInput
|
||||
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
|
||||
EXTRA_DIST = $(libman_PRE)
|
||||
CLEANFILES = $(libman_DATA)
|
||||
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .$(LIB_MAN_SUFFIX) .man
|
||||
@ -261,9 +251,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu man/Makefile
|
||||
$(AUTOMAKE) --foreign man/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@ -343,15 +333,13 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
check-am: all-am
|
||||
check: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) check-am
|
||||
check: check-am
|
||||
all-am: Makefile $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(libmandir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) install-am
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
install-data: install-data-am
|
||||
uninstall: uninstall-am
|
||||
@ -376,7 +364,6 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool mostlyclean-am
|
||||
@ -434,14 +421,9 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
|
||||
uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
|
||||
|
||||
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
.man.$(LIB_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
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)
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
1
lib/libXrandr/man/XRRConfigCurrentConfiguration.man
Normal file
1
lib/libXrandr/man/XRRConfigCurrentConfiguration.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRConfigCurrentRate.man
Normal file
1
lib/libXrandr/man/XRRConfigCurrentRate.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRConfigRates.man
Normal file
1
lib/libXrandr/man/XRRConfigRates.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRConfigRotations.man
Normal file
1
lib/libXrandr/man/XRRConfigRotations.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRConfigSizes.man
Normal file
1
lib/libXrandr/man/XRRConfigSizes.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRConfigTimes.man
Normal file
1
lib/libXrandr/man/XRRConfigTimes.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRFreeScreenConfigInfo.man
Normal file
1
lib/libXrandr/man/XRRFreeScreenConfigInfo.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRGetScreenInfo.man
Normal file
1
lib/libXrandr/man/XRRGetScreenInfo.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRQueryExtension.man
Normal file
1
lib/libXrandr/man/XRRQueryExtension.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRQueryVersion.man
Normal file
1
lib/libXrandr/man/XRRQueryVersion.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRRootToScreen.man
Normal file
1
lib/libXrandr/man/XRRRootToScreen.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRSelectInput.man
Normal file
1
lib/libXrandr/man/XRRSelectInput.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRSetScreenConfig.man
Normal file
1
lib/libXrandr/man/XRRSetScreenConfig.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
1
lib/libXrandr/man/XRRSetScreenConfigAndRate.man
Normal file
1
lib/libXrandr/man/XRRSetScreenConfigAndRate.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xrandr.__libmansuffix__
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -85,6 +85,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -119,6 +120,8 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -136,6 +139,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -158,16 +162,11 @@ SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -184,24 +183,30 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -218,7 +223,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
|
||||
libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined
|
||||
libXrandrincludedir = $(includedir)/X11/extensions
|
||||
@ -236,9 +245,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu src/Makefile
|
||||
$(AUTOMAKE) --foreign src/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
|
||||
@ -409,6 +409,7 @@ Status XRRSetScreenConfigAndRate (Display *dpy,
|
||||
|
||||
(void) _XReply (dpy, (xReply *) &rep, 0, xTrue);
|
||||
|
||||
/* actually .errorCode in struct xError */
|
||||
if (rep.status == RRSetConfigSuccess) {
|
||||
/* if we succeed, set our view of reality to what we set it to */
|
||||
config->config_timestamp = rep.newConfigTimestamp;
|
||||
|
@ -167,7 +167,7 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc)
|
||||
req->crtc = crtc;
|
||||
|
||||
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
|
||||
rep.status = RRSetConfigFailed;
|
||||
rep.size = 0;
|
||||
UnlockDisplay (dpy);
|
||||
SyncHandle ();
|
||||
return rep.size;
|
||||
@ -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;
|
||||
|
@ -272,7 +272,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
|
||||
{
|
||||
UnlockDisplay (dpy);
|
||||
SyncHandle ();
|
||||
return 1;
|
||||
return ((xError *)&rep)->errorCode;
|
||||
}
|
||||
|
||||
*prop = (unsigned char *) NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user