Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=54ec38017461f7e44ffa288e974c7883ace29f57
commit 54ec38017461f7e44ffa288e974c7883ace29f57 Author: bouleetbil <[email protected]> Date: Wed Sep 2 21:32:27 2009 +0200 xf86-input-mutouch-1.2.1-2-i686 *rebuild with new xorg diff --git a/source/x11/xf86-input-mutouch/FixXinput.diff b/source/x11/xf86-input-mutouch/FixXinput.diff new file mode 100644 index 0000000..732d216 --- /dev/null +++ b/source/x11/xf86-input-mutouch/FixXinput.diff @@ -0,0 +1,70 @@ +From db04a5333b545a0442b995bae47d2c5527a7459e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <[email protected]> +Date: Fri, 17 Jul 2009 04:18:51 +0000 +Subject: Cope with XINPUT ABI 7. + +Signed-off-by: Peter Hutterer <[email protected]> +--- +diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c +index 2d5cdb0..de319fc 100644 +--- a/src/xf86MuTouch.c ++++ b/src/xf86MuTouch.c +@@ -749,6 +749,10 @@ xf86MuTControl(DeviceIntPtr dev, + unsigned char req[MuT_PACKET_SIZE]; + unsigned char reply[MuT_BUFFER_SIZE]; + char *id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus"; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_label; ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + switch(mode) { + +@@ -766,7 +770,11 @@ xf86MuTControl(DeviceIntPtr dev, + /* + * Device reports button press for up to 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 ButtonClassDeviceStruct\n"); + return !Success; + } +@@ -779,6 +787,9 @@ xf86MuTControl(DeviceIntPtr dev, + * screen to fit one meter. + */ + 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 +@@ -787,11 +798,19 @@ xf86MuTControl(DeviceIntPtr dev, + return !Success; + } + 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 */); +-- +cgit v0.8.2 + diff --git a/source/x11/xf86-input-mutouch/FrugalBuild b/source/x11/xf86-input-mutouch/FrugalBuild index 4801d12..ffc36d5 100644 --- a/source/x11/xf86-input-mutouch/FrugalBuild +++ b/source/x11/xf86-input-mutouch/FrugalBuild @@ -3,7 +3,10 @@ pkgname=xf86-input-mutouch pkgver=1.2.1 -pkgrel=1 +pkgrel=2 Finclude xorg -sha1sums=('c5883c2c5cc80186f711751e8847c9c07f2e4448') +source=($source FixXinput.diff) +sha1sums=('c5883c2c5cc80186f711751e8847c9c07f2e4448' \ + '86b620c1d90cf0716b03544adede802294c61f0b') + # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
