Hello community, here is the log from the commit of package libXrandr for openSUSE:Factory checked in at 2013-09-11 12:20:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXrandr (Old) and /work/SRC/openSUSE:Factory/.libXrandr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXrandr" Changes: -------- --- /work/SRC/openSUSE:Factory/libXrandr/libXrandr.changes 2013-06-05 11:57:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXrandr.new/libXrandr.changes 2013-09-11 12:20:03.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 8 13:54:25 UTC 2013 - [email protected] + +- Update to version 1.4.2: + This release fixes two small bugs in the library, and fixes an omission + in the list of copyright notices in the COPYING file. + +------------------------------------------------------------------- Old: ---- libXrandr-1.4.1.tar.bz2 New: ---- libXrandr-1.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXrandr.spec ++++++ --- /var/tmp/diff_new_pack.Ipfoz8/_old 2013-09-11 12:20:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Ipfoz8/_new 2013-09-11 12:20:03.000000000 +0200 @@ -18,7 +18,7 @@ Name: libXrandr %define lname libXrandr2 -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: X Resize, Rotate and Reflection extension library License: MIT ++++++ libXrandr-1.4.1.tar.bz2 -> libXrandr-1.4.2.tar.bz2 ++++++ ++++ 1985 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/libXrandr-1.4.1/COPYING new/libXrandr-1.4.2/COPYING --- old/libXrandr-1.4.1/COPYING 2013-06-01 00:52:25.000000000 +0200 +++ new/libXrandr-1.4.2/COPYING 2013-09-08 06:50:59.000000000 +0200 @@ -22,6 +22,7 @@ Copyright © 2002 Hewlett-Packard Company, Inc. Copyright © 2006 Intel Corporation Copyright © 2008 Red Hat, Inc. +Copyright © 2011 Dave Airlie Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that 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/libXrandr-1.4.1/ChangeLog new/libXrandr-1.4.2/ChangeLog --- old/libXrandr-1.4.1/ChangeLog 2013-06-01 00:52:50.000000000 +0200 +++ new/libXrandr-1.4.2/ChangeLog 2013-09-08 06:52:13.000000000 +0200 @@ -1,3 +1,54 @@ +commit 30a7b506ae2071b8d265ce4eaeed1af60bc7ee7b +Author: Alan Coopersmith <[email protected]> +Date: Sat Sep 7 21:50:49 2013 -0700 + + libXrandr 1.4.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 293d6b579b243574d98bd5974cce6e5fe48e7613 +Author: Alan Coopersmith <[email protected]> +Date: Sat Sep 7 21:49:52 2013 -0700 + + Add copyright notice from src/XrrProvider.c to COPYING + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4e4bbb85499cff052ce03e173b88f1083ba83f86 +Author: Pauli Nieminen <[email protected]> +Date: Mon Jun 14 13:45:08 2010 +0300 + + XRRUpdateConfiguration: Check if getting screen for root fails + + XRRRootToScreen might return -1 if it fails to find screen for the root + window. Following code uses screen number unconditionally to index the + screen array. + + Signed-off-by: Pauli Nieminen <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9e4abe746786f0f632d1f82f99fe0c6b8ffedf9e +Author: Alan Coopersmith <[email protected]> +Date: Sun Jun 30 16:52:59 2013 -0700 + + XRRGetProviderInfo returned bad associated_capability list in 64-bit + + Unlike most of the values returned by this function, which are arrays + of XIDs (long int), associated_capability is defined as an array of + unsigned int. _XRead32 reads 32-bit values from the wire protocol + and writes them to the provided buffer as an array of long ints, even + if that means expanding them from 32-bit to 64-bit. Doing that for + associated_capability resulted in a garbage value between each actual + value, and overflowing the provided buffer into the space for the + provider name (which is written later and would overwrite the overflowed + data). + + Created xhiv libXrandr/XRRGetProviderInfo test case to test & confirm. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Dave Airlie <[email protected]> + commit f97d44f8fb9f90ce3227cca8affd3b947e9b08ca Author: Alan Coopersmith <[email protected]> Date: Fri May 31 15:52:23 2013 -0700 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/libXrandr-1.4.1/compile new/libXrandr-1.4.2/compile --- old/libXrandr-1.4.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libXrandr-1.4.2/compile 2013-09-08 06:51:09.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/libXrandr-1.4.1/configure.ac new/libXrandr-1.4.2/configure.ac --- old/libXrandr-1.4.1/configure.ac 2013-06-01 00:52:25.000000000 +0200 +++ new/libXrandr-1.4.2/configure.ac 2013-09-08 06:50:59.000000000 +0200 @@ -29,7 +29,7 @@ # 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.1], +AC_INIT([libXrandr], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrandr]) 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/libXrandr-1.4.1/src/Xrandr.c new/libXrandr-1.4.2/src/Xrandr.c --- old/libXrandr-1.4.1/src/Xrandr.c 2013-06-01 00:52:25.000000000 +0200 +++ new/libXrandr-1.4.2/src/Xrandr.c 2013-09-08 06:50:59.000000000 +0200 @@ -483,6 +483,9 @@ scevent = (XRRScreenChangeNotifyEvent *) event; snum = XRRRootToScreen(dpy, ((XRRScreenChangeNotifyEvent *) event)->root); + if (snum < 0) + return 0; + if (scevent->rotation & (RR_Rotate_90 | RR_Rotate_270)) { dpy->screens[snum].width = scevent->height; dpy->screens[snum].height = scevent->width; 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/libXrandr-1.4.1/src/XrrProvider.c new/libXrandr-1.4.2/src/XrrProvider.c --- old/libXrandr-1.4.1/src/XrrProvider.c 2013-06-01 00:52:25.000000000 +0200 +++ new/libXrandr-1.4.2/src/XrrProvider.c 2013-09-08 06:50:59.000000000 +0200 @@ -156,7 +156,16 @@ _XRead32(dpy, xpi->outputs, rep.nOutputs << 2); _XRead32(dpy, xpi->associated_providers, rep.nAssociatedProviders << 2); - _XRead32(dpy, xpi->associated_capability, rep.nAssociatedProviders << 2); + + /* + * _XRead32 reads a series of 32-bit values from the protocol and writes + * them out as a series of "long int" values, but associated_capability + * is defined as unsigned int *, so that won't work for this array. + * Instead we assume for now that "unsigned int" is also 32-bits, so + * the values can be read without any conversion. + */ + _XRead(dpy, (char *) xpi->associated_capability, + rep.nAssociatedProviders << 2); _XReadPad(dpy, xpi->name, rep.nameLength); xpi->name[rep.nameLength] = '\0'; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
