diff options
| author | Robert Noland <rnoland@FreeBSD.org> | 2010-05-03 18:21:04 +0000 |
|---|---|---|
| committer | Robert Noland <rnoland@FreeBSD.org> | 2010-05-03 18:21:04 +0000 |
| commit | 501c53e70249ac3d48b46b6a0598b011542b1a48 (patch) | |
| tree | b57af15c63d02dbae4f67c708d429cca44ea728b /x11-drivers | |
| parent | - Remove APACHE_VERSION left overs [1], fix make index issues (diff) | |
Pull patches from git to fix build on newer Xorg.
Notes
Notes:
svn path=/head/; revision=253622
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xf86-input-mutouch/Makefile | 2 | ||||
| -rw-r--r-- | x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c | 70 |
2 files changed, 71 insertions, 1 deletions
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index 0ddebee520c7..d9d88f72c324 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-input-mutouch PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c b/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c new file mode 100644 index 000000000000..3ed8660d2323 --- /dev/null +++ b/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c @@ -0,0 +1,70 @@ +--- src/xf86MuTouch.c.orig 2010-05-03 13:16:26.000000000 -0500 ++++ src/xf86MuTouch.c 2010-05-03 13:16:34.000000000 -0500 +@@ -426,9 +426,9 @@ + * or we will feed X with quite bogus event positions. + */ + if (priv->x_inverted) +- cur_x = priv->max_x - cur_x; ++ cur_x = priv->max_x - cur_x + priv->min_x; + if (priv->y_inverted) +- cur_y = priv->max_y - cur_y; ++ cur_y = priv->max_y - cur_y + priv->min_y; + xf86PostMotionEvent(local_to_use->dev, TRUE, 0, 2, cur_x, cur_y); + + /* +@@ -749,6 +749,10 @@ + unsigned char req[MuT_PACKET_SIZE]; + unsigned char reply[MuT_BUFFER_SIZE]; + char *id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus"; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_label; ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + switch(mode) { + +@@ -766,7 +770,11 @@ + /* + * Device reports button press for up to 1 button. + */ +- if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) { ++ if (InitButtonClassDeviceStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ &btn_label, ++#endif ++ map) == FALSE) { + ErrorF("Unable to allocate ButtonClassDeviceStruct\n"); + return !Success; + } +@@ -779,6 +787,9 @@ + * screen to fit one meter. + */ + if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels, ++#endif + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, + #endif +@@ -787,11 +798,19 @@ + return !Success; + } + else { +- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, ++ InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ priv->min_x, priv->max_x, + 9500, + 0 /* min_res */, + 9500 /* max_res */); +- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y, ++ InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ priv->min_y, priv->max_y, + 10500, + 0 /* min_res */, + 10500 /* max_res */); |