Hello community,
here is the log from the commit of package xf86-input-wacom for
openSUSE:Factory checked in at 2019-08-24 18:40:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom"
Sat Aug 24 18:40:40 2019 rev:31 rq:724824 version:0.37.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes
2019-08-05 10:29:57.515448408 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-wacom.new.7948/xf86-input-wacom.changes
2019-08-24 18:40:49.185789573 +0200
@@ -1,0 +2,10 @@
+Tue Aug 20 12:19:36 UTC 2019 - Stefan Dirsch <[email protected]>
+
+- Version update to 0.37.0 (boo#1146181)
+ * bug fixes and performance improvements
+- adjusted n_01-Add-option-to-enable-logging.patch
+- refreshed n_02-Log-PROXIMITY-LOW-LEVEL-events.patch,
+ n_03-Log-PRESSURE-low-level-events.patch,
+ n_04-Log-BUTTON-HIGH-LEVEL-events.patch
+
+-------------------------------------------------------------------
Old:
----
xf86-input-wacom-0.34.2.tar.bz2
New:
----
xf86-input-wacom-0.37.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.Tp2CgM/_old 2019-08-24 18:40:49.813789513 +0200
+++ /var/tmp/diff_new_pack.Tp2CgM/_new 2019-08-24 18:40:49.825789511 +0200
@@ -17,13 +17,13 @@
Name: xf86-input-wacom
-Version: 0.34.2
+Version: 0.37.0
Release: 0
Summary: Wacom input driver for the Xorg X server
License: GPL-2.0-or-later
Group: System/X11/Servers/XF86_4
-Url:
http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Xf86-input-wacom
-Source0:
http://downloads.sourceforge.net/project/linuxwacom/xf86-input-wacom/%{name}-%{version}.tar.bz2
+Url: https://github.com/linuxwacom/xf86-input-wacom
+Source0:
https://github.com/linuxwacom/xf86-input-wacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
Patch7: n_01-Add-option-to-enable-logging.patch
Patch8: n_02-Log-PROXIMITY-LOW-LEVEL-events.patch
Patch9: n_03-Log-PRESSURE-low-level-events.patch
@@ -124,7 +124,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS ChangeLog GPL README
+%doc AUTHORS ChangeLog GPL
%{_udevrulesdir}/65-wacom.rules
%{_unitdir}/[email protected]
%dir %{_datadir}/X11/xorg.conf.d/
++++++ n_01-Add-option-to-enable-logging.patch ++++++
--- /var/tmp/diff_new_pack.Tp2CgM/_old 2019-08-24 18:40:49.857789508 +0200
+++ /var/tmp/diff_new_pack.Tp2CgM/_new 2019-08-24 18:40:49.857789508 +0200
@@ -29,11 +29,11 @@
tools/xsetwacom.c | 10 ++++++++++
11 files changed, 177 insertions(+), 3 deletions(-)
-Index: xf86-input-wacom-0.34.2/configure.ac
+Index: xf86-input-wacom-0.37.0/configure.ac
===================================================================
---- xf86-input-wacom-0.34.2.orig/configure.ac
-+++ xf86-input-wacom-0.34.2/configure.ac
-@@ -87,6 +87,17 @@ if test "x$DEBUGGING" = xyes; then
+--- xf86-input-wacom-0.37.0.orig/configure.ac
++++ xf86-input-wacom-0.37.0/configure.ac
+@@ -88,6 +88,17 @@ if test "x$DEBUGGING" = xyes; then
AC_DEFINE(DEBUG, 1, [Enable debugging code])
fi
@@ -51,13 +51,13 @@
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
-Index: xf86-input-wacom-0.34.2/include/wacom-properties.h
+Index: xf86-input-wacom-0.37.0/include/wacom-properties.h
===================================================================
---- xf86-input-wacom-0.34.2.orig/include/wacom-properties.h
-+++ xf86-input-wacom-0.34.2/include/wacom-properties.h
-@@ -111,6 +111,15 @@
- */
- #define WACOM_PROP_PRESSURE_RECAL "Wacom Pressure Recalibration"
+--- xf86-input-wacom-0.37.0.orig/include/wacom-properties.h
++++ xf86-input-wacom-0.37.0/include/wacom-properties.h
+@@ -114,6 +114,15 @@
+ /* 32 bit, 1 values */
+ #define WACOM_PROP_PANSCROLL_THRESHOLD "Wacom Panscroll Threshold"
+/* 8 bit, values:
+ Type bit
@@ -71,15 +71,14 @@
/* The following are tool types used by the driver in WACOM_PROP_TOOL_TYPE
* or in the 'type' field for XI1 clients. Clients may check for one of
* these types to identify tool types.
-Index: xf86-input-wacom-0.34.2/man/wacom.man
+Index: xf86-input-wacom-0.37.0/man/wacom.man
===================================================================
---- xf86-input-wacom-0.34.2.orig/man/wacom.man
-+++ xf86-input-wacom-0.34.2/man/wacom.man
-@@ -269,6 +269,25 @@ initial pressure reading may be unequal
- good pen. If the consecutive pressure readings are not higher than
+--- xf86-input-wacom-0.37.0.orig/man/wacom.man
++++ xf86-input-wacom-0.37.0/man/wacom.man
+@@ -278,6 +278,24 @@ good pen. If the consecutive pressure re
the initial pressure by a threshold no button event will be generated.
This option allows to disable the recalibration.
-+.TP 4
+ .TP 4
+.B Option \fI"LogMask" \fI"number"\fP
+bitmask that enables logging of a group of events.
+.RS
@@ -97,20 +96,18 @@
+7
+button high level
+.PD
-+
- .RE
- .SH "TOUCH GESTURES"
- .SS Single finger (1FG)
-Index: xf86-input-wacom-0.34.2/man/xsetwacom.man
-===================================================================
---- xf86-input-wacom-0.34.2.orig/man/xsetwacom.man
-+++ xf86-input-wacom-0.34.2/man/xsetwacom.man
-@@ -273,7 +273,24 @@ initial pressure reading may be unequal
- good pen. If the consecutive pressure readings are not higher than
++.TP 4
+ .B Option \fI"PanScrollThreshold"\fP \fI"number"\fP
+ Specifies the distance the pen must move (in tablet units) before a
+ scroll event is generated when using the "pan" action. Smaller values
+Index: xf86-input-wacom-0.37.0/man/xsetwacom.man
+===================================================================
+--- xf86-input-wacom-0.37.0.orig/man/xsetwacom.man
++++ xf86-input-wacom-0.37.0/man/xsetwacom.man
+@@ -282,6 +282,24 @@ good pen. If the consecutive pressure re
the initial pressure by a threshold no button event will be generated.
This option allows to disable the recalibration. Default: on
--
-+.TP
+ .TP
+\fBLogMask\fR mask
+bitmask that enables logging of a group of events.
+.RS
@@ -128,13 +125,14 @@
+7
+button high level
+.PD
-
- .SH "AUTHORS"
- Peter Hutterer <[email protected]>
-Index: xf86-input-wacom-0.34.2/src/wcmCommon.c
++.TP
+ \fBPanScrollThreshold\fR distance
+ This specifies the distance the pen must move (in tablet units) before
+ a scroll event is generated when using the "pan" action. Smaller values
+Index: xf86-input-wacom-0.37.0/src/wcmCommon.c
===================================================================
---- xf86-input-wacom-0.34.2.orig/src/wcmCommon.c
-+++ xf86-input-wacom-0.34.2/src/wcmCommon.c
+--- xf86-input-wacom-0.37.0.orig/src/wcmCommon.c
++++ xf86-input-wacom-0.37.0/src/wcmCommon.c
@@ -27,6 +27,9 @@
#include "wcmTouchFilter.h"
#include <xkbsrv.h>
@@ -145,8 +143,8 @@
struct _WacomDriverRec WACOM_DRIVER = {
-@@ -89,6 +92,35 @@ void set_absolute(InputInfoPtr pInfo, Bo
- priv->flags &= ~ABSOLUTE_FLAG;
+@@ -132,6 +135,35 @@ static void wcmPanscroll(WacomDevicePtr
+ *accumulated_y = wcmButtonPerNotch(priv, *accumulated_y, threshold, 4,
5);
}
+#ifdef LOGGING
@@ -181,9 +179,9 @@
/*****************************************************************************
* wcmSendButtons --
* Send button events by comparing the current button mask with the
-@@ -1469,6 +1501,9 @@ WacomCommonPtr wcmNewCommon(void)
- common->wcmRawSample = DEFAULT_SAMPLES;
+@@ -1552,6 +1584,9 @@ WacomCommonPtr wcmNewCommon(void)
/* number of raw data to be used to for filtering */
+ common->wcmPanscrollThreshold = 0;
common->wcmPressureRecalibration = 1;
+#ifdef LOGGING
+ common->LogMask = 0;
@@ -191,11 +189,11 @@
return common;
}
-Index: xf86-input-wacom-0.34.2/src/wcmConfig.c
+Index: xf86-input-wacom-0.37.0/src/wcmConfig.c
===================================================================
---- xf86-input-wacom-0.34.2.orig/src/wcmConfig.c
-+++ xf86-input-wacom-0.34.2/src/wcmConfig.c
-@@ -646,6 +646,10 @@ static int wcmPreInit(InputDriverPtr drv
+--- xf86-input-wacom-0.37.0.orig/src/wcmConfig.c
++++ xf86-input-wacom-0.37.0/src/wcmConfig.c
+@@ -653,6 +653,10 @@ static int wcmPreInit(InputDriverPtr drv
common->debugLevel = xf86SetIntOption(pInfo->options,
"CommonDBG", common->debugLevel);
@@ -206,11 +204,11 @@
oldname = strdup(pInfo->name);
if (wcmIsHotpluggedDevice(pInfo))
-Index: xf86-input-wacom-0.34.2/src/wcmUSB.c
+Index: xf86-input-wacom-0.37.0/src/wcmUSB.c
===================================================================
---- xf86-input-wacom-0.34.2.orig/src/wcmUSB.c
-+++ xf86-input-wacom-0.34.2/src/wcmUSB.c
-@@ -1138,6 +1138,31 @@ static int usbIdToType(int id)
+--- xf86-input-wacom-0.37.0.orig/src/wcmUSB.c
++++ xf86-input-wacom-0.37.0/src/wcmUSB.c
+@@ -1182,6 +1182,31 @@ static int usbIdToType(int id)
return type;
}
@@ -242,10 +240,10 @@
/**
* Find the tool type (STYLUS_ID, etc.) based on the device_id.
*
-Index: xf86-input-wacom-0.34.2/src/wcmXCommand.c
+Index: xf86-input-wacom-0.37.0/src/wcmXCommand.c
===================================================================
---- xf86-input-wacom-0.34.2.orig/src/wcmXCommand.c
-+++ xf86-input-wacom-0.34.2/src/wcmXCommand.c
+--- xf86-input-wacom-0.37.0.orig/src/wcmXCommand.c
++++ xf86-input-wacom-0.37.0/src/wcmXCommand.c
@@ -99,6 +99,9 @@ static Atom prop_tooltype;
static Atom prop_btnactions;
static Atom prop_product_id;
@@ -253,10 +251,10 @@
+#ifdef LOGGING
+static Atom prop_logmask;
+#endif
+ static Atom prop_panscroll_threshold;
#ifdef DEBUG
static Atom prop_debuglevels;
- #endif
-@@ -337,7 +340,10 @@ void InitWcmDeviceProperties(InputInfoPt
+@@ -343,7 +346,10 @@ void InitWcmDeviceProperties(InputInfoPt
values[0] = common->vendor_id;
values[1] = common->tablet_id;
prop_product_id = InitWcmAtom(pInfo->dev, XI_PROP_PRODUCT_ID,
XA_INTEGER, 32, 2, values);
@@ -268,7 +266,7 @@
#ifdef DEBUG
values[0] = priv->debugLevel;
values[1] = common->debugLevel;
-@@ -951,6 +957,20 @@ int wcmSetProperty(DeviceIntPtr dev, Ato
+@@ -959,6 +965,20 @@ int wcmSetProperty(DeviceIntPtr dev, Ato
common->debugLevel = values[1];
}
#endif
@@ -289,10 +287,10 @@
} else if (property == prop_btnactions)
{
int nbuttons = priv->nbuttons < 4 ? priv->nbuttons :
priv->nbuttons + 4;
-Index: xf86-input-wacom-0.34.2/src/xf86Wacom.h
+Index: xf86-input-wacom-0.37.0/src/xf86Wacom.h
===================================================================
---- xf86-input-wacom-0.34.2.orig/src/xf86Wacom.h
-+++ xf86-input-wacom-0.34.2/src/xf86Wacom.h
+--- xf86-input-wacom-0.37.0.orig/src/xf86Wacom.h
++++ xf86-input-wacom-0.37.0/src/xf86Wacom.h
@@ -69,6 +69,28 @@
#define DBG(lvl, priv, ...)
#endif
@@ -322,26 +320,25 @@
/******************************************************************************
* WacomModule - all globals are packed in a single structure to keep the
* global namespaces as clean as possible.
-Index: xf86-input-wacom-0.34.2/src/xf86WacomDefs.h
+Index: xf86-input-wacom-0.37.0/src/xf86WacomDefs.h
===================================================================
---- xf86-input-wacom-0.34.2.orig/src/xf86WacomDefs.h
-+++ xf86-input-wacom-0.34.2/src/xf86WacomDefs.h
-@@ -460,7 +460,9 @@ struct _WacomCommonRec
+--- xf86-input-wacom-0.37.0.orig/src/xf86WacomDefs.h
++++ xf86-input-wacom-0.37.0/src/xf86WacomDefs.h
+@@ -469,6 +469,9 @@ struct _WacomCommonRec
int wcmRawSample; /* Number of raw data used to filter an
event */
int wcmPressureRecalibration; /* Determine if pressure recalibration of
worn pens should be performed */
--
+#ifdef LOGGING
-+ int LogMask; /* Mask to determine which event types to
log. */
++ int LogMask; /* Mask to determine which event types to
log. */
+#endif
- int bufpos; /* position with buffer */
- unsigned char buffer[BUFFER_SIZE]; /* data read from device */
+ int wcmPanscrollThreshold; /* distance pen must move to send a
panscroll event */
-Index: xf86-input-wacom-0.34.2/tools/xsetwacom.c
+ int bufpos; /* position with buffer */
+Index: xf86-input-wacom-0.37.0/tools/xsetwacom.c
===================================================================
---- xf86-input-wacom-0.34.2.orig/tools/xsetwacom.c
-+++ xf86-input-wacom-0.34.2/tools/xsetwacom.c
-@@ -158,6 +158,16 @@ static param_t parameters[] =
+--- xf86-input-wacom-0.37.0.orig/tools/xsetwacom.c
++++ xf86-input-wacom-0.37.0/tools/xsetwacom.c
+@@ -159,6 +159,16 @@ static param_t parameters[] =
.arg_count = 1,
},
{
@@ -358,12 +355,12 @@
.name = "Suppress",
.x11name = "Suppress",
.desc = "Number of points trimmed (default is 2). ",
-@@ -2974,7 +2984,7 @@ static void test_parameter_number(void)
+@@ -3028,7 +3038,7 @@ static void test_parameter_number(void)
* deprecated them.
* Numbers include trailing NULL entry.
*/
-- assert(ARRAY_SIZE(parameters) == 39);
-+ assert(ARRAY_SIZE(parameters) == 40);
+- assert(ARRAY_SIZE(parameters) == 40);
++ assert(ARRAY_SIZE(parameters) == 41);
assert(ARRAY_SIZE(deprecated_parameters) == 17);
}
++++++ n_02-Log-PROXIMITY-LOW-LEVEL-events.patch ++++++
--- /var/tmp/diff_new_pack.Tp2CgM/_old 2019-08-24 18:40:49.869789507 +0200
+++ /var/tmp/diff_new_pack.Tp2CgM/_new 2019-08-24 18:40:49.877789506 +0200
@@ -12,11 +12,11 @@
src/wcmUSB.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
-Index: xf86-input-wacom-0.28.0/src/wcmUSB.c
+Index: xf86-input-wacom-0.37.0/src/wcmUSB.c
===================================================================
---- xf86-input-wacom-0.28.0.orig/src/wcmUSB.c
-+++ xf86-input-wacom-0.28.0/src/wcmUSB.c
-@@ -517,6 +517,8 @@ static void usbWcmInitPadState(InputInfo
+--- xf86-input-wacom-0.37.0.orig/src/wcmUSB.c
++++ xf86-input-wacom-0.37.0/src/wcmUSB.c
+@@ -544,6 +544,8 @@ static void usbWcmInitPadState(InputInfo
ds->device_type = PAD_ID;
ds->device_id = PAD_DEVICE_ID;
ds->serial_num = channel;
@@ -25,7 +25,7 @@
}
int usbWcmGetRanges(InputInfoPtr pInfo)
-@@ -1697,6 +1699,7 @@ static void usbDispatchEvents(InputInfoP
+@@ -1821,6 +1823,7 @@ static void usbDispatchEvents(InputInfoP
int channel;
wcmUSBData* private = common->private;
WacomDeviceState dslast =
common->wcmChannel[private->lastChannel].valid.state;
@@ -33,7 +33,7 @@
DBG(6, common, "%d events received\n", private->wcmEventCnt);
-@@ -1733,6 +1736,7 @@ static void usbDispatchEvents(InputInfoP
+@@ -1857,6 +1860,7 @@ static void usbDispatchEvents(InputInfoP
ds = &common->wcmChannel[channel].work;
dslast = common->wcmChannel[channel].valid.state;
@@ -41,7 +41,7 @@
if (ds->device_type && ds->device_type != private->wcmDeviceType)
LogMessageVerbSigSafe(X_ERROR, 0,
-@@ -1747,10 +1751,16 @@ static void usbDispatchEvents(InputInfoP
+@@ -1871,10 +1875,16 @@ static void usbDispatchEvents(InputInfoP
/* all USB data operates from previous context except relative values*/
ds->relwheel = 0;
ds->serial_num = private->wcmLastToolSerial;
@@ -58,7 +58,7 @@
event = private->wcmEvents + i;
DBG(11, common,
"event[%d]->type=%d code=%d value=%d\n",
-@@ -1804,6 +1814,12 @@ static void usbDispatchEvents(InputInfoP
+@@ -1928,6 +1938,12 @@ static void usbDispatchEvents(InputInfoP
usbParseKeyEvent(common, event, channel);
usbParseBTNEvent(common, event, btn_channel);
}
++++++ n_03-Log-PRESSURE-low-level-events.patch ++++++
--- /var/tmp/diff_new_pack.Tp2CgM/_old 2019-08-24 18:40:49.885789505 +0200
+++ /var/tmp/diff_new_pack.Tp2CgM/_new 2019-08-24 18:40:49.885789505 +0200
@@ -13,11 +13,11 @@
src/wcmUSB.c | 4 ++++
2 files changed, 10 insertions(+), 2 deletions(-)
-Index: xf86-input-wacom-0.28.0/src/wcmCommon.c
+Index: xf86-input-wacom-0.37.0/src/wcmCommon.c
===================================================================
---- xf86-input-wacom-0.28.0.orig/src/wcmCommon.c
-+++ xf86-input-wacom-0.28.0/src/wcmCommon.c
-@@ -1181,9 +1181,13 @@ static void detectPressureIssue(WacomDev
+--- xf86-input-wacom-0.37.0.orig/src/wcmCommon.c
++++ xf86-input-wacom-0.37.0/src/wcmCommon.c
+@@ -1240,9 +1240,13 @@ static void detectPressureIssue(WacomDev
"\tThis indicates a worn out pen, it is time to
change your tool. Also see:\n"
"\thttp://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Pen_Wear.\n";,
priv->pInfo->name, priv->serial,
priv->minPressure, LIMIT_LOW_PRESSURE, common->wcmMaxZ);
@@ -33,11 +33,11 @@
priv->oldMinPressure = priv->minPressure;
priv->eventCnt++;
}
-Index: xf86-input-wacom-0.28.0/src/wcmUSB.c
+Index: xf86-input-wacom-0.37.0/src/wcmUSB.c
===================================================================
---- xf86-input-wacom-0.28.0.orig/src/wcmUSB.c
-+++ xf86-input-wacom-0.28.0/src/wcmUSB.c
-@@ -1209,6 +1209,8 @@ static void usbParseAbsEvent(WacomCommon
+--- xf86-input-wacom-0.37.0.orig/src/wcmUSB.c
++++ xf86-input-wacom-0.37.0/src/wcmUSB.c
+@@ -1273,6 +1273,8 @@ static int usbParseGenericAbsEvent(Wacom
break;
case ABS_PRESSURE:
ds->pressure = event->value;
@@ -46,7 +46,7 @@
break;
case ABS_DISTANCE:
ds->distance = event->value;
-@@ -1309,6 +1311,8 @@ static void usbParseAbsMTEvent(WacomComm
+@@ -1428,6 +1430,8 @@ static void usbParseAbsMTEvent(WacomComm
case ABS_MT_PRESSURE:
ds->pressure = event->value;
++++++ n_04-Log-BUTTON-HIGH-LEVEL-events.patch ++++++
--- /var/tmp/diff_new_pack.Tp2CgM/_old 2019-08-24 18:40:49.897789504 +0200
+++ /var/tmp/diff_new_pack.Tp2CgM/_new 2019-08-24 18:40:49.897789504 +0200
@@ -12,11 +12,11 @@
src/wcmCommon.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
-Index: xf86-input-wacom-0.28.0/src/wcmCommon.c
+Index: xf86-input-wacom-0.37.0/src/wcmCommon.c
===================================================================
---- xf86-input-wacom-0.28.0.orig/src/wcmCommon.c
-+++ xf86-input-wacom-0.28.0/src/wcmCommon.c
-@@ -288,9 +288,17 @@ static void sendAButton(InputInfoPtr pIn
+--- xf86-input-wacom-0.37.0.orig/src/wcmCommon.c
++++ xf86-input-wacom-0.37.0/src/wcmCommon.c
+@@ -346,9 +346,17 @@ static void sendAButton(InputInfoPtr pIn
#ifdef DEBUG
WacomCommonPtr common = priv->common;
#endif
++++++ xf86-input-wacom-0.34.2.tar.bz2 -> xf86-input-wacom-0.37.0.tar.bz2 ++++++
++++ 4900 lines of diff (skipped)
