Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Wed Dec 8 14:26:20 CET 2010.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-11-22 02:03:55.000000000 +0100
+++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-12-08 07:11:37.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Dec 8 06:07:59 UTC 2010 - sndirsch@novell.com
+
+- xf86-input-evdev 2.5.99.902 (2.6 RC2)
+ * Only one minor fix since RC1. In xorg.conf static configurations,
+ a wrong error code would prevent the server from loading
+ additional devices if a device couldn't be opened. This is fixed
+ now and only happens when we're out of memory (as intended).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-evdev-2.5.99.901.tar.bz2
New:
----
xf86-input-evdev-2.5.99.902.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.6lnxBD/_old 2010-12-08 14:25:49.000000000 +0100
+++ /var/tmp/diff_new_pack.6lnxBD/_new 2010-12-08 14:25:49.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 18
+Release: 19
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -48,7 +48,7 @@
Source26: xf86-input-vmmouse-12.6.10.tar.bz2
Source27: xf86-input-void-1.3.1.tar.bz2
Source29: xf86-input-synaptics-1.3.0.tar.bz2
-Source30: xf86-input-evdev-2.5.99.901.tar.bz2
+Source30: xf86-input-evdev-2.5.99.902.tar.bz2
Source33: xf86-input-wacom-0.10.8.tar.bz2
Source42: 11-mouse.conf
Source45: 65-xorg-wacom.rules
++++++ xf86-input-evdev-2.5.99.901.tar.bz2 -> xf86-input-evdev-2.5.99.902.tar.bz2 ++++++
++++ 4368 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.5.99.901/ChangeLog new/xf86-input-evdev-2.5.99.902/ChangeLog
--- old/xf86-input-evdev-2.5.99.901/ChangeLog 2010-11-22 00:58:43.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.902/ChangeLog 2010-12-08 03:41:50.000000000 +0100
@@ -1,3 +1,26 @@
+commit 1c5ad6f8a0f098da89aa88102f424c667addf376
+Author: Peter Hutterer
+Date: Wed Dec 8 12:40:49 2010 +1000
+
+ evdev 2.5.99.902
+
+ Signed-off-by: Peter Hutterer
+
+commit 6fd1d0860e71c644fa72b4b40872e0ced671726c
+Author: Peter Hutterer
+Date: Mon Dec 6 11:41:11 2010 +1000
+
+ Return error codes from EvdevOpenDevice()
+
+ The server's behaviour is to stop adding new devices when a BadAlloc occurs
+ on any device (on the assumption that new devices won't magically have more
+ memory). Change EvdevOpenDevice() to return an error code of BadValue when
+ it fails (and thus to the server) to prevent other devices being ignored
+ because of one misconfigured one.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Daniel Stone
+
commit 31ba99e9edd28ff81437e0167c5322b9f619c52a
Author: Peter Hutterer
Date: Fri Nov 19 14:27:09 2010 +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.5.99.901/configure.ac new/xf86-input-evdev-2.5.99.902/configure.ac
--- old/xf86-input-evdev-2.5.99.901/configure.ac 2010-11-22 00:17:05.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.902/configure.ac 2010-12-08 03:40:45.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.5.99.901],
+ [2.5.99.902],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
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.5.99.901/src/evdev.c new/xf86-input-evdev-2.5.99.902/src/evdev.c
--- old/xf86-input-evdev-2.5.99.901/src/evdev.c 2010-11-18 04:10:57.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.902/src/evdev.c 2010-12-06 04:21:29.000000000 +0100
@@ -112,7 +112,7 @@
static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode);
static BOOL EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab);
static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int calibration[4]);
-static BOOL EvdevOpenDevice(InputInfoPtr pInfo);
+static int EvdevOpenDevice(InputInfoPtr pInfo);
#ifdef HAVE_PROPERTIES
static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms);
@@ -1675,12 +1675,14 @@
{
InputInfoPtr pInfo;
EvdevPtr pEvdev;
+ int rc = Success;
pInfo = device->public.devicePrivate;
pEvdev = pInfo->private;
/* after PreInit fd is still open */
- if (!EvdevOpenDevice(pInfo))
- return !Success;
+ rc = EvdevOpenDevice(pInfo);
+ if (rc != Success)
+ return rc;
EvdevGrabDevice(pInfo, 1, 0);
@@ -2141,7 +2143,7 @@
}
}
-static BOOL
+static int
EvdevOpenDevice(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
@@ -2152,7 +2154,7 @@
device = xf86CheckStrOption(pInfo->options, "Device", NULL);
if (!device) {
xf86Msg(X_ERROR, "%s: No device specified.\n", pInfo->name);
- return FALSE;
+ return BadValue;
}
pEvdev->device = device;
@@ -2167,7 +2169,7 @@
if (pInfo->fd < 0) {
xf86Msg(X_ERROR, "Unable to open evdev device \"%s\".\n", device);
- return FALSE;
+ return BadValue;
}
}
@@ -2178,10 +2180,10 @@
xf86Msg(X_WARNING, "%s: device file is duplicate. Ignoring.\n",
pInfo->name);
close(pInfo->fd);
- return FALSE;
+ return BadMatch;
}
- return TRUE;
+ return Success;
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
@@ -2243,7 +2245,8 @@
pInfo->read_input = EvdevReadInput;
pInfo->switch_mode = EvdevSwitchMode;
- if (!EvdevOpenDevice(pInfo))
+ rc = EvdevOpenDevice(pInfo);
+ if (rc != Success)
goto error;
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org