SliTaz Repositories

     1.1 --- a/xorg-xf86-input-mutouch/receipt	Thu Dec 26 20:57:05 2013 +0100
     1.2 +++ b/xorg-xf86-input-mutouch/receipt	Thu Dec 26 19:40:15 2013 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-xf86-input-mutouch"
     1.7 -VERSION="1.2.1"
     1.8 +VERSION="1.3.0"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Xorg server protocol."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -18,7 +18,6 @@
    1.13  compile_rules()
    1.14  {
    1.15      cd $src
    1.16 -    patch -p1 -i $stuff/mutouch-1.2.1-abi.patch
    1.17      ./configure \
    1.18      	--prefix=/usr \
    1.19      	--sysconfdir=/etc \

     2.1 --- a/xorg-xf86-input-mutouch/stuff/mutouch-1.2.1-abi.patch	Thu Dec 26 20:57:05 2013 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,73 +0,0 @@
     2.4 -From db04a5333b545a0442b995bae47d2c5527a7459e Mon Sep 17 00:00:00 2001
     2.5 -From: Peter Hutterer <peter.hutterer@who-t.net>
     2.6 -Date: Fri, 17 Jul 2009 14:18:51 +1000
     2.7 -Subject: [PATCH] Cope with XINPUT ABI 7.
     2.8 -
     2.9 -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    2.10 ----
    2.11 - src/xf86MuTouch.c |   25 ++++++++++++++++++++++---
    2.12 - 1 files changed, 22 insertions(+), 3 deletions(-)
    2.13 -
    2.14 -diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
    2.15 -index 2d5cdb0..de319fc 100644
    2.16 ---- a/src/xf86MuTouch.c
    2.17 -+++ b/src/xf86MuTouch.c
    2.18 -@@ -749,6 +749,10 @@ xf86MuTControl(DeviceIntPtr	dev,
    2.19 -   unsigned char		req[MuT_PACKET_SIZE];
    2.20 -   unsigned char		reply[MuT_BUFFER_SIZE];
    2.21 -   char			*id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";
    2.22 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    2.23 -+  Atom btn_label;
    2.24 -+  Atom axis_labels[2] = { 0, 0 };
    2.25 -+#endif
    2.26 - 
    2.27 -   switch(mode) {
    2.28 - 
    2.29 -@@ -766,7 +770,11 @@ xf86MuTControl(DeviceIntPtr	dev,
    2.30 -       /*
    2.31 -        * Device reports button press for up to 1 button.
    2.32 -        */
    2.33 --      if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
    2.34 -+      if (InitButtonClassDeviceStruct(dev, 1,
    2.35 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    2.36 -+				      &btn_label,
    2.37 -+#endif
    2.38 -+				      map) == FALSE) {
    2.39 - 	ErrorF("Unable to allocate ButtonClassDeviceStruct\n");
    2.40 - 	return !Success;
    2.41 -       }
    2.42 -@@ -779,6 +787,9 @@ xf86MuTControl(DeviceIntPtr	dev,
    2.43 -        * screen to fit one meter.
    2.44 -        */
    2.45 -       if (InitValuatorClassDeviceStruct(dev, 2,
    2.46 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    2.47 -+				      axis_labels,
    2.48 -+#endif
    2.49 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
    2.50 - 					xf86GetMotionEvents,
    2.51 - #endif
    2.52 -@@ -787,11 +798,19 @@ xf86MuTControl(DeviceIntPtr	dev,
    2.53 - 	return !Success;
    2.54 -       }
    2.55 -       else {
    2.56 --	InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
    2.57 -+	InitValuatorAxisStruct(dev, 0,
    2.58 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    2.59 -+			       axis_labels[0],
    2.60 -+#endif
    2.61 -+			       priv->min_x, priv->max_x,
    2.62 - 			       9500,
    2.63 - 			       0     /* min_res */,
    2.64 - 			       9500  /* max_res */);
    2.65 --	InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
    2.66 -+	InitValuatorAxisStruct(dev, 1,
    2.67 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    2.68 -+			       axis_labels[1],
    2.69 -+#endif
    2.70 -+			       priv->min_y, priv->max_y,
    2.71 - 			       10500,
    2.72 - 			       0     /* min_res */,
    2.73 - 			       10500 /* max_res */);
    2.74 --- 
    2.75 -1.6.3.rc1.2.g0164.dirty
    2.76 -