diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..69575ed --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/xf86-input-wacom-0.34.2.tar.bz2 diff --git a/.xorg-x11-drv-wacom.metadata b/.xorg-x11-drv-wacom.metadata new file mode 100644 index 0000000..02880c6 --- /dev/null +++ b/.xorg-x11-drv-wacom.metadata @@ -0,0 +1 @@ +5d781ec5c8c23306d52bf559fa3af79b6a3b410e SOURCES/xf86-input-wacom-0.34.2.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Introduce-Pressure2K-config-option-for-incompatible-.patch b/SOURCES/0001-Introduce-Pressure2K-config-option-for-incompatible-.patch new file mode 100644 index 0000000..7e0dfea --- /dev/null +++ b/SOURCES/0001-Introduce-Pressure2K-config-option-for-incompatible-.patch @@ -0,0 +1,285 @@ +From d958ab79d21b57141415650daac88f9369a1c861 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Wed, 31 May 2017 10:57:12 +1000 +Subject: [PATCH] Introduce "Pressure2K" config option for incompatible + software + +It appears that some software may not be entirely compatible with the +expanded 65K pressure level range that was introduced in version 0.34.0. +Although our driver advertises the larger range in XI2 (and toolkits +like GTK+2/3 and Qt3/4/5 make use of it), there have been reports of +other software (e.g. The Foundry's "NUKE") misbehaving. + +As a workaround, this patch introduces a new boolean config option named +"Pressure2K". If enabled, it causes the driver to revert to its prior +behavior of using a pressure range of 0-2047. This option is disabled by +default, but can be turned on by adding the following configuration +snippet to a new file in the /etc/X11/xorg.conf.d directory: + +Section "InputClass" + Identifier "Wacom pressure compatibility" + MatchDriver "wacom" + Option "Pressure2K" "true" +EndSection + +Ref: https://sourceforge.net/p/linuxwacom/mailman/message/35857403/ +Ref: 3e56ce4429 (Increase full-scale pressure range from 0..2047 to 0..65535) +Signed-off-by: Jason Gerecke +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + man/wacom.man | 21 +++++++++++++++++++++ + src/wcmCommon.c | 16 ++++++++-------- + src/wcmConfig.c | 1 + + src/wcmFilter.c | 2 +- + src/wcmValidateDevice.c | 5 +++++ + src/wcmXCommand.c | 22 ++++++++++++---------- + src/xf86Wacom.c | 2 +- + src/xf86WacomDefs.h | 5 +++-- + 8 files changed, 52 insertions(+), 22 deletions(-) + +diff --git a/man/wacom.man b/man/wacom.man +index cd33438..3693c94 100644 +--- a/man/wacom.man ++++ b/man/wacom.man +@@ -185,6 +185,14 @@ slightly raised curve (softer) might be "0,5,95,100". + The pressure curve is only applicable to devices of type stylus or eraser, + other devices do not honor this setting. + .TP 4 ++.B Option \fI"Pressure2K"\fP \fI"bool"\fP ++reduces the pressure range to the range of 0 to 2048 for backwards ++compatibility with applications that have this range hardcoded. ++See section ++.B BUGS. ++This option should not be used unless the user runs one or more ++applications that rely on a hardcoded pressure range. ++.TP 4 + .B Option \fI"DebugLevel"\fP \fI"number"\fP + sets the level of debugging info for tool-specific messages. There are 12 + levels, specified by the integers between 1 and 12. All debug messages with +@@ -303,6 +311,19 @@ two separated fingers side by side, bring together i.e. pinch. + \fBZoom out:\fR + two fingers side by side, spread. Not all applications support zoom. + .PP ++.SH "BUGS" ++.SS "Pressure range increase leads to unexpected behavior" ++In version 0.34, the driver's pressure range increased from ++2048 steps to 65536 steps. The pressure axis range is advertised through the ++X Input Protocol but some applications have the previous pressure range ++hardcoded and cannot handle pressure values above 2048. This is an ++application bug but for backwards-compatibility with such applications, this ++driver provides the ++.B Pressure2K ++option to reduce the range to 2048 steps. Note that this setting applies to ++the device. Once applied, all applications will see the reduced pressure ++range. It is not possible to provide this setting on a per-application ++basis. + .SH "SEE ALSO" + __xservername__(__appmansuffix__), xorg.conf(__filemansuffix__), + xorg.conf.d(__filemansuffix__), X(__miscmansuffix__) +diff --git a/src/wcmCommon.c b/src/wcmCommon.c +index f6cfd3d..dc6ecbd 100644 +--- a/src/wcmCommon.c ++++ b/src/wcmCommon.c +@@ -1056,7 +1056,7 @@ rebasePressure(const WacomDevicePtr priv, const WacomDeviceState *ds) + + /** + * Instead of reporting the raw pressure, we normalize +- * the pressure from 0 to FILTER_PRESSURE_RES. This is ++ * the pressure from 0 to maxCurve. This is + * mainly to deal with the case where heavily used + * stylus may have a "pre-loaded" initial pressure. To + * do so, we keep the in-prox pressure and subtract it +@@ -1081,14 +1081,14 @@ normalizePressure(const WacomDevicePtr priv, const int raw_pressure) + p -= priv->minPressure; + range_left -= priv->minPressure; + } +- /* normalize pressure to 0..FILTER_PRESSURE_RES */ ++ /* normalize pressure to 0..maxCurve */ + if (range_left >= 1) + pressure = xf86ScaleAxis(p, +- FILTER_PRESSURE_RES, 0, ++ priv->maxCurve, 0, + range_left, + 0); + else +- pressure = FILTER_PRESSURE_RES; ++ pressure = priv->maxCurve; + + return (int)pressure; + } +@@ -1117,8 +1117,8 @@ setPressureButton(const WacomDevicePtr priv, int buttons, const int pressure) + { + /* don't set it off if it is within the tolerance + and threshold is larger than the tolerance */ +- if ((common->wcmThreshold > THRESHOLD_TOLERANCE) && +- (pressure > common->wcmThreshold - THRESHOLD_TOLERANCE)) ++ if ((common->wcmThreshold > (priv->maxCurve * THRESHOLD_TOLERANCE)) && ++ (pressure > common->wcmThreshold - (priv->maxCurve * THRESHOLD_TOLERANCE))) + buttons |= button; + } + } +@@ -1350,7 +1350,7 @@ int wcmInitTablet(InputInfoPtr pInfo, const char* id, float version) + if (common->wcmThreshold <= 0 && IsPen(priv)) + { + /* Threshold for counting pressure as a button */ +- common->wcmThreshold = DEFAULT_THRESHOLD; ++ common->wcmThreshold = priv->maxCurve * DEFAULT_THRESHOLD; + + xf86Msg(X_PROBED, "%s: using pressure threshold of %d for button 1\n", + pInfo->name, common->wcmThreshold); +@@ -1401,7 +1401,7 @@ static int applyPressureCurve(WacomDevicePtr pDev, const WacomDeviceStatePtr pSt + /* clip the pressure */ + int p = max(0, pState->pressure); + +- p = min(FILTER_PRESSURE_RES, p); ++ p = min(pDev->maxCurve, p); + + /* apply pressure curve function */ + if (pDev->pPressCurve == NULL) +diff --git a/src/wcmConfig.c b/src/wcmConfig.c +index 0924c43..6b269bb 100644 +--- a/src/wcmConfig.c ++++ b/src/wcmConfig.c +@@ -63,6 +63,7 @@ static int wcmAllocate(InputInfoPtr pInfo) + priv->pInfo = pInfo; + priv->common = common; /* common info pointer */ + priv->oldCursorHwProx = 0; /* previous cursor hardware proximity */ ++ priv->maxCurve = FILTER_PRESSURE_RES; + priv->nPressCtrl [0] = 0; /* pressure curve x0 */ + priv->nPressCtrl [1] = 0; /* pressure curve y0 */ + priv->nPressCtrl [2] = 100; /* pressure curve x1 */ +diff --git a/src/wcmFilter.c b/src/wcmFilter.c +index aca5cd9..e7ddb37 100644 +--- a/src/wcmFilter.c ++++ b/src/wcmFilter.c +@@ -78,7 +78,7 @@ void wcmSetPressureCurve(WacomDevicePtr pDev, int x0, int y0, + + if (pDev->pPressCurve) + filterCurveToLine(pDev->pPressCurve, +- FILTER_PRESSURE_RES, ++ pDev->maxCurve, + 0.0, 0.0, /* bottom left */ + x0/100.0, y0/100.0, /* control point 1 */ + x1/100.0, y1/100.0, /* control point 2 */ +diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c +index d2a7723..0da5076 100644 +--- a/src/wcmValidateDevice.c ++++ b/src/wcmValidateDevice.c +@@ -875,6 +875,11 @@ Bool wcmPreInitParseOptions(InputInfoPtr pInfo, Bool is_primary, + } + free(s); + ++ if (xf86SetBoolOption(pInfo->options, "Pressure2K", 0)) { ++ xf86Msg(X_CONFIG, "%s: Using 2K pressure levels\n", pInfo->name); ++ priv->maxCurve = 2048; ++ } ++ + /*Serials of tools we want hotpluged*/ + if (wcmParseSerials (pInfo) != 0) + goto error; +diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c +index 0e1d657..e18fb8f 100644 +--- a/src/wcmXCommand.c ++++ b/src/wcmXCommand.c +@@ -106,21 +106,23 @@ static Atom prop_debuglevels; + /** + * Calculate a user-visible pressure level from a driver-internal pressure + * level. Pressure settings exposed to the user assume a range of 0-2047 +- * while the driver scales everything to a range of 0-FILTER_PRESSURE_RES. ++ * while the driver scales everything to a range of 0-maxCurve. + */ +-static inline int wcmInternalToUserPressure(int pressure) ++static inline int wcmInternalToUserPressure(InputInfoPtr pInfo, int pressure) + { +- return pressure / (FILTER_PRESSURE_RES / 2048); ++ WacomDevicePtr priv = (WacomDevicePtr) pInfo->private; ++ return pressure / (priv->maxCurve / 2048); + } + + /** + * Calculate a driver-internal pressure level from a user-visible pressure + * level. Pressure settings exposed to the user assume a range of 0-2047 +- * while the driver scales everything to a range of 0-FILTER_PRESSURE_RES. ++ * while the driver scales everything to a range of 0-maxCurve. + */ +-static inline int wcmUserToInternalPressure(int pressure) ++static inline int wcmUserToInternalPressure(InputInfoPtr pInfo, int pressure) + { +- return pressure * (FILTER_PRESSURE_RES / 2048); ++ WacomDevicePtr priv = (WacomDevicePtr) pInfo->private; ++ return pressure * (priv->maxCurve / 2048); + } + + /** +@@ -276,7 +278,7 @@ void InitWcmDeviceProperties(InputInfoPtr pInfo) + } + + values[0] = (!common->wcmMaxZ) ? 0 : common->wcmThreshold; +- values[0] = wcmInternalToUserPressure(values[0]); ++ values[0] = wcmInternalToUserPressure(pInfo, values[0]); + prop_threshold = InitWcmAtom(pInfo->dev, WACOM_PROP_PRESSURE_THRESHOLD, XA_INTEGER, 32, 1, values); + + values[0] = common->wcmSuppress; +@@ -846,7 +848,7 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, + common->wcmCursorProxoutDist = value; + } else if (property == prop_threshold) + { +- const INT32 MAXIMUM = wcmInternalToUserPressure(FILTER_PRESSURE_RES); ++ const INT32 MAXIMUM = wcmInternalToUserPressure(pInfo, priv->maxCurve); + INT32 value; + + if (prop->size != 1 || prop->format != 32) +@@ -855,11 +857,11 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, + value = *(INT32*)prop->data; + + if (value == -1) +- value = DEFAULT_THRESHOLD; ++ value = priv->maxCurve * DEFAULT_THRESHOLD; + else if ((value < 1) || (value > MAXIMUM)) + return BadValue; + else +- value = wcmUserToInternalPressure(value); ++ value = wcmUserToInternalPressure(pInfo, value); + + if (!checkonly) + common->wcmThreshold = value; +diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c +index a511fd2..738690f 100644 +--- a/src/xf86Wacom.c ++++ b/src/xf86Wacom.c +@@ -200,7 +200,7 @@ static int wcmInitAxes(DeviceIntPtr pWcm) + if (!IsPad(priv)) + { + label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE); +- max = FILTER_PRESSURE_RES; ++ max = priv->maxCurve; + } + + wcmInitAxis(pInfo->dev, index, label, min, max, res, min_res, max_res, mode); +diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h +index b10a114..ec34211 100644 +--- a/src/xf86WacomDefs.h ++++ b/src/xf86WacomDefs.h +@@ -182,8 +182,8 @@ struct _WacomModel + + #define FILTER_PRESSURE_RES 65536 /* maximum points in pressure curve */ + /* Tested result for setting the pressure threshold to a reasonable value */ +-#define THRESHOLD_TOLERANCE (FILTER_PRESSURE_RES / 125) +-#define DEFAULT_THRESHOLD (FILTER_PRESSURE_RES / 75) ++#define THRESHOLD_TOLERANCE (0.008f) ++#define DEFAULT_THRESHOLD (0.013f) + + #define WCM_MAX_BUTTONS 32 /* maximum number of tablet buttons */ + #define WCM_MAX_X11BUTTON 127 /* maximum button number X11 can handle */ +@@ -285,6 +285,7 @@ struct _WacomDeviceRec + struct _WacomDeviceState oldState; /* previous state information */ + int oldCursorHwProx; /* previous cursor hardware proximity */ + ++ int maxCurve; /* maximum pressure curve value */ + int *pPressCurve; /* pressure curve */ + int nPressCtrl[4]; /* control points for curve */ + int minPressure; /* the minimum pressure a pen may hold */ +-- +2.13.0 + diff --git a/SOURCES/0001-Remove-the-device-s-fd-from-the-select-set-when-we-g.patch b/SOURCES/0001-Remove-the-device-s-fd-from-the-select-set-when-we-g.patch new file mode 100644 index 0000000..f79506f --- /dev/null +++ b/SOURCES/0001-Remove-the-device-s-fd-from-the-select-set-when-we-g.patch @@ -0,0 +1,84 @@ +From 84e81636b29cca6dc1a5423e76ac2ab2c636eb86 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 18 Jul 2017 08:41:37 +1000 +Subject: [PATCH] Remove the device's fd from the select() set when we get + ENODEV + +If the device is unplugged, the fd triggers in select/poll/... but comes back +with ENODEV. This triggers a lot of error messages in the log until finally +the udev code catches up with us and the device is removed properly. + +Catch that case by removing the fd from the select() set so we don't get +triggered to call read_input on it anymore. + +https://sourceforge.net/p/linuxwacom/bugs/337/ + +Signed-off-by: Peter Hutterer +Tested-by: crocket +Reviewed-by: Ping Cheng +(cherry picked from commit 912611608b3ba892a7c26d1be81209f4e5b009d5) +--- + src/xf86Wacom.c | 12 +++++++++--- + src/xf86Wacom.h | 2 +- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c +index 90ce793..896a8c1 100644 +--- a/src/xf86Wacom.c ++++ b/src/xf86Wacom.c +@@ -632,7 +632,8 @@ static void wcmDevReadInput(InputInfoPtr pInfo) + if (!wcmReady(pInfo)) break; + + /* dispatch */ +- wcmReadPacket(pInfo); ++ if (!wcmReadPacket(pInfo)) ++ break; + } + + #ifdef DEBUG +@@ -649,7 +650,7 @@ static void wcmDevReadInput(InputInfoPtr pInfo) + #endif + } + +-void wcmReadPacket(InputInfoPtr pInfo) ++Bool wcmReadPacket(InputInfoPtr pInfo) + { + WacomDevicePtr priv = (WacomDevicePtr)pInfo->private; + WacomCommonPtr common = priv->common; +@@ -672,7 +673,10 @@ void wcmReadPacket(InputInfoPtr pInfo) + if (errno != EAGAIN && errno != EINTR) + LogMessageVerbSigSafe(X_ERROR, 0, + "%s: Error reading wacom device : %s\n", pInfo->name, strerror(errno)); +- return; ++ if (errno == ENODEV) ++ xf86RemoveEnabledDevice(pInfo); ++ ++ return FALSE; + } + + /* account for new data */ +@@ -704,6 +708,8 @@ void wcmReadPacket(InputInfoPtr pInfo) + } + + common->bufpos = len; ++ ++ return TRUE; + } + + int wcmDevChangeControl(InputInfoPtr pInfo, xDeviceCtl * control) +diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h +index afb4e9e..ccc2d56 100644 +--- a/src/xf86Wacom.h ++++ b/src/xf86Wacom.h +@@ -120,7 +120,7 @@ char *wcmEventAutoDevProbe (InputInfoPtr pInfo); + int wcmInitTablet(InputInfoPtr pInfo, const char* id, float version); + + /* standard packet handler */ +-void wcmReadPacket(InputInfoPtr pInfo); ++Bool wcmReadPacket(InputInfoPtr pInfo); + + /* handles suppression, filtering, and dispatch. */ + void wcmEvent(WacomCommonPtr common, unsigned int channel, const WacomDeviceState* ds); +-- +2.13.6 + diff --git a/SOURCES/0001-Support-recent-display-devices-on-older-kernels.patch b/SOURCES/0001-Support-recent-display-devices-on-older-kernels.patch new file mode 100644 index 0000000..92be110 --- /dev/null +++ b/SOURCES/0001-Support-recent-display-devices-on-older-kernels.patch @@ -0,0 +1,58 @@ +From 8db05e73d6fc0f9aeb74fbe2ba109a7205d3819e Mon Sep 17 00:00:00 2001 +From: Aaron Armstrong Skomra +Date: Tue, 2 May 2017 09:48:56 -0700 +Subject: [PATCH 1/4] Support recent display devices on older kernels + +Older kernels like 2.6.30 will end up with touches +interpreted as relative events unless these devices +are explicitly added. + +Signed-off-by: Aaron Armstrong Skomra +Reviewed-by: Peter Hutterer +(cherry picked from commit 0318b1cda79261d73f04676dd662f98c84711747) +--- + src/wcmUSB.c | 8 ++++++++ + src/wcmValidateDevice.c | 8 ++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/wcmUSB.c b/src/wcmUSB.c +index 2f9d93f..295286a 100644 +--- a/src/wcmUSB.c ++++ b/src/wcmUSB.c +@@ -287,6 +287,14 @@ static struct WacomModelDesc + { WACOM_VENDOR_ID, 0x57, 200000, 200000, &usbCintiqV5, "DTK2241" }, + { WACOM_VENDOR_ID, 0x59, 200000, 200000, &usbCintiqV5, "DTH2242" }, + { WACOM_VENDOR_ID, 0x5B, 200000, 200000, &usbCintiqV5, "Cintiq 22HDT" }, ++ { WACOM_VENDOR_ID, 0x34A, 200000, 200000, &usbCintiqV5, "Mobilestudio Pro 13" }, /* Touch */ ++ { WACOM_VENDOR_ID, 0x34B, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, /* Touch */ ++ { WACOM_VENDOR_ID, 0x34D, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 13" }, ++ { WACOM_VENDOR_ID, 0x34E, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, ++ { WACOM_VENDOR_ID, 0x34F, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" }, ++ { WACOM_VENDOR_ID, 0x350, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" }, ++ { WACOM_VENDOR_ID, 0x353, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" }, /* Touch */ ++ { WACOM_VENDOR_ID, 0x354, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" }, /* Touch */ + + { WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC, "TabletPC 0x90" }, + { WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC, "TabletPC 0x93" }, +diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c +index fd27264..0da5076 100644 +--- a/src/wcmValidateDevice.c ++++ b/src/wcmValidateDevice.c +@@ -309,6 +309,14 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) + case 0x5D: /* DTH2242 Touch */ + case 0x5E: /* Cintiq 22HDT Touch */ + case 0x304:/* Cintiq 13HD */ ++ case 0x34A:/* MobileStudio Pro 13 Touch */ ++ case 0x34B:/* MobileStudio Pro 16 Touch */ ++ case 0x34D:/* MobileStudio Pro 13 */ ++ case 0x34E:/* MobileStudio Pro 13 */ ++ case 0x34F:/* Cintiq Pro 13 FHD */ ++ case 0x350:/* Cintiq Pro 16 UHD */ ++ case 0x353:/* Cintiq Pro 13 FHD Touch */ ++ case 0x354:/* Cintiq Pro 13 UHD Touch */ + TabletSetFeature(priv->common, WCM_LCD); + break; + } +-- +2.13.6 + diff --git a/SOURCES/0001-conf-add-Dell-Canvas-27-touch.patch b/SOURCES/0001-conf-add-Dell-Canvas-27-touch.patch new file mode 100644 index 0000000..97e8717 --- /dev/null +++ b/SOURCES/0001-conf-add-Dell-Canvas-27-touch.patch @@ -0,0 +1,38 @@ +From 48c2cd83ccf797fe618a48a743afee35883aecf9 Mon Sep 17 00:00:00 2001 +From: Benjamin Tissoires +Date: Fri, 3 Nov 2017 15:19:24 +0100 +Subject: [PATCH] conf: add Dell Canvas 27 touch + +The Dell canvas 27 is an external monitor with pen and touch, but the +pen is provided by Wacom, and the touch by Advanced Silicon. +To have proper touch arbitration, we need to force xf86-input-wacom +to also handle the touch part. + +Signed-off-by: Benjamin Tissoires +Reviewed-By: Jason Gerecke +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + conf/70-wacom.conf | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/conf/70-wacom.conf b/conf/70-wacom.conf +index a20e3a3..86a3f90 100644 +--- a/conf/70-wacom.conf ++++ b/conf/70-wacom.conf +@@ -101,3 +101,12 @@ Section "InputClass" + Driver "wacom" + Option "Button2" "3" + EndSection ++ ++# Dell Canvas 27 (touch part is an Advanced Silicon, pen part a Wacom) ++Section "InputClass" ++ Identifier "Dell Canvas 27 Touch" ++ MatchUSBID "2575:0204" ++ MatchDevicePath "/dev/input/event*" ++ MatchIsTouchscreen "true" ++ Driver "wacom" ++EndSection +-- +2.13.6 + diff --git a/SOURCES/0002-Support-DTH-1152-on-older-kernels.patch b/SOURCES/0002-Support-DTH-1152-on-older-kernels.patch new file mode 100644 index 0000000..71a5913 --- /dev/null +++ b/SOURCES/0002-Support-DTH-1152-on-older-kernels.patch @@ -0,0 +1,51 @@ +From eeb5d7456248cda28ba62fe2e4978bc25ff6086a Mon Sep 17 00:00:00 2001 +From: Aaron Armstrong Skomra +Date: Thu, 13 Jul 2017 12:08:03 -0700 +Subject: [PATCH 2/4] Support DTH-1152 on older kernels + +Signed-off-by: Aaron Armstrong Skomra +Reviewed-by: Peter Hutterer +(cherry picked from commit b0a055425dfb983163b1d3c673a36aebf9536430) +--- + src/wcmUSB.c | 4 +++- + src/wcmValidateDevice.c | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/wcmUSB.c b/src/wcmUSB.c +index 295286a..0b5ec57 100644 +--- a/src/wcmUSB.c ++++ b/src/wcmUSB.c +@@ -91,7 +91,7 @@ DEFINE_MODEL(usbGraphire4, "USB Graphire4", 4); + DEFINE_MODEL(usbBamboo, "USB Bamboo", 4); + DEFINE_MODEL(usbBamboo1, "USB Bamboo1", 4); + DEFINE_MODEL(usbBambooFun, "USB BambooFun", 4); +-DEFINE_MODEL(usbCintiq, "USB PL/Cintiq", 4); ++DEFINE_MODEL(usbCintiq, "USB PL/Cintiq/DTU", 4); + DEFINE_MODEL(usbCintiqPartner, "USB CintiqPartner", 4); + DEFINE_MODEL(usbIntuos, "USB Intuos1", 5); + DEFINE_MODEL(usbIntuos2, "USB Intuos2", 5); +@@ -232,6 +232,8 @@ static struct WacomModelDesc + { WACOM_VENDOR_ID, 0xC7, 100000, 100000, &usbCintiq, "DTU1931" }, + { WACOM_VENDOR_ID, 0xCE, 100000, 100000, &usbCintiq, "DTU2231" }, + { WACOM_VENDOR_ID, 0xF0, 100000, 100000, &usbCintiq, "DTU1631" }, ++ { WACOM_VENDOR_ID, 0x35a, 100000, 100000, &usbCintiq, "DTH1152" }, ++ { WACOM_VENDOR_ID, 0x368, 100000, 100000, &usbCintiq, "DTH1152" }, /* Touch */ + + { WACOM_VENDOR_ID, 0x41, 100000, 100000, &usbIntuos2, "Intuos2 4x5" }, + { WACOM_VENDOR_ID, 0x42, 100000, 100000, &usbIntuos2, "Intuos2 6x8" }, +diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c +index 0da5076..bfff8e7 100644 +--- a/src/wcmValidateDevice.c ++++ b/src/wcmValidateDevice.c +@@ -317,6 +317,8 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) + case 0x350:/* Cintiq Pro 16 UHD */ + case 0x353:/* Cintiq Pro 13 FHD Touch */ + case 0x354:/* Cintiq Pro 13 UHD Touch */ ++ case 0x35A:/* DTH-1152*/ ++ case 0x368:/* DTH-1152 Touch */ + TabletSetFeature(priv->common, WCM_LCD); + break; + } +-- +2.13.6 + diff --git a/SOURCES/0003-Add-support-for-2nd-generation-Intuos-Pro.patch b/SOURCES/0003-Add-support-for-2nd-generation-Intuos-Pro.patch new file mode 100644 index 0000000..17d1d93 --- /dev/null +++ b/SOURCES/0003-Add-support-for-2nd-generation-Intuos-Pro.patch @@ -0,0 +1,35 @@ +From aeda04439e615da71c61d9ffab020741b7149d8a Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Thu, 10 Aug 2017 15:34:29 -0700 +Subject: [PATCH 3/4] Add support for 2nd-generation Intuos Pro + +This tablet is usable without this patch, but the device type is missing +the WCM_RING flag. This prevents the ring valuator from being initialized +correctly, and in turn causes recent versions of gnome-control-center to +not allow configuration of the ring. + +https://bugzilla.gnome.org/show_bug.cgi?id=785358 + +Signed-off-by: Jason Gerecke +Reviewed-by: Ping Cheng +(cherry picked from commit 1a2a23c2df0ec0fd0bf46432db58f32914a6a09f) +--- + src/wcmValidateDevice.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c +index bfff8e7..8eac0dd 100644 +--- a/src/wcmValidateDevice.c ++++ b/src/wcmValidateDevice.c +@@ -202,6 +202,8 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) + TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD); + /* fall through */ + ++ case 0x357: /* Intuos Pro 2 M */ ++ case 0x358: /* Intuos Pro 2 L */ + case 0x314: /* Intuos Pro S */ + case 0x315: /* Intuos Pro M */ + case 0x317: /* Intuos Pro L */ +-- +2.13.6 + diff --git a/SOURCES/0004-Correct-device-flags-for-multiple-devices.patch b/SOURCES/0004-Correct-device-flags-for-multiple-devices.patch new file mode 100644 index 0000000..aedf5b5 --- /dev/null +++ b/SOURCES/0004-Correct-device-flags-for-multiple-devices.patch @@ -0,0 +1,72 @@ +From 8bda3dad98f3e1d62bf4499ecb95e2692830adaa Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Thu, 10 Aug 2017 15:35:43 -0700 +Subject: [PATCH 4/4] Correct device flags for multiple devices + +The device flags set in wcmDeviceTypeKeys must be set properly in order +for the driver to correctly identify and use specific tablet features. +Several devices are missing flags that e.g. indicate they support +pen rotation or have touch rings. + +Fixes: 0318b1c ("Support recent display devices on older kernels") +Fixes: 3578b91 ("Add support for Cintiq 22HDT and 13HD, DTK2241 and DTH2242.") +Fixes: df7f165 ("Add tablet_type to WacomModel") +Signed-off-by: Jason Gerecke +Reviewed-by: Ping Cheng +(cherry picked from commit b30e2d27fdb30ff4b425fc62432cab636fe163b9) +--- + src/wcmValidateDevice.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c +index 8eac0dd..21ccd5f 100644 +--- a/src/wcmValidateDevice.c ++++ b/src/wcmValidateDevice.c +@@ -199,7 +199,12 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) + { + case 0xF8: /* Cintiq 24HDT */ + case 0xF4: /* Cintiq 24HD */ +- TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD); ++ TabletSetFeature(priv->common, WCM_DUALRING); ++ /* fall through */ ++ ++ case 0x34D: /* MobileStudio Pro 13 */ ++ case 0x34E: /* MobileStudio Pro 13 */ ++ TabletSetFeature(priv->common, WCM_LCD); + /* fall through */ + + case 0x357: /* Intuos Pro 2 M */ +@@ -300,23 +305,24 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) + case 0xED: /* TPC with 1FGT */ + case 0x90: /* TPC */ + case 0x97: /* TPC */ ++ case 0x9F: /* TPC */ + case 0xEF: /* TPC */ + TabletSetFeature(priv->common, WCM_TPC); + break; + +- case 0x9F: ++ case 0x304:/* Cintiq 13HD */ ++ case 0x34F:/* Cintiq Pro 13 FHD */ ++ case 0x350:/* Cintiq Pro 16 UHD */ ++ TabletSetFeature(priv->common, WCM_ROTATION); ++ /* fall-through */ ++ + case 0xF6: /* Cintiq 24HDT Touch */ + case 0x57: /* DTK2241 */ + case 0x59: /* DTH2242 Pen */ + case 0x5D: /* DTH2242 Touch */ + case 0x5E: /* Cintiq 22HDT Touch */ +- case 0x304:/* Cintiq 13HD */ + case 0x34A:/* MobileStudio Pro 13 Touch */ + case 0x34B:/* MobileStudio Pro 16 Touch */ +- case 0x34D:/* MobileStudio Pro 13 */ +- case 0x34E:/* MobileStudio Pro 13 */ +- case 0x34F:/* Cintiq Pro 13 FHD */ +- case 0x350:/* Cintiq Pro 16 UHD */ + case 0x353:/* Cintiq Pro 13 FHD Touch */ + case 0x354:/* Cintiq Pro 13 UHD Touch */ + case 0x35A:/* DTH-1152*/ +-- +2.13.6 + diff --git a/SPECS/xorg-x11-drv-wacom.spec b/SPECS/xorg-x11-drv-wacom.spec new file mode 100644 index 0000000..d88d6c9 --- /dev/null +++ b/SPECS/xorg-x11-drv-wacom.spec @@ -0,0 +1,496 @@ +%global tarball xf86-input-wacom +%global moduledir %(pkg-config xorg-server --variable=moduledir ) +%global driverdir %{moduledir}/input + +# Disable gitdate to build from a fixed release +#global gitdate 20111110 +#global gitversion 12345689 + +Summary: Xorg X11 wacom input driver +Name: xorg-x11-drv-wacom +Version: 0.34.2 +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +URL: http://www.x.org +License: GPLv2+ +Group: User Interface/X Hardware Support + +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2 +%endif + +Patch01: 0001-Introduce-Pressure2K-config-option-for-incompatible-.patch +# Bug 1496650 - Fix hang after unplugging a device +Patch02: 0001-Remove-the-device-s-fd-from-the-select-set-when-we-g.patch +# Bug 1496659 - Fix device flags for the 13HD, 22HDT and the 2nd gen Intuos Pro +Patch03: 0001-Support-recent-display-devices-on-older-kernels.patch +Patch04: 0002-Support-DTH-1152-on-older-kernels.patch +Patch05: 0003-Add-support-for-2nd-generation-Intuos-Pro.patch +Patch06: 0004-Correct-device-flags-for-multiple-devices.patch +Patch07: 0001-conf-add-Dell-Canvas-27-touch.patch + +ExcludeArch: s390 s390x + +BuildRequires: xorg-x11-server-devel >= 1.10.99.902 +BuildRequires: xorg-x11-util-macros >= 1.3.0 +BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel +BuildRequires: autoconf automake libtool +BuildRequires: systemd systemd-devel + +Requires: Xorg %(xserver-sdk-abi-requires ansic) +Requires: Xorg %(xserver-sdk-abi-requires xinput) + +Provides: linuxwacom = %{version}-%{release} +Obsoletes: linuxwacom <= 0.8.4.3 + +%description +X.Org X11 wacom input driver for Wacom tablets. + +%prep +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch01 -p1 +%patch02 -p1 +%patch03 -p1 +%patch04 -p1 +%patch05 -p1 +%patch06 -p1 +%patch07 -p1 + +%build +autoreconf --force -v --install || exit 1 +%configure --disable-static --disable-silent-rules --enable-debug \ + --with-systemd-unit-dir=%{_unitdir} \ + --with-udev-rules-dir=%{_prefix}/lib/udev/rules.d/ + +make %{_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +# FIXME: Remove all libtool archives (*.la) from modules directory. This +# should be fixed in upstream Makefile.am or whatever. +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- + +mv $RPM_BUILD_ROOT/%{_datadir}/X11/xorg.conf.d/70-wacom.conf $RPM_BUILD_ROOT/%{_datadir}/X11/xorg.conf.d/50-wacom.conf +mv $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/wacom.rules $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/70-wacom.rules + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc AUTHORS README GPL +%if !0%{?gitdate} +# ChangeLog is autogenerated by make dist, we don't run it from git builds +%doc ChangeLog +%endif +%{driverdir}/wacom_drv.so +%{_mandir}/man4/wacom.4* +%{_mandir}/man1/xsetwacom.1* +%{_datadir}/X11/xorg.conf.d/50-wacom.conf +%{_bindir}/xsetwacom +%{_prefix}/lib/udev/rules.d/70-wacom.rules +%{_bindir}/isdv4-serial-inputattach +%{_unitdir}/wacom-inputattach@.service + +%package devel +Summary: Xorg X11 wacom input driver development package +Group: Development/Libraries + +Requires: xorg-x11-server-devel >= 1.7.0 +Requires: pkgconfig + +%description devel +X.Org X11 wacom input driver development files. + +%files devel +%defattr(-,root,root,-) +%doc GPL +%{_libdir}/pkgconfig/xorg-wacom.pc +%{_includedir}/xorg/Xwacom.h +%{_includedir}/xorg/wacom-properties.h +%{_includedir}/xorg/wacom-util.h +%{_includedir}/xorg/isdv4.h +%{_bindir}/isdv4-serial-debugger + +%changelog +* Wed Nov 08 2017 Peter Hutterer 0.34.2-4 +- Add custom .conf snippet for the Dell Canvas 27 touchscreen (#1506538) + +* Wed Oct 04 2017 Peter Hutterer 0.34.2-3 +- Fix hang after unplugging a device (#1496650) +- Correct device flags for some Cintiqs and Intuos pros (#1496659) + +* Thu Jun 01 2017 Peter Hutterer 0.34.2-2 +- Add Pressure2K option for backwards-compatibility with applications that + hardcode the previous pressure range (#1457024) + +* Mon Mar 13 2017 Peter Hutterer 0.34.2-1 +- wacom 0.34.2 (#1401655) + +* Mon Feb 27 2017 Peter Hutterer 0.34.0-3 +- Cancel timers on DEVICE_OFF to avoid potential invalid memory dereference + +* Fri Feb 24 2017 Peter Hutterer 0.34.0-2 +- Don't update properties from within the input thread + +* Fri Jan 27 2017 Peter Hutterer 0.34.0-1 +- wacom 0.34.0 (#1401655) + +* Mon May 04 2015 Peter Hutterer 0.29.0-1 +- wacom 0.29.0 (#1194889) + +* Thu Feb 13 2014 Peter Hutterer 0.23.0-6 +- Use systemd for starting inputattach on serial devices (#1039445) + +* Wed Jan 15 2014 Adam Jackson - 0.23.0-5 +- 1.15 ABI rebuild + +* Fri Dec 27 2013 Daniel Mach - 0.23.0-4 +- Mass rebuild 2013-12-27 + +* Wed Nov 06 2013 Adam Jackson - 0.23.0-3 +- 1.15RC1 ABI rebuild + +* Fri Oct 25 2013 Adam Jackson - 0.23.0-2 +- ABI rebuild + +* Sat Sep 28 2013 Peter Hutterer 0.23.0-1 +- wacom 0.23.0 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 12 2013 Peter Hutterer - 0.22.0-2 +- Fix changelog - 'percent signs in specfile changelog should be escaped' + +* Thu Jul 11 2013 Peter Hutterer 0.22.0-1 +- wacom 0.22.0 + +* Wed Jun 26 2013 Peter Hutterer 0.21.99.1-2 +- This time with the right tarball + +* Wed Jun 26 2013 Peter Hutterer 0.21.99.1-1 +- wacom 0.21.99.1 + +* Tue Apr 30 2013 Peter Hutterer 0.21.0-1 +- wacom 0.21.0 + +* Tue Apr 23 2013 Peter Hutterer 0.20.99.1-1 +- wacom 0.20.99.1 + +* Tue Mar 19 2013 Adam Jackson 0.20.0-4 +- Less RHEL customization + +* Thu Mar 07 2013 Peter Hutterer - 0.20.0-3 +- require xorg-x11-server-devel, not -sdk + +* Thu Mar 07 2013 Peter Hutterer - 0.20.0-2 +- ABI rebuild + +* Tue Mar 05 2013 Peter Hutterer 0.20.0-1 +- wacom 0.20.0 + +* Wed Feb 27 2013 Peter Hutterer 0.19.99.1-1 +- wacom 0.19.99.1 + +* Fri Feb 15 2013 Peter Hutterer - 0.19.0-4 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 0.19.0-3 +- ABI rebuild + +* Thu Jan 10 2013 Adam Jackson - 0.19.0-2 +- ABI rebuild + +* Fri Jan 04 2013 Peter Hutterer 0.19.0-1 +- wacom 0.19.0 + +* Thu Dec 20 2012 Peter Hutterer 0.18.99.1-1 +- wacom 0.18.99.1 + +* Wed Oct 31 2012 Peter Hutterer - 0.18.0-2 +- Fix {?dist} tag + +* Tue Oct 30 2012 Peter Hutterer 0.18.0-1 +- wacom 0.18.0 + +* Mon Oct 22 2012 Peter Hutterer 0.17.99.1-1 +- wacom 0.17.99.1 + +* Wed Sep 26 2012 Peter Hutterer 0.17.0-1 +- wacom 0.17.0 + +* Mon Aug 27 2012 Peter Hutterer 0.16.1-1 +- wacom 0.16.1 + +* Thu Aug 23 2012 Peter Hutterer 0.16.0-6 +- Pre-allocate the tap timer to avoid malloc locks in SIGIO handler +- Log in signal-safe manner + +* Sun Aug 05 2012 Peter Hutterer 0.16.0-5 +- Align git snapshot building with other drivers +- Add autotools/libtool to BuildRequires, we need those when building git + snapshots +- Always run autoreconf + +* Sun Aug 05 2012 Peter Hutterer 0.16.0-4 +- Add support for Cintiq 22HD + +* Sun Jul 22 2012 Fedora Release Engineering - 0.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 18 2012 Dave Airlie - 0.16.0-2 +- ABI rebuild + +* Tue Jul 10 2012 Peter Hutterer 0.16.0-1 +- wacom 0.16.0 + +* Thu Jun 07 2012 Peter Hutterer 0.15.0-2 +- Replace udev with systemd, use prefix for udev rules + +* Fri May 04 2012 Peter Hutterer 0.15.0-1 +- wacom 0.15.0 + +* Mon Apr 23 2012 Peter Hutterer 0.14.0-4 +- Update rules to start inputattach automatically + +* Thu Apr 05 2012 Adam Jackson - 0.14.0-3 +- RHEL arch exclude updates + +* Mon Mar 26 2012 Peter Hutterer 0.14.0-2 +- Bump version number so F18 version is >= F17 version. + +* Mon Mar 12 2012 Peter Hutterer 0.14.0-1 +- wacom 0.14.0 + +* Wed Mar 07 2012 Peter Hutterer 0.13.99.2-1 +- wacom 0.13.99.2 + +* Thu Mar 01 2012 Peter Hutterer 0.13.99.1-1 +- wacom 0.13.99.1 + +* Sat Feb 11 2012 Peter Hutterer - 0.13.0-4 +- ABI rebuild + +* Fri Feb 10 2012 Peter Hutterer - 0.13.0-3 +- ABI rebuild + +* Tue Jan 24 2012 Peter Hutterer - 0.13.0-2 +- ABI rebuild + +* Tue Jan 17 2012 Peter Hutterer 0.13.0-1 +- wacom 0.13.0 + +* Wed Jan 04 2012 Peter Hutterer 0.12.99.1-3 +- Fix changelog, dates got mixed up + +* Wed Jan 04 2012 Peter Hutterer - 0.12.99.1-2 +- Rebuild for server 1.12 + +* Wed Jan 04 2012 Peter Hutterer 0.12.99.1-1 +- wacom 0.12.99.1 + +* Tue Nov 29 2011 Peter Hutterer 0.12-1 +- wacom 0.12.0 + +* Mon Nov 14 2011 Adam Jackson - 0.11.99.1-6.20111110 +- ABI rebuild + +* Thu Nov 10 2011 Peter Hutterer 0.11.99.1-5.2011110 +- And another snapshot, this time with the build fixes. + +* Thu Nov 10 2011 Peter Hutterer 0.11.99.1-4.2011110 +- Update to latest git snapshot + +* Wed Nov 09 2011 ajax - 0.11.99.1-3.20111031 +- ABI rebuild + +* Tue Nov 01 2011 Peter Hutterer 0.11.99.1-2 +- libXinerama is now needed to build too + +* Tue Nov 01 2011 Peter Hutterer 0.11.99.1 +- Update to 0.11.99.1 (from git) + +* Thu Aug 18 2011 Adam Jackson - 0.11.99-4.20110527 +- Rebuild for xserver 1.11 ABI + +* Thu Jul 21 2011 Peter Hutterer * 0.11.99-3.20110527 +- Fix udev rules file again: + - use ==, not = to compare subsystems + - assign ENV{NAME} even though we shouldn't, the server currently requires it + - assign the lot to subsystem pnp too, that's where the server reads it + from + +* Wed Jul 20 2011 Peter Hutterer 0.11.99-2.20110527 +- Fix udev rules file (thanks to Lennart): + - The subsystem cannot be assigned. + - Append the attrs to the device name + - Match only on tty/pnp + +* Thu Jul 07 2011 Peter Hutterer +- Disable silent rules on build + +* Fri May 27 2011 Peter Hutterer 0.11.99-1.20110527 +- Update to current git + +* Tue Apr 19 2011 Peter Hutterer 0.11.0-1 +- wacom 0.11.0 + +* Fri Apr 08 2011 Peter Hutterer 0.10.99.2-1.20110408 +- 0.10.99.2 from git + +* Fri Apr 01 2011 Peter Hutterer 0.10.99.1-2.20110401 +- Require libudev + +* Fri Apr 01 2011 Peter Hutterer 0.10.99.1-1.20110401 +- 0.10.99.1 from git + +* Tue Mar 15 2011 Peter Hutterer 0.10.99-1.20110315 +- Today's git snapshot + +* Thu Feb 17 2011 Peter Hutterer 0.10.11-1 +- wacom 0.10.11 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.10.10-3.20101122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Nov 25 2010 Peter Hutterer - 0.10.10-2.20101122 +- Rebuild for server 1.10 + +* Mon Nov 22 2010 Peter Hutterer 0.10.10-1 +- Update to today's git snapshot (0.10.10), an emergency release. + +* Fri Nov 19 2010 Peter Hutterer 0.10.9-2 +- require libXrandr-devel for xsetwacom + +* Fri Nov 19 2010 Peter Hutterer 0.10.9-1 +- Update to today's git snapshot (0.10.9) + +* Wed Oct 27 2010 Adam Jackson 0.10.8-3 +- Add ABI requires magic (#542742) + + +* Mon Aug 02 2010 Peter Hutterer 0.10.8-2 +- Update to today's git snapshot. + +* Mon Jul 26 2010 Peter Hutterer 0.10.8-1 +- wacom 0.10.8 (from git) + +* Thu Jul 08 2010 Adam Jackson 0.10.7-4 +- Install GPL in -devel too + +* Mon Jul 05 2010 Peter Hutterer 0.10.7-3.20100705 +- Update to git to build against newest X server. + +* Mon Jul 05 2010 Peter Hutterer - 0.10.7-2.20100621 +- rebuild for X Server 1.9 + +* Mon Jun 21 2010 Peter Hutterer 0.10.7-1.20100621 +- Update to 0.10.7 from git. + +* Wed Jun 16 2010 Peter Hutterer 0.10.6-6.20100616 +- Update to today's git snapshot. + +* Thu Jun 03 2010 Peter Hutterer 0.10.6-5.2010603 +- Update to today's git snapshot. + +* Thu Jun 03 2010 Peter Hutterer 0.10.6-5.20100521 +- Update udev rules file to include Fujitsu serial tablets. (#598168) +- Update udev rules file to set ID_INPUT_TABLET + +* Fri May 21 2010 Peter Hutterer 0.10.6-4.20100521 +- Update to today's git snapshot. +- wacom-0.10.6-serial-identifiers.patch: drop, upstream. + +* Tue May 18 2010 Peter Hutterer 0.10.6-3.20100427 +- Install wacom udev rules file to identify serial devices. + +* Tue Apr 27 2010 Peter Hutterer 0.10.6-2.20100427 +- wacom-0.10.6-serial-identifiers.patch: add some more serial IDs to the + config file. + +* Tue Apr 27 2010 Peter Hutterer 0.10.6-1.20100427 +- wacom 0.10.6 (from git) + +* Thu Apr 15 2010 Peter Hutterer 0.10.5-5.20100325 +- Fix up missing directory change from last commit. + +* Thu Apr 15 2010 Peter Hutterer 0.10.5-4.20100325 +- Install config snippet in $datadir/X11/xorg.conf.d +- rename to 50-wacom.conf to match upstream naming + +* Thu Mar 25 2010 Peter Hutterer 0.10.5-3.20100325 +- Update to today's git snapshot. + +* Tue Mar 23 2010 Peter Hutterer 0.10.5-2.20100319 +- Enable the debug properties. + +* Fri Mar 19 2010 Peter Hutterer 0.10.5-1.20100319 +- Update to today's git snapshot (0.10.5) + +* Tue Mar 16 2010 Peter Hutterer 0.10.4-7.20100316 +- Update to today's git snapshot. + +* Fri Mar 05 2010 Peter Hutterer 0.10.4-6.20100305 +- Update to today's git snapshot. + +* Thu Mar 04 2010 Peter Hutterer 0.10.4-5.20100219 +- Fix 10-wacom.conf for N-Trig devices: rename the class (copy/paste error) + and only take event devices. (Related #526270) + +* Fri Feb 19 2010 Peter Hutterer 0.10.4-4.20100219 +- Add stuff required to build from upstream git. +- Update to today's git snapshot. + +* Wed Feb 17 2010 Peter Hutterer 0.10.4-3 +- Add 10-wacom.conf, the fdi file doesn't work anymore. +- Drop hal requires. + +* Wed Feb 03 2010 Peter Hutterer 0.10.4-2 +- Update sources to sourceforge, 0.10.4 was released on sf only. +- Remove wacom.fdi, we're just using the one shipped by the driver now. + +* Thu Jan 21 2010 Peter Hutterer 0.10.4-1 +- wacom 0.10.4 + +* Thu Jan 21 2010 Peter Hutterer - 0.10.3-3 +- Rebuild for server 1.8 + +* Tue Jan 05 2010 Peter Hutterer 0.10.3-2 +- BuildRequires and Requires libX11 and libXi for xsetwacom. + +* Tue Jan 05 2010 Peter Hutterer 0.10.3-1 +- wacom 0.10.3 + +* Thu Dec 03 2009 Peter Hutterer 0.10.2-1 +- wacom 0.10.2 + +* Fri Nov 20 2009 Peter Hutterer 0.10.1-2 +- cvs add 10-wacom.fdi, this time really. + +* Fri Nov 20 2009 Peter Hutterer 0.10.1-1 +- wacom 0.10.1 +- BuildRequires xorg-x11-util-macros 1.3.0 +- Remove unnecessary 'find' directive, changed upstream. +- Add GPL document +- Install 10-wacom.fdi file. +- Provides: linuxwacom + +* Thu Nov 19 2009 Peter Hutterer 0.10.0-3 +- Use smp_mflags when building. + +* Wed Nov 18 2009 Peter Hutterer 0.10.0-2 +- Obsolete linuxwacom, don't Conflict with it. +- Remove trailing dot from summary (rpmlint warning). +- Remove spurious executable bits from source files (rpmlint warning). +- Add AUTHORS, ChangeLog, README to doc + +* Mon Oct 19 2009 Peter Hutterer 0.10.0-1 +- Initial import +