Hello community,
here is the log from the commit of package xf86-input-evdev for
openSUSE:Factory checked in at 2012-08-07 08:25:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-evdev (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-evdev.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-evdev", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-evdev/xf86-input-evdev.changes
2012-07-31 13:59:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-input-evdev.new/xf86-input-evdev.changes
2012-08-07 08:25:36.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Aug 4 12:56:27 UTC 2012 - tobias.johannes.klausm...@mni.thm.de
+
+- Update to version 2.7.2:
+ + This update fixes a few compiler warnings and a memory leak.
+
+-------------------------------------------------------------------
Old:
----
xf86-input-evdev-2.7.1.tar.bz2
New:
----
xf86-input-evdev-2.7.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-evdev.spec ++++++
--- /var/tmp/diff_new_pack.PxFtGg/_old 2012-08-07 08:25:37.000000000 +0200
+++ /var/tmp/diff_new_pack.PxFtGg/_new 2012-08-07 08:25:37.000000000 +0200
@@ -17,7 +17,7 @@
Name: xf86-input-evdev
-Version: 2.7.1
+Version: 2.7.2
Release: 0
Summary: Generic Linux input driver for the Xorg X server
License: MIT
++++++ xf86-input-evdev-2.7.1.tar.bz2 -> xf86-input-evdev-2.7.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.7.1/configure.ac
new/xf86-input-evdev-2.7.2/configure.ac
--- old/xf86-input-evdev-2.7.1/configure.ac 2012-07-24 06:05:09.000000000
+0200
+++ new/xf86-input-evdev-2.7.2/configure.ac 2012-08-03 08:00:31.000000000
+0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.7.1],
+ [2.7.2],
[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' old/xf86-input-evdev-2.7.1/src/emuWheel.c
new/xf86-input-evdev-2.7.2/src/emuWheel.c
--- old/xf86-input-evdev-2.7.1/src/emuWheel.c 2012-07-24 06:05:09.000000000
+0200
+++ new/xf86-input-evdev-2.7.2/src/emuWheel.c 2012-08-03 08:00:31.000000000
+0200
@@ -51,7 +51,6 @@
static Atom prop_wheel_button = 0;
/* Local Funciton Prototypes */
-static BOOL EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr
pAxis, char *axis_name);
static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int
value);
/* Filter mouse button events */
@@ -197,7 +196,8 @@
/* Handle button mapping here to avoid code duplication,
returns true if a button mapping was found. */
static BOOL
-EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char*
axis_name)
+EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
+ const char *axis_name)
{
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
char *option_string;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.7.1/src/evdev.c
new/xf86-input-evdev-2.7.2/src/evdev.c
--- old/xf86-input-evdev-2.7.1/src/evdev.c 2012-07-24 06:05:09.000000000
+0200
+++ new/xf86-input-evdev-2.7.2/src/evdev.c 2012-08-03 08:00:31.000000000
+0200
@@ -93,7 +93,7 @@
#define ABS_MT_TRACKING_ID 0x39
#endif
-static char *evdevDefaults[] = {
+static const char *evdevDefaults[] = {
"XkbRules", "evdev",
"XkbModel", "evdev",
"XkbLayout", "us",
@@ -278,7 +278,7 @@
static void
-SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
+SetXkbOption(InputInfoPtr pInfo, const char *name, char **option)
{
char *s;
@@ -1062,7 +1062,9 @@
static void
EvdevFreeMasks(EvdevPtr pEvdev)
{
+#ifdef MULTITOUCH
int i;
+#endif
valuator_mask_free(&pEvdev->vals);
valuator_mask_free(&pEvdev->old_vals);
@@ -1345,7 +1347,9 @@
i = 0;
for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) {
+#ifdef MULTITOUCH
int j;
+#endif
int mapping;
pEvdev->axis_map[axis] = -1;
if (!EvdevBitIsSet(pEvdev->abs_bitmask, axis) ||
@@ -1660,7 +1664,7 @@
/* Check for user-defined button mapping */
if ((mapping = xf86CheckStrOption(pInfo->options, "ButtonMapping", NULL)))
{
- char *map, *s = " ";
+ char *map, *s = NULL;
int btn = 0;
xf86IDrvMsg(pInfo, X_CONFIG, "ButtonMapping '%s'\n", mapping);
@@ -2350,14 +2354,16 @@
}
#ifdef MULTITOUCH
- pEvdev->mtdev = mtdev_new_open(pInfo->fd);
+ if (!pEvdev->mtdev) { /* after PreInit mtdev is still valid */
+ pEvdev->mtdev = mtdev_new_open(pInfo->fd);
+ if (!pEvdev->mtdev) {
+ xf86Msg(X_ERROR, "%s: Couldn't open mtdev device\n", pInfo->name);
+ EvdevCloseDevice(pInfo);
+ return FALSE;
+ }
+ }
if (pEvdev->mtdev)
pEvdev->cur_slot = pEvdev->mtdev->caps.slot.value;
- else {
- xf86Msg(X_ERROR, "%s: Couldn't open mtdev device\n", pInfo->name);
- EvdevCloseDevice(pInfo);
- return FALSE;
- }
#endif
/* Check major/minor of device node to avoid adding duplicate devices. */
@@ -2562,7 +2568,7 @@
/* Aligned with linux/input.h.
Note that there are holes in the ABS_ range, these are simply replaced with
MISC here */
-static char* abs_labels[] = {
+static const char *abs_labels[] = {
AXIS_LABEL_PROP_ABS_X, /* 0x00 */
AXIS_LABEL_PROP_ABS_Y, /* 0x01 */
AXIS_LABEL_PROP_ABS_Z, /* 0x02 */
@@ -2625,7 +2631,7 @@
AXIS_LABEL_PROP_ABS_MT_PRESSURE, /* 0x3a */
};
-static char* rel_labels[] = {
+static const char *rel_labels[] = {
AXIS_LABEL_PROP_REL_X,
AXIS_LABEL_PROP_REL_Y,
AXIS_LABEL_PROP_REL_Z,
@@ -2638,7 +2644,7 @@
AXIS_LABEL_PROP_REL_MISC
};
-static char* btn_labels[][16] = {
+static const char *btn_labels[][16] = {
{ /* BTN_MISC group offset 0x100*/
BTN_LABEL_PROP_BTN_0, /* 0x00 */
BTN_LABEL_PROP_BTN_1, /* 0x01 */
@@ -2723,7 +2729,7 @@
{
Atom atom;
int axis;
- char **labels;
+ const char **labels;
int labels_len = 0;
if (mode == Absolute)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
