Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Fri Aug 21 17:35:47 CEST 2009.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-08-07 11:04:09.000000000 +0200
+++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-08-21 04:28:26.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 21 04:10:06 CEST 2009 - sndirsch@suse.de
+
+- xf86-input-evdev 2.2.5
+ * Only take the driver-internal button mapping to count buttons
+ (bfo #23405)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-evdev-2.2.4.tar.bz2
New:
----
xf86-input-evdev-2.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.XXDJP4/_old 2009-08-21 17:35:21.000000000 +0200
+++ /var/tmp/diff_new_pack.XXDJP4/_new 2009-08-21 17:35:21.000000000 +0200
@@ -24,7 +24,7 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 35
+Release: 36
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -66,7 +66,7 @@
Source27: xf86-input-void-1.2.0.tar.bz2
Source28: xf86-input-diamondtouch-0.3.0.tar.bz2
Source29: xf86-input-synaptics-1.1.3.tar.bz2
-Source30: xf86-input-evdev-2.2.4.tar.bz2
+Source30: xf86-input-evdev-2.2.5.tar.bz2
Source31: 11-x11-synaptics.fdi
Source32: 11-mouse.fdi
Patch2: xf86-input-jamstudio.diff
++++++ xf86-input-evdev-2.2.4.tar.bz2 -> xf86-input-evdev-2.2.5.tar.bz2 ++++++
++++ 3781 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/xf86-input-evdev-2.2.4/ChangeLog new/xf86-input-evdev-2.2.5/ChangeLog
--- old/xf86-input-evdev-2.2.4/ChangeLog 2009-08-06 06:18:05.000000000 +0200
+++ new/xf86-input-evdev-2.2.5/ChangeLog 2009-08-21 01:20:38.000000000 +0200
@@ -1,3 +1,33 @@
+commit cd24c2cc183d56603056805ed0084e3abb11c758
+Author: Peter Hutterer
+Date: Fri Aug 21 09:03:10 2009 +1000
+
+ evdev 2.2.5
+
+commit c8a0f1cf362152ae275717d367afa2179d6bbc0b
+Author: Peter Hutterer
+Date: Thu Aug 20 11:02:31 2009 +1000
+
+ Only take the driver-internal button mapping to count buttons (#23405)
+
+ Regression:
+ If a user has multiple buttons mapped to the same button number, the
+ number of buttons counted is set to a wrong value. e.g. a button
+ mapping of 1 1 1 for a mouse with three buttons would only initialize 1
+ button to the X server.
+
+ In the future, the user cannot change this button mapping as the server
+ only knows about one button.
+
+ The user-supplied button map (option ButtonMapping) shouldn't matter when
+ counting the buttons. Only the driver-internal mapping (BTN_0 -> button 1,
+ etc.) matters.
+
+ X.Org Bug 23405 http://bugs.freedesktop.org/show_bug.cgi?id=23405
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 415b6ffa958e3103eeb52af4ccd881497169eed4)
+
commit bf356d939925b537921e1f82559f92baa3a76bcc
Author: Peter Hutterer
Date: Thu Aug 6 14:08:55 2009 +1000
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/xf86-input-evdev-2.2.4/configure.ac new/xf86-input-evdev-2.2.5/configure.ac
--- old/xf86-input-evdev-2.2.4/configure.ac 2009-08-06 06:08:49.000000000 +0200
+++ new/xf86-input-evdev-2.2.5/configure.ac 2009-08-21 01:03:08.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.2.4,
+ 2.2.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
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/xf86-input-evdev-2.2.4/missing new/xf86-input-evdev-2.2.5/missing
--- old/xf86-input-evdev-2.2.4/missing 2009-03-10 01:55:07.000000000 +0100
+++ new/xf86-input-evdev-2.2.5/missing 2009-08-21 01:11:00.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# 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
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ 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
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ 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
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ 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
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ 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
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# 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/xf86-input-evdev-2.2.4/src/evdev.c new/xf86-input-evdev-2.2.5/src/evdev.c
--- old/xf86-input-evdev-2.2.4/src/evdev.c 2009-08-06 06:08:35.000000000 +0200
+++ new/xf86-input-evdev-2.2.5/src/evdev.c 2009-08-21 01:01:37.000000000 +0200
@@ -1544,8 +1544,7 @@
int mapping = 0;
if (TestBit(i, pEvdev->key_bitmask))
{
- mapping =
- pEvdev->btnmap[EvdevUtilButtonEventToButtonNumber(pEvdev, i)];
+ mapping = EvdevUtilButtonEventToButtonNumber(pEvdev, i);
if (mapping > num_buttons)
num_buttons = mapping;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org