From c4f2be3ae0a2ac00e4f5587e904ee596072285a9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Oct 2009 10:10:13 +0200 Subject: xf86-input-evtouch: make it build again, add HAL support --- .../20_fix_calibrate_submission_directions.patch | 13 +++++ .../21_more_calibration_fixups.patch | 33 +++++++++++++ .../xf86-input-evtouch/fdi/50-Fujitsu.fdi | 21 ++++++++ .../xf86-input-evtouch/fdi/50-Panasonic.fdi | 21 ++++++++ .../xf86-input-evtouch/fdi/50-eGalax.fdi | 23 +++++++++ .../xf86-input-evtouch/fdi/50-ideaco.fdi | 23 +++++++++ .../xorg-driver/xf86-input-evtouch/fdi/50-itm.fdi | 21 ++++++++ .../xf86-input-evtouch/fdi/50-touchkit.fdi | 23 +++++++++ .../xf86-input-evtouch_0.8.8-0ubuntu3.diff | 57 ++++++++++++++++++++++ 9 files changed, 235 insertions(+) create mode 100644 recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch create mode 100644 recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-Fujitsu.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-Panasonic.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-eGalax.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-itm.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchkit.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu3.diff (limited to 'recipes/xorg-driver/xf86-input-evtouch') diff --git a/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch b/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch new file mode 100644 index 0000000000..68950a4ca3 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch @@ -0,0 +1,13 @@ +Index: xf86-input-evtouch-0.8.8/calibrate.sh +=================================================================== +--- xf86-input-evtouch-0.8.8.orig/calibrate.sh 2009-01-14 14:14:10.000000000 +0100 ++++ xf86-input-evtouch-0.8.8/calibrate.sh 2009-01-14 14:14:51.000000000 +0100 +@@ -25,7 +25,7 @@ + FAILINFO="No evtouch capable device found, if you are sure you have \n\ + an evtouch capable touchscreen, please mail the \ + resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ +-ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ ++bug url https://bugs.launchpad.net/bugs/317094, so support for your \ + device can be added." + + if [ -z "$UDI" ];then diff --git a/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch b/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch new file mode 100644 index 0000000000..abb9e51a49 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch @@ -0,0 +1,33 @@ +diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c +--- xf86-input-evtouch-0.8.8/evtouch.c ++++ xf86-input-evtouch-0.8.8/evtouch.c +@@ -305,7 +305,7 @@ + } + + if (pos_changed == 1) { +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +@@ -369,7 +369,7 @@ + priv->raw_y = priv->min_y; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog +--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c ++++ xf86-input-evtouch-0.8.8/ev_calibrate.c +@@ -218,7 +218,7 @@ + int cap_style = CapButt; /* style of the line's edje and */ + int join_style = JoinBevel; /* joined lines. */ + +- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; ++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; + + int depth; + int screen_num; diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-Fujitsu.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-Fujitsu.fdi new file mode 100644 index 0000000000..cadc5ded2f --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-Fujitsu.fdi @@ -0,0 +1,21 @@ + + + + + + + + evtouch + raw + true + 50 + on + 76 + 104 + 957 + 976 + + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-Panasonic.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-Panasonic.fdi new file mode 100644 index 0000000000..c318e12cc0 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-Panasonic.fdi @@ -0,0 +1,21 @@ + + + + + + + + evtouch + raw + true + 50 + on + 76 + 104 + 957 + 976 + + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-eGalax.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-eGalax.fdi new file mode 100644 index 0000000000..9610c5e96c --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-eGalax.fdi @@ -0,0 +1,23 @@ + + + + + + evtouch + 130 + 197 + 3945 + 3894 + 30 + 750 + click + 3 + 2 + 10 + 1 + click + 1 + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco.fdi new file mode 100644 index 0000000000..1230012f27 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco.fdi @@ -0,0 +1,23 @@ + + + + + + + + evtouch + raw + 50 + 30 + 15 + true + 50 + 7948 + 7834 + 112 + 254 + + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-itm.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-itm.fdi new file mode 100644 index 0000000000..64adcf2b8d --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-itm.fdi @@ -0,0 +1,21 @@ + + + + + + + evtouch + raw + true + 50 + on + 3815 + 3948 + 295 + 200 + 1 + CW + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchkit.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchkit.fdi new file mode 100644 index 0000000000..d4cdc6e976 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchkit.fdi @@ -0,0 +1,23 @@ + + + + + + evtouch + 130 + 197 + 3945 + 3894 + 30 + 750 + click + 3 + 2 + 10 + 1 + click + 1 + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu3.diff b/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu3.diff new file mode 100644 index 0000000000..6523db5a4c --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu3.diff @@ -0,0 +1,57 @@ +--- xf86-input-evtouch-0.8.8.orig/evtouch.c ++++ xf86-input-evtouch-0.8.8/evtouch.c +@@ -30,8 +30,8 @@ + + #define _evdev_touch_C_ + +-#include +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) ++#include ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) + #define XFREE86_V4 + #endif + +@@ -74,7 +74,6 @@ + #include "xf86_OSproc.h" + #include "xf86Xinput.h" + #include "exevents.h" +-#include "xf86OSmouse.h" + #include "randrstr.h" + + #ifndef NEED_XF86_TYPES +@@ -139,7 +138,7 @@ + "Kenan Esau", + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, ++ XORG_VERSION_CURRENT, + 0, 8, 8, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -653,14 +652,13 @@ + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(dev, 2, + local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 + xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , +@@ -671,10 +669,6 @@ + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 1); +-#else +- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, +- xf86InitValuatorDefaults(dev, 1); +-#endif + + /* Initial position of pointer on screen: Centered */ + priv->cur_x=(priv->max_x - priv->min_x)/2; -- cgit v1.2.3