diff options
| author | David-John Willis <John.Willis@Distant-earth.com> | 2009-10-27 20:17:22 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-10-28 10:16:26 +0100 |
| commit | 25e876d130bfc84cfd1cbbc38372c7695ca2b586 (patch) | |
| tree | c11c462c799b95594d6994d303fa884826520e7b | |
| parent | de1d0546fdda0079f15af58259a64f680340d081 (diff) | |
xf86-input-evtouch: Use latest Ubuntu package diff and tweak configure.
* Add configure support to generate calibration app and udev rules for touchscreens.
3 files changed, 4216 insertions, 61 deletions
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 deleted file mode 100644 index 6523db5a4c..0000000000 --- a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu3.diff +++ /dev/null @@ -1,57 +0,0 @@ ---- 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 <xf86Version.h> --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) -+#include <xorgVersion.h> -+#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; diff --git a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff b/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff new file mode 100644 index 0000000000..abe5b8f4ba --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff @@ -0,0 +1,4210 @@ +--- 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 <xf86Version.h> +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) ++#include <xorgVersion.h> ++#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; +--- xf86-input-evtouch-0.8.8.orig/debian/changelog ++++ xf86-input-evtouch-0.8.8/debian/changelog +@@ -0,0 +1,259 @@ ++xf86-input-evtouch (0.8.8-0ubuntu6) karmic; urgency=low ++ ++ * Add debian/fdi/50-touchpack.fdi to support TouchPack touchscreen devices ++ (Clevo TN120 series, ASUS EeeTOP, Winux Tablet, ...) ++ (LP: #401039) ++ ++ -- Mirsal Ennaime <mirsal@winux.fr> Sat, 24 Oct 2009 18:10:18 +0200 ++ ++xf86-input-evtouch (0.8.8-0ubuntu5) karmic; urgency=low ++ ++ * control: Add dependencies for ttf-freefont and x-ttcidfont-conf. ++ These dependencies are required by one of the earlier patches. ++ (LP: #299178) ++ * Add debian/fdi/50-elo-2700.fdi to support EloTouch 2700 IntelliTouch ++ Touchmonitor Interface. ++ (LP: #362308) ++ * Add debian/fdi/50-gunze.fdi to support GUNZE USB Touch Panel ++ (LP: #368135) ++ ++ -- Bryce Harrington <bryce@ubuntu.com> Wed, 14 Oct 2009 02:10:14 -0700 ++ ++xf86-input-evtouch (0.8.8-0ubuntu4) karmic; urgency=low ++ ++ * Add debian/fdi/50-ideaco-idc6681.fdi to support IDEACO IDC 6681 ++ touchscreen. ++ (LP: #378357) ++ ++ -- Bryce Harrington <bryce@ubuntu.com> Wed, 14 Oct 2009 01:35:50 -0700 ++ ++xf86-input-evtouch (0.8.8-0ubuntu3) jaunty; urgency=low ++ ++ * 21_more_calibration_fixups.patch: Make calibration work on xserver-1.6 ++ ++ -- Thomas Jaeger <ThJaeger@gmail.com> Sun, 22 Mar 2009 20:58:58 -0400 ++ ++xf86-input-evtouch (0.8.8-0ubuntu2) jaunty; urgency=low ++ ++ * install fdi files to /usr/share/hal/fdi/policy/20thirdparty so we make ++ sure its not synaptics that gets used. ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Wed, 28 Jan 2009 16:17:39 +0100 ++ ++xf86-input-evtouch (0.8.8-0ubuntu1) jaunty; urgency=low ++ ++ * New upstream release, packaged by Thomas Jaeger (ThJaeger@gmail.com) ++ Thanks a lot for fixing the header issues !! (LP: #312098) ++ - fix rotation issues (LP: #222164) ++ * 20_fix_calibrate_submission_directions.patch, point lshal submission to a ++ LP bug instead of pointing people to a subscription only ++ mailing list (LP: #307503) ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Wed, 14 Jan 2009 14:04:58 -0500 ++ ++xf86-input-evtouch (0.8.7-4build2) jaunty; urgency=low ++ ++ * Rebuild against the new xserver. ++ ++ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 15 Dec 2008 11:49:43 +0200 ++ ++xf86-input-evtouch (0.8.7-4build1) intrepid; urgency=low ++ ++ * Rebuild due to x11proto-input fix in 283921 ++ ++ -- Bryce Harrington <bryce@ubuntu.com> Sat, 18 Oct 2008 01:45:02 -0700 ++ ++xf86-input-evtouch (0.8.7-3ubuntu12) intrepid; urgency=low ++ ++ * add more touchscreen .fdi files ++ * install all touchscreen .fdi files to /usr/share/hal/fdi/policy/10osvendor ++ with sequence number 50 so they will override evdev and mouse settings ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Thu, 16 Oct 2008 01:50:09 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu11) intrepid; urgency=low ++ ++ * fix .fdi install location to make sure hal doesnt prefer mouse settings ++ for evtouch devices ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Mon, 29 Sep 2008 22:39:37 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu10) intrepid; urgency=low ++ ++ * update halification patch of calibration script to make sure it doesnt ++ fire if no evtouch capable device is in hal. ++ * add .fdi file for Fujitsu lifebook (and other Fujitsu driven touchscreen ++ devices with Fujitsu USB Touch Panel). ++ * add sane defaults to ideaco and eGalax fdi files. ++ * add selection of dialog frontends to show the info in X. ++ * move zenity to recommends, add xdialog and kdebase-bin (for kdialog) as ++ different dialog options. ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Thu, 25 Sep 2008 19:57:51 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu9) intrepid; urgency=low ++ ++ * quieten down initscript a bit (we dont want a newline for each applied ++ value on screen) ++ * call initscript at end of calibration, so new values are applied without ++ having to restart the system. ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Thu, 25 Sep 2008 13:27:41 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu8) intrepid; urgency=low ++ ++ * add 09_calibrate-script-halification.patch, adds hal functionallity to ++ calibration tool, makes the script work under X and gives useful output ++ through zenity dialogs ++ * add 10_ev_calibrate_fixups.patch, fix ev_calibrate.c to use a useful font ++ in calibration, make it write to /etc/evtouch/config in a format that can ++ be parsed by the evtouch hal-set-property initscript ++ * add calibrate.desktop and calibrate icon file (uuencoded), add sharutils ++ to build-deps ++ * make sure /etc/evtouch dir is created by the package so ev_calibrate can ++ write its config there. ++ * add hal to dependencies, zenity to suggests ++ * add xserver-xorg-input-evtouch initscript to apply calibration data on ++ system boot via hal-set-property ++ * include .fdi files for ideaco and eGalax touchscreens (hopefully there ++ will be more soon) ++ * closes (LP: #261873) ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Thu, 25 Sep 2008 00:54:44 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu7) intrepid; urgency=low ++ ++ * add CURSORDIR to debian/rules to make calibration tool work ++ * link calibration tools to /usr/bin so the low level calibration tools work ++ on a basic level ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Wed, 24 Sep 2008 13:27:49 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu6) intrepid; urgency=low ++ ++ * add libtouch.c to 08_fix_xf86memset.patch. (LP: #254848) ++ ++ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 07 Aug 2008 11:36:17 +0300 ++ ++xf86-input-evtouch (0.8.7-3ubuntu5) intrepid; urgency=low ++ ++ * add 08_fix_xf86memset.patch, fixes (LP: #254848) ++ ++ -- Oliver Grawert <ogra@ubuntu.com> Tue, 05 Aug 2008 17:46:19 +0200 ++ ++xf86-input-evtouch (0.8.7-3ubuntu4) intrepid; urgency=low ++ ++ * Uh, ok. Don't apply 04_include_xf86_ansic_h.patch. (FTBFS) ++ ++ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 08 Jul 2008 14:22:13 +0300 ++ ++xf86-input-evtouch (0.8.7-3ubuntu3) intrepid; urgency=low ++ ++ * libtouch.c: don't #include <xf86_ansic.h>. It is no more. (FTBFS) ++ ++ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 08 Jul 2008 14:13:32 +0300 ++ ++xf86-input-evtouch (0.8.7-3ubuntu2) intrepid; urgency=low ++ ++ * Rebuild against the new xserver-xorg-dev. ++ ++ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 07 Jul 2008 17:44:38 +0300 ++ ++xf86-input-evtouch (0.8.7-3ubuntu1) hardy; urgency=low ++ ++ * Merge from debian unstable, remaining changes: (LP: #190004) ++ - Change maintainer address. ++ - Change the default font from helvetica to fixed. ++ * Drop Pepper/Q1 patch, upstream has a slightly different fix ++ * Upstream includes fix for running on amd64 (LP: #155880) ++ ++ -- Steve Magoun <steve.magoun@canonical.com> Thu, 07 Feb 2008 14:09:00 -0500 ++ ++xf86-input-evtouch (0.8.7-3) unstable; urgency=low ++ ++ * work(!!!!) with xserver-xorg-core 1.4 ++ * added xf86-input-evtouch-0.8.7-misc.patch from ++ http://www.postnuklear.de/xorg-patches/ (Closes: #443726) ++ * bump Standards-Version to 3.7.3 ++ * use Vcs and Homepage headers in debian/control ++ ++ -- Mattia Dongili <malattia@debian.org> Sat, 02 Feb 2008 21:32:15 +0900 ++ ++xf86-input-evtouch (0.8.7-2ubuntu1) hardy; urgency=low ++ ++ * Merge from debian unstable, remaining changes: ++ - Change maintainer address. ++ - Add patch from Pepper to handle the touch screen on the Samsung Q1 ++ Ultra correctly. ++ - Change the default font from helvetica to fixed. ++ ++ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 13 Nov 2007 10:53:54 +0200 ++ ++xf86-input-evtouch (0.8.7-2) unstable; urgency=low ++ ++ * build with xserver-xorg-core 1.4 ++ ++ -- Mattia Dongili <malattia@debian.org> Mon, 17 Sep 2007 16:52:54 +0900 ++ ++xf86-input-evtouch (0.8.7-1) unstable; urgency=low ++ ++ * New upstream release: ++ - Added "fix" for AMD64-crashes on touch (Closes: #431925) ++ * updated xsfbs ++ * removed 03_fix_compile_warns.patch applied upstream ++ ++ -- Mattia Dongili <malattia@debian.org> Tue, 11 Sep 2007 22:42:32 +0900 ++ ++xf86-input-evtouch (0.8.6-1ubuntu1) gutsy; urgency=low ++ ++ * Add patch from Pepper to handle the touch screen on the Samsung Q1 ++ Ultra correctly. ++ * Change the default font from helvetica to fixed. ++ ++ -- Tollef Fog Heen <tfheen@ubuntu.com> Wed, 11 Jul 2007 18:52:09 +0200 ++ ++xf86-input-evtouch (0.8.6-1) unstable; urgency=low ++ ++ * New upstream release: ++ - Fixed classic rotation (Closes: #417546) ++ * removed 04_fix_segv_on_device_off.patch, applied upstream ++ * updated evtouch.html ++ ++ -- Mattia Dongili <malattia@debian.org> Sat, 16 Jun 2007 14:31:58 +0900 ++ ++xf86-input-evtouch (0.8.5-3) unstable; urgency=low ++ ++ * Use xsfbs to get xserver dependencies automatically. ++ ++ -- Mattia Dongili <malattia@debian.org> Sun, 10 Jun 2007 10:44:51 +0900 ++ ++xf86-input-evtouch (0.8.5-2) unstable; urgency=low ++ ++ * Fix SEGV on vt switch (DeviceClose actually). ++ ++ -- Mattia Dongili <malattia@debian.org> Wed, 30 May 2007 15:55:59 +0900 ++ ++xf86-input-evtouch (0.8.5-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Mattia Dongili <malattia@debian.org> Fri, 11 May 2007 18:28:41 +0900 ++ ++xf86-input-evtouch (0.8.3-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Mattia Dongili <malattia@debian.org> Mon, 19 Feb 2007 12:34:26 +0100 ++ ++xf86-input-evtouch (0.8.2-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Mattia Dongili <malattia@debian.org> Sat, 03 Feb 2007 20:14:40 +0100 ++ ++xf86-input-evtouch (0.8.1-1) unstable; urgency=low ++ ++ * Initial release. (Closes: #404932) ++ ++ -- Mattia Dongili <malattia@debian.org> Fri, 29 Dec 2006 15:01:18 +0100 ++ +--- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.links ++++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.links +@@ -0,0 +1,2 @@ ++usr/lib/xf86-input-evtouch/ev_calibrate usr/bin/ev_calibrate ++/usr/lib/xf86-input-evtouch/calibrate.sh usr/bin/calibrate_touchscreen +--- xf86-input-evtouch-0.8.8.orig/debian/copyright ++++ xf86-input-evtouch-0.8.8/debian/copyright +@@ -0,0 +1,34 @@ ++This package was debianized Mattia Dongili <malattia@debian.org> based on the work ++by Rex Tsai <chihchun@debian.org.tw> on Sun, 03 Dec 2006 18:53:48 +0100. ++ ++It was downloaded from http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html ++ ++Upstream Author: Kenan Esau <kenan.esau@conan.de> ++ ++Copyright: 2004-2006 Kenan Esau <kenan.esau@conan.de>, Baltmannsweiler, Germany. ++ ++License: ++ ++ Permission to use, copy, modify, distribute, and sell this software and its ++ documentation for any purpose is hereby granted without fee, provided that ++ the above copyright notice appear in all copies and that both that ++ copyright notice and this permission notice appear in supporting ++ documentation, and that the names of copyright holders not be ++ used in advertising or publicity pertaining to distribution of the ++ software without specific, written prior permission. The copyright holders ++ make no representations about the suitability of this ++ software for any purpose. It is provided "as is" without express or ++ implied warranty. ++ ++ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS ++ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND ++ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ++ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF ++ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ++ ++The Debian packaging is (C) 2006, Mattia Dongili <malattia@debian.org> and ++is licensed under the GPL, see `/usr/share/common-licenses/GPL'. ++ +--- xf86-input-evtouch-0.8.8.orig/debian/calibrate.desktop ++++ xf86-input-evtouch-0.8.8/debian/calibrate.desktop +@@ -0,0 +1,12 @@ ++[Desktop Entry] ++Name=Calibrate Touchscreen ++Name[de]=Touchscreen Kalibrieren ++Comment=Run the touchscreen calibration tool ++Encoding=UTF-8 ++Exec=gksu /usr/bin/calibrate_touchscreen ++Terminal=false ++Type=Application ++Icon=calibrate.png ++StartupNotify=true ++Categories=GTK;System;Settings; ++X-Ubuntu-Gettext-Domain=evtouch +--- xf86-input-evtouch-0.8.8.orig/debian/calibrate.uuencode ++++ xf86-input-evtouch-0.8.8/debian/calibrate.uuencode +@@ -0,0 +1,50 @@ ++begin 644 calibrate.uunecode ++MB5!.1PT*&@H````-24A$4@```"0````D"`8```#A`)B8`````7-21T(`KLX< ++MZ0````9B2T=$`/\`_P#_H+VGDP````EP2%ES```-UP``#=<!0BB;>`````=T ++M24U%!]@)&!(8$5T-YE8```>]241!5%C#[9AMC%Q5&<=_YYX[.UOF95^Z[Z7; ++M+K2496'9I=)`1&RD#29H\04,B5\$/_C!^(&HI89$HX&LA*CPP=<0$WQ!H@E& ++M_62,"9(B+QL+0FB`LD5IR]ANNVQG=F;NO>>>\_CASLS.6Y<:$S]YDY-S9^:< ++M\_S/\_R?Y_S/P/^?C1\%\.V''D@KS[NWKZ]OO_9T^G\)P#H7%(OGGW'.?>?0 ++MP?O+:N&A!U5O;^_//_ZQ`Y^]=,M6E/KO#(C(?SQ^966%W_W^MW\X?[YTNZ\4 ++M4]?.7GO7^-@8E<K:?VE8Z(Y':G.Z?Y_-9KCFFMG;GOWKX9T^,-'?/Z#C..;8 ++MB16^^\OGT9ZW08`;ZUP,[-H\U39'ZN'B2Y^YGNFI8?*YO`=L\5$-,Y3*$9G, ++M)CYZTZ[N>+K$TSF'B`,4GN=U'7,A&OSQ\!N4*E'S(.UWVY-UR0Z>?^9/W'#S ++M_LX=-X$Y<^IM@FJ%@>$),MD\VO>[@NI*:)':FHUU50>@.+:4*P&GWCG.3Q]] ++M@,&1+6R=VMEUP=@8",\ST7\)KRT=8V+R,K*Y/KP+A;S#ENO@5L=,8QTGWODG ++M3S[V"-5*F2<?>X1"H4`E,"VM7(U8JP3TYS+LVC'%/XZ]SKFSYU@K!QUC+]1, ++M[#KXZ".MH$SLR`R.<??!A_G>U^[F[H,/`U`)30N/1(0X,N0&,UQ^V10KRP7> ++M6WV/=&Z0E)4+<JYU\[8C/_SUU$DX8F)+)4B,?^$;/Z$:&%`*I11*4>L5(H(Q ++M%G%"?W\_FICE,P7\=(;T)1E2J32>]O&TCU+)GBM!Q.I:0+$<4`X,[Q96VSF$ ++MWUY78NNH-GG#\Q1*>0T@":@Z>(=U#JTUD^-#[)Z;8F1D,X\_\6MT;S^YD6WX ++MV2%*D<?98LA:$.&<X%S"G6IMX\U/)X=B2S6,"8TEC!VA<43Q>C-6,-81Q99J ++MI80)R@#TY;-\ZO;;.'#;K6P=SO&CA^_G^JD,B\\]S=+2,<KE(EJ!KS6^K_&: ++MPKDAJ:T3PC@!$\6.R$H3$#!6B&*A&D3TE$\0U*K[Y.1D([M&1T?)Y7+LOV4O ++M5PU4N66'3_7T$BXJHSV%[_MHWT]`R88>$F(KB5>:/6.%R$H-5#*F>.8$G[CU ++MPVBM$1%&1D8(PQ`1H:^O#VLM0T-#7#TSPS?O_PHCJ2)1Z2Q(G(#2&N5UEGZO ++M_1RRSC7"E8`23+TYP3@(8X<+2URY:[T^34]/8ZU%1.CM[<48@]::OKX^E%+L ++MVC9"M'8.92,\3Z.UQE->1['UVN-H71*BR"2>,34/&2?$%HQ-2D"V5Y//YS$F ++M(>;,S`SCX^.("/OW[R>52N'[/G-S<SCGN.+R[=BPC(LCM*?P=/=CIK-26R&( ++M+%J#+Z`U>`Z4!:4$4(AS#$NYD?[U+*VWT='1QM$R/S^/<XZ)\5&\N(R+0Q32 ++MR%QI([7?13`1&HLO"BL*[12^K]`(OM9XVD-PC3.Y;KQ=FM1;_<ED,E0K:^3% ++MKA=-19=*W7&T*IJ+I5(*A6JJ0TESM=\/'#C0XJ5ZC6D'%<=Q(T1)KYJ%1G<. ++M)7.E#7;KNU(*Y6E.GX\(P["K8&L&4P?Y;N%?I-)9/-U3`]1=5'6$K%J)6#E[ ++MOJ9M/#POT3EUK9/4&@<EG[\=>9D;;]C3XJ$Z=XPQ&&,(PY`P#'GSK>-4C$>J ++M%!)($92F6@D[-MT":.?D((_>^Y$-%:%(8K"\=AE_?^55;KQA3X/<(D(410T0 ++M01`011%!$'#JY`GNW'<M<[OW,#"X&:TU".RX=.!"I!:RFU+,7S'678:V94,8 ++M#O#TRMNLKJXVTC\(`H(@:("I`SMY\B1*8JZ;F>(#5T^2R^5J!ZYT"YF4PC"@ ++MM[<7:^T%O=(.,)U.,SL[R^'#A]F[=V\+D&9@QA@6%Q?9O'DSHZ-CY//];-K4 ++MVU*#/$_7^;CF@WKEQ<47GR@4"G=JK5,;Z>?VU(["B-=>.\K<W!S66L(PI%JM ++MMG@G#$..'U\BE\]Q[*TW*96+I%*IUK6<N).G3OP9>.E]Q>_"PH(&>''Q^0>G ++MIZ^ZK[^O/RG[GH>(4"P6V;9M.[.SLX@(U6JU`:P.:&%AH7#TZ-&#F4SF+WOV ++M[#F];]\^VW9YD$.'#CF`B[X6WO/YS_WJ0S?=?%<VFVG*.@]K+>?.G:-0*+"Z ++MNHKOITBGTPV2ETHECKQTY-5G#S][#_`&L+;11<K?X(JM=N^>[YG?/3\P/#QT ++MQ_C8Q*=G9F9J@FV]%'B>PMK+,2:B7"Y3K08-+BH%J52*;=NW7CDW/_O!(T=> ++M/O7"<R\8YYP%;)>BU^$A70.9^NI]7]ZW96+BA]EL;G!L;*QG^LKIFM3H?E.L ++M>Z0.QKEU76UMS.MOO,Z9,Z>K:^7RJ>-+2U_\P?=_O`@8(`+BI+BM>TC5WGN` ++M'J54S_C8V-=O/_#)L;H>WOC2)XWOM>[F]#37S>\&V.1$=CSUU&^^!=Q1`^/7 ++M>@,8O^T848":F!COR>5RVS.92][_FGQ1_P.T?L[G\SN'AX=ZEI?/QC6[#=M^ ++MT^JF;B6.8[V\O/SRSW[Q>%X$!:)$1+6^"P@UN=^P6#MSE:C$[Z)00DUE**5$ ++MH20R45$I%0!A6]BD6P#JB/TZGYK>=5/SVG;7[#K7U.H$CIMZ4^OC)G)SL6FO ++GFHRV@U`=>F4]<^K`V@'*1O'^-VN3A-O<,!`M`````$E%3D2N0F"" ++` ++end +--- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.dirs ++++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.dirs +@@ -0,0 +1 @@ ++etc/evtouch +--- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.init ++++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.init +@@ -0,0 +1,59 @@ ++#!/bin/sh ++ ++[ -x /usr/bin/hal-set-property ] || exit 0 ++[ -x /usr/bin/hal-find-by-property ] || exit 0 ++ ++. /etc/evtouch/config > /dev/null 2>&1 || exit 0 ++ ++do_start() { ++ UDI=$(/usr/bin/hal-find-by-property --key input.x11_driver --string evtouch) ++ ++ hal_set () { ++ if [ -n "$2" ]; then ++ /usr/bin/hal-set-property --udi "$UDI" --key input.x11_options.$1 --string "$2" >/dev/null 2>&1 ++ else ++ /usr/bin/hal-set-property --udi "$UDI" --key input.x11_options.$1 --remove >/dev/null 2>&1 ++ fi ++ } ++ ++ hal_set minx $MINX ++ hal_set miny $MINY ++ hal_set maxx $MAXX ++ hal_set maxy $MAXY ++ hal_set x0 $X0 ++ hal_set y0 $Y0 ++ hal_set x1 $X1 ++ hal_set y1 $Y1 ++ hal_set x2 $X2 ++ hal_set y2 $Y2 ++ hal_set x3 $X3 ++ hal_set y3 $Y3 ++ hal_set x4 $X4 ++ hal_set y4 $Y4 ++ hal_set x5 $X5 ++ hal_set y5 $Y5 ++ hal_set x6 $X6 ++ hal_set y6 $Y6 ++ hal_set x7 $X7 ++ hal_set y7 $Y7 ++ hal_set x8 $X8 ++ hal_set y8 $Y8 ++} ++ ++case "$1" in ++ start|"") ++ do_start ++ ;; ++ restart|reload|force-reload) ++ echo "Error: argument '$1' not supported" >&2 ++ exit 3 ++ ;; ++ stop) ++ # No-op ++ ;; ++ *) ++ echo "Usage: evtouch [start|stop]" >&2 ++ exit 3 ++ ;; ++esac ++ +--- xf86-input-evtouch-0.8.8.orig/debian/rules ++++ xf86-input-evtouch-0.8.8/debian/rules +@@ -0,0 +1,85 @@ ++#!/usr/bin/make -f ++# -*- makefile -*- ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++include debian/xsfbs/xsfbs.mk ++ ++PACKAGE=xserver-xorg-input-evtouch ++ ++CFLAGS = -Wall -g ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ CFLAGS += -O0 ++else ++ CFLAGS += -O2 ++endif ++ ++configure: configure-stamp ++configure-stamp: patch ++ dh_testdir ++ # Add here commands to configure the package. ++ ++ CURSORDIR=/usr/share/xf86-input-evtouch ./configure --prefix=/usr --enable-evcalibrate ++ touch configure-stamp ++ ++build: build-stamp ++ ++build-stamp: configure-stamp ++ dh_testdir ++ ++ # Add here commands to compile the package. ++ $(MAKE) CFLAGS="$(CFLAGS)" ++ #docbook-to-man debian/evtouch.sgml > evtouch.1 ++ ++ touch $@ ++ ++clean: xsfclean clean-patched unpatch ++clean-patched: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp configure-stamp ++ ++ # Add here commands to clean up after the build process. ++ [ ! -f Makefile ] || $(MAKE) distclean ++ ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ # Add here commands to install the package into debian/tmp ++ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp ++ ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# We have nothing to do by default. ++ ++# Build architecture-dependent files here. ++binary-arch: build install serverabi ++ dh_testdir ++ dh_testroot ++ dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=.a ++ dh_installchangelogs ChangeLog ++ dh_installdocs ++ dh_installexamples ++ dh_installman ++ mkdir -p debian/xserver-xorg-input-evtouch/usr/share/pixmaps ++ uudecode -o debian/xserver-xorg-input-evtouch/usr/share/pixmaps/calibrate.png debian/calibrate.uuencode ++ dh_installinit -a --no-start -u"start 25 2 3 4 5 ." ++ dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install configure +--- xf86-input-evtouch-0.8.8.orig/debian/control ++++ xf86-input-evtouch-0.8.8/debian/control +@@ -0,0 +1,23 @@ ++Source: xf86-input-evtouch ++Section: x11 ++Priority: optional ++Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> ++XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org> ++Uploaders: Mattia Dongili <malattia@debian.org> ++Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt, sharutils ++Standards-Version: 3.7.3 ++Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch ++Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git ++Homepage: http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html ++ ++Package: xserver-xorg-input-evtouch ++Architecture: any ++Depends: ${shlibs:Depends}, ${xserver:Depends}, hal, ttf-freefont, x-ttcidfont-conf ++Provides: ${xinpdriver:Provides} ++Recommends: zenity | kdebase-bin | xidalog ++Description: Touchscreen-Driver for X.Org/XFree86 server ++ This XFree/X.Org driver provides support for touchscreens input devices. ++ The driver is actually an evdev-driver which supports events for moving ++ in absolute coordinates, relative coordinates and mouse-buttons. ++ . ++ +--- xf86-input-evtouch-0.8.8.orig/debian/README.Debian ++++ xf86-input-evtouch-0.8.8/debian/README.Debian +@@ -0,0 +1,16 @@ ++xf86-input-evtouch for Debian ++----------------------------- ++ ++Evtouch is a Touchscreen-Driver for X. ++ ++Be sure to calibrate the device and set correct parameters in your ++xorg.conf, see README.calibrate and find the necessary helpers ++in /usr/lib/xf86-input-evtouch. ++ ++A complete reference can be found on-line at ++http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html ++or in /usr/share/doc/xserver-xorg-input-evtouch on your system. ++ ++Check /proc/bus/input/devices to find out your touchscreen device. ++ ++ -- Mattia Dongili <malattia@debian.org>, Sat, 09 Dec 2006 18:26:37 +0100 +--- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.install ++++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.install +@@ -0,0 +1,4 @@ ++usr/lib/* ++usr/share/* ++../fdi/* usr/share/hal/fdi/policy/20thirdparty ++../calibrate.desktop usr/share/applications/ +--- xf86-input-evtouch-0.8.8.orig/debian/docs ++++ xf86-input-evtouch-0.8.8/debian/docs +@@ -0,0 +1,4 @@ ++README ++README.calibration ++TODO ++debian/evtouch.html +--- xf86-input-evtouch-0.8.8.orig/debian/compat ++++ xf86-input-evtouch-0.8.8/debian/compat +@@ -0,0 +1 @@ ++5 +--- xf86-input-evtouch-0.8.8.orig/debian/evtouch.html ++++ xf86-input-evtouch-0.8.8/debian/evtouch.html +@@ -0,0 +1,248 @@ ++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
++"http://www.w3.org/TR/html4/loose.dtd"><html>
++<head>
++<meta NAME="allow-search" content="YES">
++<meta NAME="searchtitle" content="Conan's Homepage/X touchscreen
++driver">
++<meta NAME="keywords" CONTENT="conan touchscreen driver Xorg XFree">
++<meta NAME="description" CONTENT="Xorg/XFree touchscreen driver">
++<meta NAME="page-type" CONTENT=""><meta NAME="revisit-after" CONTENT="14 days">
++<meta NAME="ROBOTS" CONTENT="ALL">
++<meta NAME="audience" CONTENT="All">
++<meta NAME="content-language" CONTENT="en">
++<meta NAME="author" content="kenan.esau@conan.de">
++<link rel="StyleSheet" type="text/css" href="../style.css">
++<title>Xorg Touchscreen Driver</title>
++</head>
++<body>
++<div class="header">
++Last updated: 09.06.2007
++</div>
++<h1>Linux-Touchscreen Driver for X</h1>
++<div>
++Evtouch is a Touchscreen-Driver for X. This site contains the <a
++href=#config">configuration and installation</a> description as well as the
++possibility to <a href="#download">download</a> the driver.
++</div>
++<h2><a name="config">Installation/Configuration</a></h2>
++<ol><li>
++<div>
++<a href="#download">Download</a> the tarball and extract it to some
++temporary directory.
++</div>
++<div class="shell">tar xzvf evtouch-xx.yy.tar.gz</div>
++<div>
++Copy the file "evtouch_drv.so" to the appropriate location
++(Some distributions use "/usr/X11R6/lib/modules/input" or
++"/usr/lib/xorg/modules/input/" (for Ubuntu)).
++</div>
++<div>
++Insert the lines below to the file "/etc/X11/XF86Config-4" or
++"/etc/X11/xorg.conf".
++</div>
++<div class="code">
++<a name="config"></a>
++Section "InputDevice"<br>
++ Identifier "touchscreen"<br>
++ Driver "evtouch"<br>
++ Option "Device" "/dev/input/event1"<br>
++ Option "DeviceName" "touchscreen"<br>
++ Option "MinX" "98"<br>
++ Option "MinY" "43"<br>
++ Option "MaxX" "940"<br>
++ Option "MaxY" "925"<br>
++ Option "ReportingMode" "Raw"<br>
++ Option "Emulate3Buttons"<br>
++ Option "Emulate3Timeout" "50"<br>
++ Option "SendCoreEvents" "On"<br>
++EndSection<br>
++</div>
++<li>Beware that some distributions use other names for the device. Some use
++"/dev/input/evdevX" and others use "/dev/input/eventX". </li>
++<li>Add the line below to the file "/etc/X11/XF86Config-4" or
++"/etc/X11/xorg.conf" to the section "ServerLayout".<br>
++<div class="code">InputDevice "touchscreen" "CorePointer"</div>
++</li>
++<li>
++If your Y-axis is interchanged you might have used the wrong
++event-device. Maybe you should try the next few event-devices
++(/dev/event[1-9]).
++</li>
++</ol>
++
++<div class="warning">Since Xorg 7.2 there is always a default-mouse-pointer which will run simultaneously with evtouch if you do not prevent it from loading. It is extremely important that you add the following to your configuration. Otherwise you will get double click events and all kind of strange things.</div>
++
++<ol>
++<li>
++<div>Add the following new input-device to your xorg.conf:</div>
++<div class="code">
++Section "InputDevice"<br>
++ Identifier "dummy"<br>
++ Driver "void"<br>
++ Option "Device" "/dev/input/mice"<br>
++EndSection<br>
++</div>
++</li>
++<li>
++<div>Add the following line your your "ServerLayout"-section:</div>
++<div class="code">InputDevice "dummy"</div>
++</li>
++</ol>
++
++<div>
++Calibration is also supported since V0.6.0. You can also reuse your
++settings from the old driver for the 2.6 driver. Actually you only
++have to exchange the driver name in the "Inputdevice"-section from
++"lbtouch" to "evtouch" and change the "Device".
++</div>
++
++<h2>Button-Events</h2>
++
++<div>
++With the state-machine based code you can have the three types of button actions (button up, down, click) which are issued in different states of the state-machine. So the complete behaviour is configurable.
++</div>
++
++<div>
++Have a look at <a href="libtouch.html">Libtouch</a> to see which default-actions are hard-coded in the driver and what you have to do to change the default-behaviour.
++</div>
++<br>
++
++<h2><a name="advanced">Advanced Configuration</a></h2>
++
++<h3>Changing Timers</h3>
++
++<div>
++If you are not confident with the default behaviour of your touchpanel you
++can configure certain timers which change its behaviour.
++</div>
++
++<table class="options" align="center" cellpadding="5" cellspacing="0">
++ <tr>
++ <th class="even"> Option </th>
++ <th class="even"> Description </th>
++ <th class="even"> Default-Value </td>
++ </tr>
++ <tr>
++ <td class="odd"> TapTimer </td>
++ <td class="odd"> This timer starts when the state MAYBETAPPED is
++entered. When this timer expires a tap-event is issued and the state
++changes to UNTOUCHED.</td>
++ <td class="odd"> 200 ms </td>
++ </tr>
++ <tr>
++ <td class="even"> LongTouchTimer </td>
++ <td class="even"> This timer is always started when the state TOUCHED
++is entered. When the timer expires before you untouch the screen again the
++state moves to LONGTOUCHED and on entering that state a longtouch-event is
++issued.</td>
++ <td class="even"> 400 ms </td>
++ </tr>
++ <tr>
++ <td class="odd"> Emulate3Buttons </td>
++ <td class="odd"> Enable emulation of three button support </td>
++ <td class="odd"> true -- enabled </td>
++ <tr>
++ <td class="even"> Emulate3Timeout </td>
++ <td class="even"> If both buttons are pressed/released before this timer
++expires a
++"middle press/release"-event is generated. This timer starts to run as soon as
++a button is pressed. </td>
++ <td class="even"> 50 ms </td>
++ </tr>
++ <tr>
++ <td class="odd"> MoveLimit </td>
++ <td class="odd"> If the pen moves out of this radius a "mouse-press"-event
++becomes impossible. </td>
++ <td class="odd"> 30 Pixels </td>
++ </tr>
++ <tr>
++ <td class="even"> Rotate </td>
++ <td class="even"> There are two valid values:<br>
++ <code class="even">CW</code> -- Rotate the screen clockwise<br>
++ <code class="even">CCW</code> -- Rotate the screen counter-clockwise<br>
++ Everything else will be treated as "no rotation".
++ </td>
++ <td class="even"> no rotation </td>
++ </tr>
++ <tr>
++ <td class="odd"> SwapX </td>
++ <td class="odd"> This option is in the driver since V0.61. When set to 1
++the X-axis is
++ swapped. This option is applied BEFORE the rotation-option.
++ </td>
++ <td class="odd"> false -- no swapping </td>
++ </tr>
++ <tr>
++ <td class="even"> SwapY</td>
++ <td class="even"> This option is in the driver since V0.61. When set to 1
++the Y-axis is
++ swapped. This option is applied BEFORE the rotation-option.
++ </td>
++ <td class="even"> false -- no swapping </td>
++ </tr>
++</table>
++
++<br>
++If you find bugs or if you have comment/wishes please send mail to <a
++href="mailto:lifebook@conan.de" target="Inhalt">lifebook@conan.de</a><br>
++
++<h2>Download<a name="download"></a></h2>
++<div align="center"><h3>Touchscreen-Driver for X</h3></div>
++This driver should work for XFree 4.x and Xorg 6.8.x.<br>
++Have a look at the <a href="CHANGELOG.evtouch">CHANGELOG</a>.<br>
++V0.8.2 was removed since it was broken -- sorry for the inconvenience.<br><br>
++V0.8.4 contains udev-rules for dynamically creating a softlink to the "correct" device. Please feel free to add your rules to this file and send the patches to me.<br>
++<table align="center">
++ <tr>
++ <td>Precompiled driver for X V0.8.6</td>
|