# HG changeset patch # User Christophe Lincoln # Date 1394976933 -3600 # Node ID 9f329def90a6513834654fa64864949c0c44e2ed # Parent d716e8d592848504e7e6a5548764e8bb93996391 Remove obsolet X input-evtouch, input-microtouch, input-plpevtch diff -r d716e8d59284 -r 9f329def90a6 xorg-xf86-input-evtouch/receipt --- a/xorg-xf86-input-evtouch/receipt Sun Mar 16 14:14:43 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="xorg-xf86-input-evtouch" -VERSION="0.8.8" -CATEGORY="x-window" -SHORT_DESC="Xorg server protocol." -MAINTAINER="pankso@slitaz.org" -LICENSE="MIT" -SOURCE="xf86-input-evtouch" -TARBALL="$SOURCE-$VERSION.tar.bz2" -WEB_SITE="http://www.x.org/" -WGET_URL="http://www.conan.de/touchscreen/$TARBALL" - -DEPENDS="xorg-server" -BUILD_DEPENDS="xorg-server-dev" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - grep -qs dummy evtouch.c && patch -p1 < $stuff/evtouch.u - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --with-xorg-module-dir=/usr/lib/X11/modules \ - --enable-evcalibrate \ - $CONFIGURE_ARGS && - make && - make DESTDIR=$DESTDIR install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/usr $fs - rm -f $fs/usr/lib/X11/modules/input/*.la -} - diff -r d716e8d59284 -r 9f329def90a6 xorg-xf86-input-evtouch/stuff/evtouch.u --- a/xorg-xf86-input-evtouch/stuff/evtouch.u Sun Mar 16 14:14:43 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -Remove unused variables and code just to make gcc happy - -Index: xserver-xorg-input-evtouch/evtouch.c -=================================================================== ---- xserver-xorg-input-evtouch.orig/evtouch.c 2009-01-21 20:06:50.647249439 +0900 -+++ xserver-xorg-input-evtouch/evtouch.c 2009-01-21 20:07:39.518253785 +0900 -@@ -352,7 +352,6 @@ void EVTouchProcessAbs(EVTouchPrivatePtr - void EVTouchProcessRel(EVTouchPrivatePtr priv) - { - struct input_event *ev; /* packet being/just read */ -- int dummy; - - ev = &priv->ev; - if ( ev->code == REL_X ) { -@@ -745,17 +744,6 @@ EVTouchNewPacket (EVTouchPrivatePtr priv - - - --static unsigned char --EVTouchRead(EVTouchPrivatePtr priv) --{ -- unsigned char c; -- XisbBlockDuration (priv->buffer, EV_TIMEOUT); -- c = XisbRead(priv->buffer); -- return (c); --} -- -- -- - static Bool - EVTouchGetPacket (EVTouchPrivatePtr priv) - { -From: Thomas Jaeger -Date: Sun, 22 Mar 2009 20:58:58 -0400 -Subject: Make calibration work on xserver-1.6 - -Stolen from Ubuntu. - -Index: xserver-xorg-input-evtouch/ev_calibrate.c -=================================================================== ---- xserver-xorg-input-evtouch.orig/ev_calibrate.c -+++ xserver-xorg-input-evtouch/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; -Index: xserver-xorg-input-evtouch/evtouch.c -=================================================================== ---- xserver-xorg-input-evtouch.orig/evtouch.c -+++ xserver-xorg-input-evtouch/evtouch.c -@@ -306,7 +306,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, -Index: xserver-xorg-input-evtouch/evtouch.c -=================================================================== ---- xserver-xorg-input-evtouch.orig/evtouch.c -+++ xserver-xorg-input-evtouch/evtouch.c -@@ -30,10 +30,8 @@ - - #define _evdev_touch_C_ - --#include --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) -+#include - #define XFREE86_V4 --#endif - - /***************************************************************************** - * Standard Headers -@@ -74,7 +72,6 @@ - #include "xf86_OSproc.h" - #include "xf86Xinput.h" - #include "exevents.h" --#include "xf86OSmouse.h" - #include "randrstr.h" - - #ifndef NEED_XF86_TYPES -@@ -139,7 +136,7 @@ - "Kenan Esau", - MODINFOSTRING1, - MODINFOSTRING2, -- XF86_VERSION_CURRENT, -+ XORG_VERSION_CURRENT, - 0, 8, 8, - ABI_CLASS_XINPUT, - ABI_XINPUT_VERSION, -@@ -590,6 +587,10 @@ - EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); - unsigned char map[EV_MAX_BUTTONS]; - int i; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ Atom btn_label; -+ Atom axis_labels[2] = { 0, 0 }; -+#endif - - for (i = 0; i < EV_MAX_BUTTONS; i++) - map[i] = i; -@@ -628,7 +629,11 @@ - /* - * Device reports button press for 5 buttons. - */ -- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) -+ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ &btn_label, -+#endif -+ map) == FALSE) - { - ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); - return BadAlloc; -@@ -652,26 +657,43 @@ - * 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, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels, -+#endif -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 -+ xf86GetMotionEvents, -+#endif - 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, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 -+ xf86InitValuatorAxisStruct(dev, 0, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[0], -+#endif -+ 0, priv->screen_width, - 1024, - EV_AXIS_MIN_RES /* min_res */ , - EV_AXIS_MAX_RES /* max_res */ ); - xf86InitValuatorDefaults(dev, 0); -- xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, -+ xf86InitValuatorAxisStruct(dev, 1, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[1], -+#endif -+ 0, priv->screen_height, - 1024, - 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, -+ 1024, -+ EV_AXIS_MIN_RES /* min_res */ , -+ EV_AXIS_MAX_RES /* max_res */ ); - xf86InitValuatorDefaults(dev, 1); - #endif - diff -r d716e8d59284 -r 9f329def90a6 xorg-xf86-input-microtouch/receipt --- a/xorg-xf86-input-microtouch/receipt Sun Mar 16 14:14:43 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="xorg-xf86-input-microtouch" -VERSION="1.2.0" -CATEGORY="x-window" -SHORT_DESC="Xorg server protocol." -MAINTAINER="pankso@slitaz.org" -LICENSE="MIT" -SOURCE="xf86-input-microtouch" -TARBALL="$SOURCE-$VERSION.tar.bz2" -WEB_SITE="http://www.x.org/" -WGET_URL="$XORG_MIRROR/driver/$TARBALL" - -DEPENDS="xorg-server" -BUILD_DEPENDS="xorg-server-dev" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - grep -qs axis_labels src/microtouch.c || patch -p0 < $stuff/microtouch.u - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --with-xorg-module-dir=/usr/lib/X11/modules \ - $CONFIGURE_ARGS && - make && - make DESTDIR=$DESTDIR install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib/X11/modules/input/ - cp -a $install/usr/lib/X11/modules/input/*.so \ - $fs/usr/lib/X11/modules/input/ -} - diff -r d716e8d59284 -r 9f329def90a6 xorg-xf86-input-microtouch/stuff/microtouch.u --- a/xorg-xf86-input-microtouch/stuff/microtouch.u Sun Mar 16 14:14:43 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ ---- src/microtouch.c -+++ src/microtouch.c -@@ -404,6 +404,10 @@ - MuTPrivatePtr priv = (MuTPrivatePtr) (local->private); - unsigned char map[] = - {0, 1}; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ Atom btn_label; -+ Atom axis_labels[2] = { 0, 0 }; -+#endif - - /* - * these have to be here instead of in the SetupProc, because when the -@@ -415,7 +419,11 @@ - /* - * Device reports button press for 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 MicroTouch touchscreen ButtonClassDeviceStruct\n"); - return !Success; -@@ -425,7 +433,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, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels, -+#endif -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 -+ xf86GetMotionEvents, -+#endif - local->history_size, Absolute) == FALSE) - { - ErrorF ("Unable to allocate MicroTouch touchscreen ValuatorClassDeviceStruct\n"); -@@ -433,11 +447,19 @@ - } - 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 */ ); diff -r d716e8d59284 -r 9f329def90a6 xorg-xf86-input-plpevtch/receipt --- a/xorg-xf86-input-plpevtch/receipt Sun Mar 16 14:14:43 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="xorg-xf86-input-plpevtch" -VERSION="0.5.0" -CATEGORY="x-window" -SHORT_DESC="Xorg server driver for touchscreens." -MAINTAINER="pascal.bellard@slitaz.org" -LICENSE="MIT" -SOURCE="xf86-input-plpevtch" -TARBALL="$SOURCE-$VERSION.tar.gz" -WEB_SITE="http://www.plop.at/en/touchscreen.html" -WGET_URL="http://download.plop.at/files/plpevtch/$TARBALL" - -DEPENDS="xorg-server" -BUILD_DEPENDS="xorg-server-dev" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --with-xorg-module-dir=/usr/lib/X11/modules \ - $CONFIGURE_ARGS && - make && - make DESTDIR=$DESTDIR install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib/X11/modules/input/ - cp -a $install/usr/lib/X11/modules/input/*.so \ - $fs/usr/lib/X11/modules/input/ -} -