From 4a3ec5d53fd39bf2fa0272f56b8ca261e55b49f9 Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 1 Jun 2013 14:22:09 +0000 Subject: [PATCH] Update to libXrandr 1.4.1 --- lib/libXrandr/ChangeLog | 137 +++++++++++++++++ lib/libXrandr/Makefile.am | 2 - lib/libXrandr/Makefile.in | 13 +- lib/libXrandr/aclocal.m4 | 140 +++++++++--------- lib/libXrandr/configure | 129 ++++++++-------- lib/libXrandr/configure.ac | 11 +- lib/libXrandr/include/X11/extensions/Xrandr.h | 4 +- lib/libXrandr/man/Makefile.am | 1 - lib/libXrandr/man/Makefile.in | 10 +- lib/libXrandr/src/Makefile.am | 2 +- lib/libXrandr/src/Makefile.in | 11 +- lib/libXrandr/src/XrrCrtc.c | 2 +- lib/libXrandr/src/XrrMode.c | 2 +- 13 files changed, 301 insertions(+), 163 deletions(-) diff --git a/lib/libXrandr/ChangeLog b/lib/libXrandr/ChangeLog index 4a67a483f..d07b8f484 100644 --- a/lib/libXrandr/ChangeLog +++ b/lib/libXrandr/ChangeLog @@ -1,3 +1,140 @@ +commit f97d44f8fb9f90ce3227cca8affd3b947e9b08ca +Author: Alan Coopersmith +Date: Fri May 31 15:52:23 2013 -0700 + + libXrandr 1.4.1 + + Signed-off-by: Alan Coopersmith + +commit c90f74497dbcb96854346435349c6e2207b530c5 +Author: Alan Coopersmith +Date: Sat May 4 21:47:50 2013 -0700 + + Make XRRGet*Property() always initialize returned values + + Avoids memory corruption and other errors when callers access them + without checking to see if the calls returned an error value. + + Callers are still required to check for errors, this just reduces the + damage when they don't. + + (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) + + Signed-off-by: Alan Coopersmith + +commit 4254bf0ee4c7a8f9d03841cf0d8e16cbb201dfbd +Author: Alan Coopersmith +Date: Sat May 4 21:37:49 2013 -0700 + + integer overflow in XRRGetProviderProperty() [CVE-2013-1986 4/4] + + If the reported number of properties is too large, the calculations + to allocate memory for them may overflow, leaving us returning less + memory to the caller than implied by the value written to *nitems. + + (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) + + Signed-off-by: Alan Coopersmith + +commit 289a1927949e6f278c18d115772e454837702e35 +Author: Alan Coopersmith +Date: Sat May 4 21:37:49 2013 -0700 + + integer overflow in XRRGetOutputProperty() [CVE-2013-1986 3/4] + + If the reported number of properties is too large, the calculations + to allocate memory for them may overflow, leaving us returning less + memory to the caller than implied by the value written to *nitems. + + (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) + + Signed-off-by: Alan Coopersmith + +commit 1da5b838c2a8565d4d95a4e948f951ce6b466345 +Author: Alan Coopersmith +Date: Fri Apr 12 21:44:59 2013 -0700 + + integer overflow in XRRQueryProviderProperty() [CVE-2013-1986 2/4] + + Same problem as XRRQueryOutputProperty() that it was cloned from + + Signed-off-by: Alan Coopersmith + +commit 0e79d96c36aef5889ae2e2a3fc2e96e93f30dc21 +Author: Alan Coopersmith +Date: Fri Apr 12 21:44:59 2013 -0700 + + integer overflow in XRRQueryOutputProperty() [CVE-2013-1986 1/4] + + rep.length is a CARD32, while rbytes was a signed int, so + rbytes = sizeof (XRRPropertyInfo) + rep.length * sizeof (long); + could result in integer overflow, leading to an undersized malloc + and reading data off the connection and writing it past the end of + the allocated buffer. + + Reported-by: Ilja Van Sprundel + Signed-off-by: Alan Coopersmith + +commit 1c7ad6773ce6be00dcd6e51e9be08f203abe5071 +Author: Alan Coopersmith +Date: Fri May 3 23:29:22 2013 -0700 + + Use _XEatDataWords to avoid overflow of rep.length bit shifting + + rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds + + Signed-off-by: Alan Coopersmith + +commit 99a63d10cbbab7d69a52d25d78795a3278506ea9 +Author: Alan Coopersmith +Date: Fri Jan 18 23:14:01 2013 -0800 + + Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS + + Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html + + - Support for the long-deprecated INCLUDES variable will be removed + altogether in Automake 1.14. The AM_CPPFLAGS variable should be + used instead. + + This variable was deprecated in Automake releases prior to 1.10, which is + the current minimum level required to build X. + + Signed-off-by: Alan Coopersmith + +commit 150cf8788a94fc5fb519764e1d46cb520c1d4043 +Author: Colin Walters +Date: Wed Jan 4 17:37:06 2012 -0500 + + autogen.sh: Implement GNOME Build API + + http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Adam Jackson + +commit c3486bccee2aaa2668f7d24d3e1bc01f3832f301 +Author: Adam Jackson +Date: Tue Jan 15 14:28:48 2013 -0500 + + configure: Remove AM_MAINTAINER_MODE + + Signed-off-by: Adam Jackson + +commit 6dfe7d4fa04a5054ee3daeb654ac5a763f37fed1 +Author: Alan Coopersmith +Date: Fri Aug 31 21:39:10 2012 -0700 + + Constify a couple string arguments that are just copied, not modified + + Fixes compiler warnings when building app/xrandr: + + xrandr.c: In function ‘crtc_set_transform’: + xrandr.c:1459:9: warning: passing argument 4 of ‘XRRSetCrtcTransform’ discards qualifiers from pointer target type + X11/extensions/Xrandr.h:419:1: note: expected ‘char *’ but argument is of type ‘const char *’ + + Signed-off-by: Alan Coopersmith + Reviewed-by: Aaron Plattner + commit 39976a7d1cc9e737e662695ae5326af805c50a27 Author: Dave Airlie Date: Thu Jul 26 14:15:18 2012 +1000 diff --git a/lib/libXrandr/Makefile.am b/lib/libXrandr/Makefile.am index f452d9ac7..7d6700d45 100644 --- a/lib/libXrandr/Makefile.am +++ b/lib/libXrandr/Makefile.am @@ -1,5 +1,3 @@ -# -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:51 matthieu Exp $ # # Copyright © 2003 Keith Packard, Noah Levitt # diff --git a/lib/libXrandr/Makefile.in b/lib/libXrandr/Makefile.in index 02cab7dd3..a8b6d369f 100644 --- a/lib/libXrandr/Makefile.in +++ b/lib/libXrandr/Makefile.in @@ -14,8 +14,6 @@ @SET_MAKE@ -# -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:51 matthieu Exp $ # # Copyright © 2003 Keith Packard, Noah Levitt # @@ -248,7 +246,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -271,6 +268,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANDR_CFLAGS = @RANDR_CFLAGS@ RANDR_LIBS = @RANDR_LIBS@ RANDR_VERSION = @RANDR_VERSION@ @@ -346,7 +345,7 @@ all: config.h .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -373,9 +372,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): @@ -386,7 +385,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ diff --git a/lib/libXrandr/aclocal.m4 b/lib/libXrandr/aclocal.m4 index d0b280e85..1e23c4ddf 100644 --- a/lib/libXrandr/aclocal.m4 +++ b/lib/libXrandr/aclocal.m4 @@ -8607,6 +8607,7 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -8633,8 +8634,12 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -8647,7 +8652,6 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -8656,34 +8660,32 @@ fi[]dnl # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8725,16 +8727,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8742,28 +8745,67 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + # Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -9344,44 +9386,6 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001-2012 Free Software Foundation, Inc. diff --git a/lib/libXrandr/configure b/lib/libXrandr/configure index 508809052..694805004 100644 --- a/lib/libXrandr/configure +++ b/lib/libXrandr/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libXrandr 1.4.0. +# Generated by GNU Autoconf 2.69 for libXrandr 1.4.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libXrandr' PACKAGE_TARNAME='libXrandr' -PACKAGE_VERSION='1.4.0' -PACKAGE_STRING='libXrandr 1.4.0' +PACKAGE_VERSION='1.4.1' +PACKAGE_STRING='libXrandr 1.4.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -662,6 +662,8 @@ FILE_MAN_SUFFIX LIB_MAN_SUFFIX APP_MAN_SUFFIX INSTALL_CMD +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG CHANGELOG_CMD STRICT_CFLAGS @@ -714,9 +716,6 @@ build_vendor build_cpu build LIBTOOL -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -781,7 +780,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_shared enable_static with_pic @@ -805,6 +803,8 @@ LIBS CPPFLAGS CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR RANDR_CFLAGS RANDR_LIBS' @@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXrandr 1.4.0 to adapt to many kinds of systems. +\`configure' configures libXrandr 1.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1417,7 +1417,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXrandr 1.4.0:";; + short | recursive ) echo "Configuration of libXrandr 1.4.1:";; esac cat <<\_ACEOF @@ -1425,9 +1425,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1467,6 +1464,10 @@ Some influential environment variables: you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path RANDR_CFLAGS C compiler flags for RANDR, overriding pkg-config RANDR_LIBS linker flags for RANDR, overriding pkg-config @@ -1537,7 +1538,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXrandr configure 1.4.0 +libXrandr configure 1.4.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1861,7 +1862,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXrandr $as_me 1.4.0, which was +It was created by libXrandr $as_me 1.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2690,7 +2691,7 @@ fi # Define the identity of the package. PACKAGE='libXrandr' - VERSION='1.4.0' + VERSION='1.4.1' cat >>confdefs.h <<_ACEOF @@ -2737,29 +2738,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - # Initialize libtool case `pwd` in *\ * | *\ *) @@ -11537,6 +11515,11 @@ fi + + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -11649,7 +11632,6 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } PKG_CONFIG="" fi - fi @@ -17541,46 +17523,46 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RANDR" >&5 $as_echo_n "checking for RANDR... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$RANDR_CFLAGS"; then - pkg_cv_RANDR_CFLAGS="$RANDR_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$RANDR_CFLAGS"; then + pkg_cv_RANDR_CFLAGS="$RANDR_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 randrproto >= \$RANDR_VERSION xext xextproto xrender renderproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_RANDR_CFLAGS=`$PKG_CONFIG --cflags "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$RANDR_LIBS"; then - pkg_cv_RANDR_LIBS="$RANDR_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$RANDR_LIBS"; then + pkg_cv_RANDR_LIBS="$RANDR_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 randrproto >= \$RANDR_VERSION xext xextproto xrender renderproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_RANDR_LIBS=`$PKG_CONFIG --libs "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17588,9 +17570,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto"` + RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>&1` else - RANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto"` + RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$RANDR_PKG_ERRORS" >&5 @@ -17604,9 +17586,10 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables RANDR_CFLAGS and RANDR_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it @@ -17617,14 +17600,14 @@ Alternatively, you may set the environment variables RANDR_CFLAGS and RANDR_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see . +To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else RANDR_CFLAGS=$pkg_cv_RANDR_CFLAGS RANDR_LIBS=$pkg_cv_RANDR_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi # Check for _XEatDataWords function that may be patched into older Xlib release @@ -17643,6 +17626,22 @@ done LIBS="$SAVE_LIBS" +# Check for _XEatDataWords function that may be patched into older Xlib release +SAVE_LIBS="$LIBS" +LIBS="$RANDR_LIBS" +for ac_func in _XEatDataWords +do : + ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords" +if test "x$ac_cv_func__XEatDataWords" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__XEATDATAWORDS 1 +_ACEOF + +fi +done + +LIBS="$SAVE_LIBS" + ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xrandr.pc" cat >confcache <<\_ACEOF @@ -17770,10 +17769,6 @@ else am__EXEEXT_FALSE= fi -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18179,7 +18174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXrandr $as_me 1.4.0, which was +This file was extended by libXrandr $as_me 1.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18245,7 +18240,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libXrandr config.status 1.4.0 +libXrandr config.status 1.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/lib/libXrandr/configure.ac b/lib/libXrandr/configure.ac index e1c0c856d..766f7593b 100644 --- a/lib/libXrandr/configure.ac +++ b/lib/libXrandr/configure.ac @@ -1,5 +1,5 @@ dnl -dnl $Id: configure.ac,v 1.6 2013/05/23 22:42:10 matthieu Exp $ +dnl $Id: configure.ac,v 1.7 2013/06/01 14:22:09 matthieu Exp $ # # Copyright © 2003 Keith Packard, Noah Levitt # @@ -31,14 +31,13 @@ AC_PREREQ([2.60]) # digit in the version number to track changes which don't affect the # protocol, so Xrandr version l.n.m corresponds to protocol version l.n # -AC_INIT([libXrandr], [1.4.0], +AC_INIT([libXrandr], [1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrandr]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL @@ -64,6 +63,12 @@ LIBS="$RANDR_LIBS" AC_CHECK_FUNCS([_XEatDataWords]) LIBS="$SAVE_LIBS" +# Check for _XEatDataWords function that may be patched into older Xlib release +SAVE_LIBS="$LIBS" +LIBS="$RANDR_LIBS" +AC_CHECK_FUNCS([_XEatDataWords]) +LIBS="$SAVE_LIBS" + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile diff --git a/lib/libXrandr/include/X11/extensions/Xrandr.h b/lib/libXrandr/include/X11/extensions/Xrandr.h index b1baf8ad8..f3948640c 100644 --- a/lib/libXrandr/include/X11/extensions/Xrandr.h +++ b/lib/libXrandr/include/X11/extensions/Xrandr.h @@ -341,7 +341,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output, unsigned char **prop); XRRModeInfo * -XRRAllocModeInfo (char *name, int nameLength); +XRRAllocModeInfo (_Xconst char *name, int nameLength); RRMode XRRCreateMode (Display *dpy, Window window, XRRModeInfo *modeInfo); @@ -419,7 +419,7 @@ void XRRSetCrtcTransform (Display *dpy, RRCrtc crtc, XTransform *transform, - char *filter, + _Xconst char *filter, XFixed *params, int nparams); diff --git a/lib/libXrandr/man/Makefile.am b/lib/libXrandr/man/Makefile.am index f57917c54..f3bc1b8f8 100644 --- a/lib/libXrandr/man/Makefile.am +++ b/lib/libXrandr/man/Makefile.am @@ -1,4 +1,3 @@ -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:52 matthieu Exp $ # # Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. # diff --git a/lib/libXrandr/man/Makefile.in b/lib/libXrandr/man/Makefile.in index c79598af7..dcf85a244 100644 --- a/lib/libXrandr/man/Makefile.in +++ b/lib/libXrandr/man/Makefile.in @@ -14,7 +14,6 @@ @SET_MAKE@ -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:52 matthieu Exp $ # # Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. # @@ -186,7 +185,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -209,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANDR_CFLAGS = @RANDR_CFLAGS@ RANDR_LIBS = @RANDR_LIBS@ RANDR_VERSION = @RANDR_VERSION@ @@ -303,7 +303,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .$(LIB_MAN_SUFFIX) .man -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -328,9 +328,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): diff --git a/lib/libXrandr/src/Makefile.am b/lib/libXrandr/src/Makefile.am index 7a47b9c4b..21138469b 100644 --- a/lib/libXrandr/src/Makefile.am +++ b/lib/libXrandr/src/Makefile.am @@ -19,7 +19,7 @@ AM_CFLAGS = \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) -INCLUDES = -I$(top_srcdir)/include/X11/extensions +AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined diff --git a/lib/libXrandr/src/Makefile.in b/lib/libXrandr/src/Makefile.in index a03b414c4..5072bf20f 100644 --- a/lib/libXrandr/src/Makefile.in +++ b/lib/libXrandr/src/Makefile.in @@ -202,7 +202,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -225,6 +224,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANDR_CFLAGS = @RANDR_CFLAGS@ RANDR_LIBS = @RANDR_LIBS@ RANDR_VERSION = @RANDR_VERSION@ @@ -309,7 +310,7 @@ AM_CFLAGS = \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) -INCLUDES = -I$(top_srcdir)/include/X11/extensions +AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined libXrandrincludedir = $(includedir)/X11/extensions libXrandrinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrandr.h @@ -317,7 +318,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -342,9 +343,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) diff --git a/lib/libXrandr/src/XrrCrtc.c b/lib/libXrandr/src/XrrCrtc.c index 5eac42c86..a704a52e5 100644 --- a/lib/libXrandr/src/XrrCrtc.c +++ b/lib/libXrandr/src/XrrCrtc.c @@ -306,7 +306,7 @@ void XRRSetCrtcTransform (Display *dpy, RRCrtc crtc, XTransform *transform, - char *filter, + _Xconst char *filter, XFixed *params, int nparams) { diff --git a/lib/libXrandr/src/XrrMode.c b/lib/libXrandr/src/XrrMode.c index 0b74a73e4..e605e8aef 100644 --- a/lib/libXrandr/src/XrrMode.c +++ b/lib/libXrandr/src/XrrMode.c @@ -33,7 +33,7 @@ #include "Xrandrint.h" XRRModeInfo * -XRRAllocModeInfo (char *name, int nameLength) +XRRAllocModeInfo (_Xconst char *name, int nameLength) { XRRModeInfo *mode_info;