Hello community, here is the log from the commit of package xrandr for openSUSE:Factory checked in at 2013-07-22 15:26:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrandr (Old) and /work/SRC/openSUSE:Factory/.xrandr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrandr" Changes: -------- --- /work/SRC/openSUSE:Factory/xrandr/xrandr.changes 2013-02-14 21:17:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xrandr.new/xrandr.changes 2013-07-22 15:26:36.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Jul 21 19:21:33 UTC 2013 - [email protected] + +- Update to version 1.4.1: + + Combine usage message strings. + + Declare capability_name() as returning const char *. + + fdo#56923 - Make command line options consistent (single vs + double dash). + + Protect config.h like usual. + + xrandr: calloc XRRModeInfo's passed to libXrandr. + + Print spaces between XA_ATOM property values. + +------------------------------------------------------------------- Old: ---- xrandr-1.4.0.tar.bz2 New: ---- xrandr-1.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrandr.spec ++++++ --- /var/tmp/diff_new_pack.Kmywla/_old 2013-07-22 15:26:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Kmywla/_new 2013-07-22 15:26:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: xrandr -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: Primitive command line interface to RandR extension License: MIT ++++++ xrandr-1.4.0.tar.bz2 -> xrandr-1.4.1.tar.bz2 ++++++ ++++ 9932 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.0/ChangeLog new/xrandr-1.4.1/ChangeLog --- old/xrandr-1.4.0/ChangeLog 2013-02-12 23:35:32.000000000 +0100 +++ new/xrandr-1.4.1/ChangeLog 2013-07-17 08:31:09.000000000 +0200 @@ -1,3 +1,100 @@ +commit c5334bb4137d6ea7b8c8b10d51131b9450d1106b +Author: Alan Coopersmith <[email protected]> +Date: Tue Jul 16 23:30:27 2013 -0700 + + xrandr 1.4.1 + +commit 0e0b47341a45c138082d9f8047dcbdb91b90155d +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 13 00:11:41 2013 -0700 + + Combine usage message strings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 38772ec3b5a7216a88676f95b5edc764dd0a23d6 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 13 00:07:26 2013 -0700 + + Declare capability_name() as returning const char * + + Only used as an argument to printf. Clears gcc warnings: + xrandr.c: In function ‘capability_name’: + xrandr.c:237:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default] + xrandr.c:239:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default] + xrandr.c:241:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default] + xrandr.c:243:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default] + xrandr.c:245:5: warning: return discards ‘const’ qualifier from pointer target type [enabled by default] + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f53d8511d26a26e9bd6b1bc665f6283f1efd98d9 +Author: Thomas <[email protected]> +Date: Fri Nov 9 14:33:08 2012 +0000 + + Bug 56923 - Make command line options consistent (single vs double dash) + + Most of xrandr's command line options follow the system of single + dashes for single character options (e.g. "-v") and double dashes for + long options ("--version"). The only exceptions are "-display" and + "-help", most likely for historical reasons. To make the behavior + consistent across all options, the following patch adds "--display" + and "--help" as alternatives to the current inconsistency. The man + page got updated as well, recommending double-dash variants for both + options. The old behavior is still supported, so the patch should not + break any existing usage/script. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit bd1502f50f0c230798bdce99dec6efc76791c024 +Author: Thomas Klausner <[email protected]> +Date: Sun Jun 2 21:30:39 2013 +0200 + + Protect config.h like usual. + + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ace5e2b21b2a204f94c6452fa0d8f36699aec249 +Author: Andy Ritger <[email protected]> +Date: Thu May 2 01:20:27 2013 -0700 + + xrandr: calloc XRRModeInfo's passed to libXrandr. + + The "--newmode" commandline option initializes an XRRModeInfo and passes + it into XRRCreateMode(). calloc(3) it to avoid uninitialized fields. + For consistency, calloc(3) all the places where umode_t's (the wrapper + structure for XRRModeInfo) are allocated. + + Signed-off-by: Andy Ritger <[email protected]> + Tested-by: Nikhil Mahale <[email protected]> + Signed-off-by: Aaron Plattner <[email protected]> + +commit eb17ad8adc9400f6ed252872f13ccf5551f9e2e9 +Author: Aaron Plattner <[email protected]> +Date: Thu Feb 28 12:01:53 2013 -0800 + + Print spaces between XA_ATOM property values + + Commit b26fd532b3dab222956ea27eef4e41345978b5b2 redid how xrandr prints + properties. It neglected to put spaces between the values of XA_ATOM + properties, so they all run together. For example, + + audio: auto + supported: force-dvioffautoon + + Fix this by putting a space after each atom name. In addition, some drivers + create property values with spaces in them, so put commas between entries to + disambiguate. For example, + + Broadcast RGB: Automatic + supported: Automatic, Full, Limited 16:235 + + Do the same for properties with multiple valid ranges. + + Signed-off-by: Aaron Plattner <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + commit 222f245fb3a00308cb3ff491f5c84ac9c69c3253 Author: Aaron Plattner <[email protected]> Date: Tue Feb 12 13:24:38 2013 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.0/compile new/xrandr-1.4.1/compile --- old/xrandr-1.4.0/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xrandr-1.4.1/compile 2013-07-17 08:30:58.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.0/configure.ac new/xrandr-1.4.1/configure.ac --- old/xrandr-1.4.0/configure.ac 2013-02-12 22:24:13.000000000 +0100 +++ new/xrandr-1.4.1/configure.ac 2013-07-17 08:30:53.000000000 +0200 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xrandr], [1.4.0], +AC_INIT([xrandr], [1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrandr]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.0/man/xrandr.man new/xrandr-1.4.1/man/xrandr.man --- old/xrandr-1.4.0/man/xrandr.man 2013-02-12 21:31:44.000000000 +0100 +++ new/xrandr-1.4.1/man/xrandr.man 2013-07-17 08:30:53.000000000 +0200 @@ -24,7 +24,7 @@ xrandr \- primitive command line interface to RandR extension .SH SYNOPSIS .B "xrandr" -[\-help] [\-display \fIdisplay\fP] +[\-\-help] [\-\-display \fIdisplay\fP] [\-q] [\-v] [\-\-verbose] [\-\-dryrun] @@ -84,7 +84,7 @@ specified in earlier parameters in the command line. Multiple outputs may be modified at the same time by passing multiple \-\-output options followed immediately by their corresponding modifying options. -.IP \-help +.IP \-\-help Print out a summary of the usage and exit. .IP "\-v, \-\-version" Print out the RandR version reported by the X server and exit. @@ -104,7 +104,7 @@ Apply the modifications without grabbing the screen. It avoids to block other applications during the update but it might also cause some applications that detect screen resize to receive old values. -.IP "\-d, \-display \fIname\fP" +.IP "\-d, \-\-display \fIname\fP" This option selects the X display to use. Note this refers to the X screen abstraction, not the monitor (or output). .IP "\-\-screen \fIsnum\fP" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.0/missing new/xrandr-1.4.1/missing --- old/xrandr-1.4.0/missing 2013-02-12 23:35:19.000000000 +0100 +++ new/xrandr-1.4.1/missing 2013-07-17 08:30:58.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.0/xrandr.c new/xrandr-1.4.1/xrandr.c --- old/xrandr-1.4.0/xrandr.c 2013-02-12 21:31:44.000000000 +0100 +++ new/xrandr-1.4.1/xrandr.c 2013-07-17 08:30:53.000000000 +0200 @@ -41,7 +41,9 @@ #include <stdarg.h> #include <math.h> +#ifdef HAVE_CONFIG_H #include "config.h" +#endif static char *program_name; static Display *dpy; @@ -95,62 +97,62 @@ static void usage(void) { - printf("usage: %s [options]\n", program_name); - printf(" where options are:\n"); - printf(" -display <display> or -d <display>\n"); - printf(" --help\n"); - printf(" -o <normal,inverted,left,right,0,1,2,3>\n"); - printf(" or --orientation <normal,inverted,left,right,0,1,2,3>\n"); - printf(" -q or --query\n"); - printf(" -s <size>/<width>x<height> or --size <size>/<width>x<height>\n"); - printf(" -r <rate> or --rate <rate> or --refresh <rate>\n"); - printf(" -v or --version\n"); - printf(" -x (reflect in x)\n"); - printf(" -y (reflect in y)\n"); - printf(" --screen <screen>\n"); - printf(" --verbose\n"); - printf(" --current\n"); - printf(" --dryrun\n"); - printf(" --nograb\n"); - printf(" --prop or --properties\n"); - printf(" --fb <width>x<height>\n"); - printf(" --fbmm <width>x<height>\n"); - printf(" --dpi <dpi>/<output>\n"); - printf(" --output <output>\n"); - printf(" --auto\n"); - printf(" --mode <mode>\n"); - printf(" --preferred\n"); - printf(" --pos <x>x<y>\n"); - printf(" --rate <rate> or --refresh <rate>\n"); - printf(" --reflect normal,x,y,xy\n"); - printf(" --rotate normal,inverted,left,right\n"); - printf(" --left-of <output>\n"); - printf(" --right-of <output>\n"); - printf(" --above <output>\n"); - printf(" --below <output>\n"); - printf(" --same-as <output>\n"); - printf(" --set <property> <value>\n"); - printf(" --scale <x>x<y>\n"); - printf(" --scale-from <w>x<h>\n"); - printf(" --transform <a>,<b>,<c>,<d>,<e>,<f>,<g>,<h>,<i>\n"); - printf(" --off\n"); - printf(" --crtc <crtc>\n"); - printf(" --panning <w>x<h>[+<x>+<y>[/<track:w>x<h>+<x>+<y>[/<border:l>/<t>/<r>/<b>]]]\n"); - printf(" --gamma <r>:<g>:<b>\n"); - printf(" --primary\n"); - printf(" --noprimary\n"); - printf(" --newmode <name> <clock MHz>\n"); - printf(" <hdisp> <hsync-start> <hsync-end> <htotal>\n"); - printf(" <vdisp> <vsync-start> <vsync-end> <vtotal>\n"); - printf(" [flags...]\n"); - printf(" Valid flags: +HSync -HSync +VSync -VSync\n"); - printf(" +CSync -CSync CSync Interlace DoubleScan\n"); - printf(" --rmmode <name>\n"); - printf(" --addmode <output> <name>\n"); - printf(" --delmode <output> <name>\n"); - printf(" --listproviders\n"); - printf(" --setprovideroutputsource <prov-xid> <source-xid>\n"); - printf(" --setprovideroffloadsink <prov-xid> <sink-xid>\n"); + printf("usage: %s [options]\n%s", program_name, + " where options are:\n" + " --display <display> or -d <display>\n" + " --help\n" + " -o <normal,inverted,left,right,0,1,2,3>\n" + " or --orientation <normal,inverted,left,right,0,1,2,3>\n" + " -q or --query\n" + " -s <size>/<width>x<height> or --size <size>/<width>x<height>\n" + " -r <rate> or --rate <rate> or --refresh <rate>\n" + " -v or --version\n" + " -x (reflect in x)\n" + " -y (reflect in y)\n" + " --screen <screen>\n" + " --verbose\n" + " --current\n" + " --dryrun\n" + " --nograb\n" + " --prop or --properties\n" + " --fb <width>x<height>\n" + " --fbmm <width>x<height>\n" + " --dpi <dpi>/<output>\n" + " --output <output>\n" + " --auto\n" + " --mode <mode>\n" + " --preferred\n" + " --pos <x>x<y>\n" + " --rate <rate> or --refresh <rate>\n" + " --reflect normal,x,y,xy\n" + " --rotate normal,inverted,left,right\n" + " --left-of <output>\n" + " --right-of <output>\n" + " --above <output>\n" + " --below <output>\n" + " --same-as <output>\n" + " --set <property> <value>\n" + " --scale <x>x<y>\n" + " --scale-from <w>x<h>\n" + " --transform <a>,<b>,<c>,<d>,<e>,<f>,<g>,<h>,<i>\n" + " --off\n" + " --crtc <crtc>\n" + " --panning <w>x<h>[+<x>+<y>[/<track:w>x<h>+<x>+<y>[/<border:l>/<t>/<r>/<b>]]]\n" + " --gamma <r>:<g>:<b>\n" + " --primary\n" + " --noprimary\n" + " --newmode <name> <clock MHz>\n" + " <hdisp> <hsync-start> <hsync-end> <htotal>\n" + " <vdisp> <vsync-start> <vsync-end> <vtotal>\n" + " [flags...]\n" + " Valid flags: +HSync -HSync +VSync -VSync\n" + " +CSync -CSync CSync Interlace DoubleScan\n" + " --rmmode <name>\n" + " --addmode <output> <name>\n" + " --delmode <output> <name>\n" + " --listproviders\n" + " --setprovideroutputsource <prov-xid> <source-xid>\n" + " --setprovideroffloadsink <prov-xid> <sink-xid>\n"); } static void _X_NORETURN _X_ATTRIBUTE_PRINTF(1,2) @@ -227,7 +229,7 @@ return "invalid reflection"; } -static char * +static const char * capability_name (int cap_bit) { switch (cap_bit) { @@ -2508,7 +2510,8 @@ program_name = argv[0]; for (i = 1; i < argc; i++) { - if (!strcmp ("-display", argv[i]) || !strcmp ("-d", argv[i])) { + if (!strcmp ("-display", argv[i]) || !strcmp ("--display", argv[i]) || + !strcmp ("-d", argv[i])) { if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]); display_name = argv[i]; continue; @@ -2924,7 +2927,7 @@ } if (!strcmp ("--newmode", argv[i])) { - umode_t *m = malloc (sizeof (umode_t)); + umode_t *m = calloc (1, sizeof (umode_t)); double clock; ++i; @@ -2966,7 +2969,7 @@ } if (!strcmp ("--rmmode", argv[i])) { - umode_t *m = malloc (sizeof (umode_t)); + umode_t *m = calloc (1, sizeof (umode_t)); if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]); set_name (&m->name, argv[i], name_string|name_xid); @@ -2979,7 +2982,7 @@ } if (!strcmp ("--addmode", argv[i])) { - umode_t *m = malloc (sizeof (umode_t)); + umode_t *m = calloc (1, sizeof (umode_t)); if (i+2 >= argc) argerr ("%s requires two arguments\n", argv[i]); set_name (&m->output, argv[++i], name_string|name_xid); @@ -2993,7 +2996,7 @@ } if (!strcmp ("--delmode", argv[i])) { - umode_t *m = malloc (sizeof (umode_t)); + umode_t *m = calloc (1, sizeof (umode_t)); if (i+2 >= argc) argerr ("%s requires two arguments\n", argv[i]); set_name (&m->output, argv[++i], name_string|name_xid); @@ -3560,6 +3563,8 @@ print_output_property_value (False, 32, actual_type, (unsigned char *) &(propinfo->values[k * 2 + 1])); printf (")"); + if (k < propinfo->num_values / 2 - 1) + printf (", "); } printf ("\n"); } @@ -3570,6 +3575,8 @@ { print_output_property_value (False, 32, actual_type, (unsigned char *) &(propinfo->values[k])); + if (k < propinfo->num_values - 1) + printf (", "); } printf ("\n"); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
