Hello community, here is the log from the commit of package xf86-input-wacom for openSUSE:Factory checked in at 2015-01-25 21:14:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old) and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes 2014-04-23 20:35:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-input-wacom.new/xf86-input-wacom.changes 2015-01-25 21:14:43.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Jan 23 11:26:00 UTC 2015 - [email protected] + +- Update to release xf86-input-wacom-0.28.0 +- dropped upstream patches already in 0.28.0 + * U_01-Remove-unused-code.patch + * U_02-Zero-is-not-a-valid-device-ID-don-t-derive-a-type-from-it.patch + * U_03-Fix-initial-device-type-detection.patch + * U_04-Store-the-last-used-channel-rather-than-blindly-taking-channel-0.patch + * U_05-Remove-duplicate-tool-type-detection.patch + * U_06-Attempt-to-derive-the-tool-type-from-a-known-button-key-event.patch +- refreshed logging patches: + * n_01-Add-option-to-enable-logging.patch + * n_02-Log-PROXIMITY-LOW-LEVEL-events.patch + * n_03-Log-PRESSURE-low-level-events.patch + * n_04-Log-BUTTON-HIGH-LEVEL-events.patch + (factorX/factorY replaced by 1.0 due to upstream git commit 96eae07) + +------------------------------------------------------------------- +Mon Sep 8 10:17:51 UTC 2014 - [email protected] + +- readd isdv4-serial-inputattach and isdv4-serial-debugger + (bnc#895547) + +------------------------------------------------------------------- Old: ---- U_01-Remove-unused-code.patch U_02-Zero-is-not-a-valid-device-ID-don-t-derive-a-type-from-it.patch U_03-Fix-initial-device-type-detection.patch U_04-Store-the-last-used-channel-rather-than-blindly-taking-channel-0.patch U_05-Remove-duplicate-tool-type-detection.patch U_06-Attempt-to-derive-the-tool-type-from-a-known-button-key-event.patch xf86-input-wacom-0.24.0.tar.bz2 New: ---- xf86-input-wacom-0.28.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.9UJ9lr/_old 2015-01-25 21:14:44.000000000 +0100 +++ /var/tmp/diff_new_pack.9UJ9lr/_new 2015-01-25 21:14:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-input-wacom # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,25 +21,16 @@ %else %define _udevrulesdir /lib/udev/rules.d %endif -#### Only set for non-enterprise -%if %{suse_version} != 1315 %define install_serial 1 -%endif Name: xf86-input-wacom -Version: 0.24.0 +Version: 0.28.0 Release: 0 Summary: Wacom input driver for the Xorg X server License: GPL-2.0+ 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 -Patch1: U_01-Remove-unused-code.patch -Patch2: U_02-Zero-is-not-a-valid-device-ID-don-t-derive-a-type-from-it.patch -Patch3: U_03-Fix-initial-device-type-detection.patch -Patch4: U_04-Store-the-last-used-channel-rather-than-blindly-taking-channel-0.patch -Patch5: U_05-Remove-duplicate-tool-type-detection.patch -Patch6: U_06-Attempt-to-derive-the-tool-type-from-a-known-button-key-event.patch 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 @@ -94,12 +85,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -148,8 +133,8 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog GPL README -%{_udevrulesdir}/65-wacom.rules -%{_unitdir}/[email protected] +%{!?install_serial:%exclude} %{_udevrulesdir}/65-wacom.rules +%{!?install_serial:%exclude} %{_unitdir}/[email protected] %config %{_sysconfdir}/X11/xorg.conf.d/50-wacom.conf %dir %{_libdir}/xorg/modules/input %{_libdir}/xorg/modules/input/wacom_drv.so ++++++ n_01-Add-option-to-enable-logging.patch ++++++ --- /var/tmp/diff_new_pack.9UJ9lr/_old 2015-01-25 21:14:44.000000000 +0100 +++ /var/tmp/diff_new_pack.9UJ9lr/_new 2015-01-25 21:14:44.000000000 +0100 @@ -29,11 +29,11 @@ tools/xsetwacom.c | 10 ++++++++++ 11 files changed, 177 insertions(+), 3 deletions(-) -diff --git a/configure.ac b/configure.ac -index 5eae74d..008a804 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -86,6 +86,17 @@ if test "x$DEBUGGING" = xyes; then +Index: xf86-input-wacom-0.28.0/configure.ac +=================================================================== +--- xf86-input-wacom-0.28.0.orig/configure.ac ++++ xf86-input-wacom-0.28.0/configure.ac +@@ -87,6 +87,17 @@ if test "x$DEBUGGING" = xyes; then AC_DEFINE(DEBUG, 1, [Enable debugging code]) fi @@ -51,10 +51,10 @@ # Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, AS_HELP_STRING([--with-xorg-module-dir=DIR], -diff --git a/include/wacom-properties.h b/include/wacom-properties.h -index b845083..f566d14 100644 ---- a/include/wacom-properties.h -+++ b/include/wacom-properties.h +Index: xf86-input-wacom-0.28.0/include/wacom-properties.h +=================================================================== +--- xf86-input-wacom-0.28.0.orig/include/wacom-properties.h ++++ xf86-input-wacom-0.28.0/include/wacom-properties.h @@ -111,6 +111,15 @@ */ #define WACOM_PROP_PRESSURE_RECAL "Wacom Pressure Recalibration" @@ -71,11 +71,11 @@ /* 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. -diff --git a/man/wacom.man b/man/wacom.man -index ae042f6..f699842 100644 ---- a/man/wacom.man -+++ b/man/wacom.man -@@ -267,6 +267,25 @@ initial pressure reading may be unequal to zero even for a perfectly +Index: xf86-input-wacom-0.28.0/man/wacom.man +=================================================================== +--- xf86-input-wacom-0.28.0.orig/man/wacom.man ++++ xf86-input-wacom-0.28.0/man/wacom.man +@@ -269,6 +269,25 @@ initial pressure reading may be unequal good pen. If the consecutive pressure readings are not higher than the initial pressure by a threshold no button event will be generated. This option allows to disable the recalibration. @@ -101,11 +101,11 @@ .RE .SH "TOUCH GESTURES" .SS Single finger (1FG) -diff --git a/man/xsetwacom.man b/man/xsetwacom.man -index 35ee9fe..5e42e3f 100644 ---- a/man/xsetwacom.man -+++ b/man/xsetwacom.man -@@ -242,7 +242,24 @@ initial pressure reading may be unequal to zero even for a perfectly +Index: xf86-input-wacom-0.28.0/man/xsetwacom.man +=================================================================== +--- xf86-input-wacom-0.28.0.orig/man/xsetwacom.man ++++ xf86-input-wacom-0.28.0/man/xsetwacom.man +@@ -266,7 +266,24 @@ initial pressure reading may be unequal good pen. If the consecutive pressure readings are not higher than the initial pressure by a threshold no button event will be generated. This option allows to disable the recalibration. Default: on @@ -131,10 +131,10 @@ .SH "AUTHORS" Peter Hutterer <[email protected]> -diff --git a/src/wcmCommon.c b/src/wcmCommon.c -index 6abb23b..238cf78 100644 ---- a/src/wcmCommon.c -+++ b/src/wcmCommon.c +Index: xf86-input-wacom-0.28.0/src/wcmCommon.c +=================================================================== +--- xf86-input-wacom-0.28.0.orig/src/wcmCommon.c ++++ xf86-input-wacom-0.28.0/src/wcmCommon.c @@ -27,6 +27,9 @@ #include "wcmTouchFilter.h" #include <xkbsrv.h> @@ -143,9 +143,9 @@ +#include <time.h> +#endif - /* X servers pre 1.9 didn't copy data passed into xf86Post*Event. - * Data passed in would be modified, requiring the driver to copy the -@@ -85,6 +88,35 @@ void set_absolute(InputInfoPtr pInfo, Bool absolute) + + struct _WacomDriverRec WACOM_DRIVER = { +@@ -89,6 +92,35 @@ void set_absolute(InputInfoPtr pInfo, Bo priv->flags &= ~ABSOLUTE_FLAG; } @@ -179,9 +179,9 @@ +#endif + /***************************************************************************** - * wcmMappingFactor -- - * calculate the proper tablet to screen mapping factor according to the -@@ -1523,6 +1555,9 @@ WacomCommonPtr wcmNewCommon(void) + * wcmSendButtons -- + * Send button events by comparing the current button mask with the +@@ -1467,6 +1499,9 @@ WacomCommonPtr wcmNewCommon(void) common->wcmRawSample = DEFAULT_SAMPLES; /* number of raw data to be used to for filtering */ common->wcmPressureRecalibration = 1; @@ -191,11 +191,11 @@ return common; } -diff --git a/src/wcmConfig.c b/src/wcmConfig.c -index a8077f9..7965e13 100644 ---- a/src/wcmConfig.c -+++ b/src/wcmConfig.c -@@ -637,6 +637,10 @@ static int wcmPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) +Index: xf86-input-wacom-0.28.0/src/wcmConfig.c +=================================================================== +--- xf86-input-wacom-0.28.0.orig/src/wcmConfig.c ++++ xf86-input-wacom-0.28.0/src/wcmConfig.c +@@ -637,6 +637,10 @@ static int wcmPreInit(InputDriverPtr drv common->debugLevel = xf86SetIntOption(pInfo->options, "CommonDBG", common->debugLevel); @@ -206,11 +206,11 @@ oldname = strdup(pInfo->name); if (wcmIsHotpluggedDevice(pInfo)) -diff --git a/src/wcmUSB.c b/src/wcmUSB.c -index dca0751..e99960f 100644 ---- a/src/wcmUSB.c -+++ b/src/wcmUSB.c -@@ -1103,6 +1103,31 @@ static int usbIdToType(int id) +Index: xf86-input-wacom-0.28.0/src/wcmUSB.c +=================================================================== +--- xf86-input-wacom-0.28.0.orig/src/wcmUSB.c ++++ xf86-input-wacom-0.28.0/src/wcmUSB.c +@@ -1120,6 +1120,31 @@ static int usbIdToType(int id) return type; } @@ -242,21 +242,21 @@ /** * Find the tool type (STYLUS_ID, etc.) based on the device_id. * -diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c -index 0ec8737..504a03a 100644 ---- a/src/wcmXCommand.c -+++ b/src/wcmXCommand.c -@@ -100,6 +100,9 @@ Atom prop_tooltype; - Atom prop_btnactions; - Atom prop_product_id; - Atom prop_pressure_recal; +Index: xf86-input-wacom-0.28.0/src/wcmXCommand.c +=================================================================== +--- xf86-input-wacom-0.28.0.orig/src/wcmXCommand.c ++++ xf86-input-wacom-0.28.0/src/wcmXCommand.c +@@ -99,6 +99,9 @@ static Atom prop_tooltype; + static Atom prop_btnactions; + static Atom prop_product_id; + static Atom prop_pressure_recal; +#ifdef LOGGING -+Atom prop_logmask; ++static Atom prop_logmask; +#endif #ifdef DEBUG - Atom prop_debuglevels; + static Atom prop_debuglevels; #endif -@@ -317,7 +320,10 @@ void InitWcmDeviceProperties(InputInfoPtr pInfo) +@@ -316,7 +319,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 +268,7 @@ #ifdef DEBUG values[0] = priv->debugLevel; values[1] = common->debugLevel; -@@ -921,6 +927,20 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, +@@ -918,6 +924,20 @@ int wcmSetProperty(DeviceIntPtr dev, Ato common->debugLevel = values[1]; } #endif @@ -289,11 +289,11 @@ } else if (property == prop_btnactions) { int nbuttons = priv->nbuttons < 4 ? priv->nbuttons : priv->nbuttons + 4; -diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h -index 6872108..9bbee03 100644 ---- a/src/xf86Wacom.h -+++ b/src/xf86Wacom.h -@@ -68,6 +68,28 @@ +Index: xf86-input-wacom-0.28.0/src/xf86Wacom.h +=================================================================== +--- xf86-input-wacom-0.28.0.orig/src/xf86Wacom.h ++++ xf86-input-wacom-0.28.0/src/xf86Wacom.h +@@ -65,6 +65,28 @@ #define DBG(lvl, priv, ...) #endif @@ -322,11 +322,11 @@ /****************************************************************************** * WacomModule - all globals are packed in a single structure to keep the * global namespaces as clean as possible. -diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h -index 476d94d..0dc1d42 100644 ---- a/src/xf86WacomDefs.h -+++ b/src/xf86WacomDefs.h -@@ -493,7 +493,9 @@ struct _WacomCommonRec +Index: xf86-input-wacom-0.28.0/src/xf86WacomDefs.h +=================================================================== +--- xf86-input-wacom-0.28.0.orig/src/xf86WacomDefs.h ++++ xf86-input-wacom-0.28.0/src/xf86WacomDefs.h +@@ -462,7 +462,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 */ @@ -337,11 +337,11 @@ int bufpos; /* position with buffer */ unsigned char buffer[BUFFER_SIZE]; /* data read from device */ -diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c -index 508326e..aace755 100644 ---- a/tools/xsetwacom.c -+++ b/tools/xsetwacom.c -@@ -152,6 +152,16 @@ static param_t parameters[] = +Index: xf86-input-wacom-0.28.0/tools/xsetwacom.c +=================================================================== +--- xf86-input-wacom-0.28.0.orig/tools/xsetwacom.c ++++ xf86-input-wacom-0.28.0/tools/xsetwacom.c +@@ -154,6 +154,16 @@ static param_t parameters[] = .arg_count = 1, }, { ++++++ n_02-Log-PROXIMITY-LOW-LEVEL-events.patch ++++++ --- /var/tmp/diff_new_pack.9UJ9lr/_old 2015-01-25 21:14:44.000000000 +0100 +++ /var/tmp/diff_new_pack.9UJ9lr/_new 2015-01-25 21:14:44.000000000 +0100 @@ -12,11 +12,11 @@ src/wcmUSB.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/src/wcmUSB.c b/src/wcmUSB.c -index e99960f..f0f8011 100644 ---- a/src/wcmUSB.c -+++ b/src/wcmUSB.c -@@ -512,6 +512,8 @@ static void usbWcmInitPadState(InputInfoPtr pInfo) +Index: xf86-input-wacom-0.28.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 ds->device_type = PAD_ID; ds->device_id = PAD_DEVICE_ID; ds->serial_num = channel; @@ -25,7 +25,7 @@ } int usbWcmGetRanges(InputInfoPtr pInfo) -@@ -1678,6 +1680,7 @@ static void usbDispatchEvents(InputInfoPtr pInfo) +@@ -1697,6 +1699,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); -@@ -1725,6 +1728,7 @@ static void usbDispatchEvents(InputInfoPtr pInfo) +@@ -1733,6 +1736,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, -@@ -1739,10 +1743,16 @@ static void usbDispatchEvents(InputInfoPtr pInfo) +@@ -1747,10 +1751,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", -@@ -1795,6 +1805,12 @@ static void usbDispatchEvents(InputInfoPtr pInfo) +@@ -1804,6 +1814,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.9UJ9lr/_old 2015-01-25 21:14:44.000000000 +0100 +++ /var/tmp/diff_new_pack.9UJ9lr/_new 2015-01-25 21:14:44.000000000 +0100 @@ -13,16 +13,16 @@ src/wcmUSB.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) -diff --git a/src/wcmCommon.c b/src/wcmCommon.c -index 238cf78..6df2133 100644 ---- a/src/wcmCommon.c -+++ b/src/wcmCommon.c -@@ -1188,9 +1188,13 @@ static void detectPressureIssue(WacomDevicePtr priv, +Index: xf86-input-wacom-0.28.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 "\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); -- } else if (!priv->oldProximity) -+ } else if (!priv->oldProximity) { +- } else if (!priv->oldState.proximity) ++ } else if (!priv->oldState.proximity) { + if (priv->minPressure) + LOG(common, LOG_PRESSURE_LOW, + "WARN: %s(%u) initial pressure %d > 0\n", @@ -33,11 +33,11 @@ priv->oldMinPressure = priv->minPressure; priv->eventCnt++; } -diff --git a/src/wcmUSB.c b/src/wcmUSB.c -index f0f8011..24477b2 100644 ---- a/src/wcmUSB.c -+++ b/src/wcmUSB.c -@@ -1193,6 +1193,8 @@ static void usbParseAbsEvent(WacomCommonPtr common, +Index: xf86-input-wacom-0.28.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 break; case ABS_PRESSURE: ds->pressure = event->value; @@ -46,7 +46,7 @@ break; case ABS_DISTANCE: ds->distance = event->value; -@@ -1292,6 +1294,8 @@ static void usbParseAbsMTEvent(WacomCommonPtr common, struct input_event *event) +@@ -1309,6 +1311,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.9UJ9lr/_old 2015-01-25 21:14:44.000000000 +0100 +++ /var/tmp/diff_new_pack.9UJ9lr/_new 2015-01-25 21:14:44.000000000 +0100 @@ -12,11 +12,11 @@ src/wcmCommon.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -diff --git a/src/wcmCommon.c b/src/wcmCommon.c -index 6df2133..68ee6e2 100644 ---- a/src/wcmCommon.c -+++ b/src/wcmCommon.c -@@ -316,9 +316,17 @@ static void sendAButton(InputInfoPtr pInfo, int button, int mask, +Index: xf86-input-wacom-0.28.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 #ifdef DEBUG WacomCommonPtr common = priv->common; #endif @@ -25,9 +25,9 @@ - common->wcmTPCButton ? "on" : "off", button, mask); + if (DO_LOG(common, LOG_BUTTON_HIGH)) { + int x = (first_val == 0 && num_val >= 1) ? -+ (int)((double)valuators[0] * priv->factorX) : -1; ++ (int)((double)valuators[0] * 1.0) : -1; + int y = (first_val <= 1 && first_val + num_val > 1) ? -+ (int)((double)(valuators[1 - first_val]) * priv->factorY) : -1; ++ (int)((double)(valuators[1 - first_val]) * 1.0) : -1; + LOG(common, LOG_BUTTON_HIGH, + "TPCButton(%s) button=%d state=%d x=%d y=%d\n", + common->wcmTPCButton ? "on" : "off", button, mask, x, y); ++++++ xf86-input-wacom-0.24.0.tar.bz2 -> xf86-input-wacom-0.28.0.tar.bz2 ++++++ ++++ 4868 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
