SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xorg-xf86-input-mutouch/stuff/mutouch-1.2.1-abi.patch	Mon Nov 08 00:03:57 2010 +0000
     1.3 @@ -0,0 +1,73 @@
     1.4 +From db04a5333b545a0442b995bae47d2c5527a7459e Mon Sep 17 00:00:00 2001
     1.5 +From: Peter Hutterer <peter.hutterer@who-t.net>
     1.6 +Date: Fri, 17 Jul 2009 14:18:51 +1000
     1.7 +Subject: [PATCH] Cope with XINPUT ABI 7.
     1.8 +
     1.9 +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    1.10 +---
    1.11 + src/xf86MuTouch.c |   25 ++++++++++++++++++++++---
    1.12 + 1 files changed, 22 insertions(+), 3 deletions(-)
    1.13 +
    1.14 +diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
    1.15 +index 2d5cdb0..de319fc 100644
    1.16 +--- a/src/xf86MuTouch.c
    1.17 ++++ b/src/xf86MuTouch.c
    1.18 +@@ -749,6 +749,10 @@ xf86MuTControl(DeviceIntPtr	dev,
    1.19 +   unsigned char		req[MuT_PACKET_SIZE];
    1.20 +   unsigned char		reply[MuT_BUFFER_SIZE];
    1.21 +   char			*id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";
    1.22 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    1.23 ++  Atom btn_label;
    1.24 ++  Atom axis_labels[2] = { 0, 0 };
    1.25 ++#endif
    1.26 + 
    1.27 +   switch(mode) {
    1.28 + 
    1.29 +@@ -766,7 +770,11 @@ xf86MuTControl(DeviceIntPtr	dev,
    1.30 +       /*
    1.31 +        * Device reports button press for up to 1 button.
    1.32 +        */
    1.33 +-      if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
    1.34 ++      if (InitButtonClassDeviceStruct(dev, 1,
    1.35 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    1.36 ++				      &btn_label,
    1.37 ++#endif
    1.38 ++				      map) == FALSE) {
    1.39 + 	ErrorF("Unable to allocate ButtonClassDeviceStruct\n");
    1.40 + 	return !Success;
    1.41 +       }
    1.42 +@@ -779,6 +787,9 @@ xf86MuTControl(DeviceIntPtr	dev,
    1.43 +        * screen to fit one meter.
    1.44 +        */
    1.45 +       if (InitValuatorClassDeviceStruct(dev, 2,
    1.46 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    1.47 ++				      axis_labels,
    1.48 ++#endif
    1.49 + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
    1.50 + 					xf86GetMotionEvents,
    1.51 + #endif
    1.52 +@@ -787,11 +798,19 @@ xf86MuTControl(DeviceIntPtr	dev,
    1.53 + 	return !Success;
    1.54 +       }
    1.55 +       else {
    1.56 +-	InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
    1.57 ++	InitValuatorAxisStruct(dev, 0,
    1.58 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    1.59 ++			       axis_labels[0],
    1.60 ++#endif
    1.61 ++			       priv->min_x, priv->max_x,
    1.62 + 			       9500,
    1.63 + 			       0     /* min_res */,
    1.64 + 			       9500  /* max_res */);
    1.65 +-	InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
    1.66 ++	InitValuatorAxisStruct(dev, 1,
    1.67 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
    1.68 ++			       axis_labels[1],
    1.69 ++#endif
    1.70 ++			       priv->min_y, priv->max_y,
    1.71 + 			       10500,
    1.72 + 			       0     /* min_res */,
    1.73 + 			       10500 /* max_res */);
    1.74 +-- 
    1.75 +1.6.3.rc1.2.g0164.dirty
    1.76 +