From a2bec36f88037865505e4cc0d317f23332f74dd5 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 8 Jul 2010 12:32:27 +0000 Subject: [PATCH] restore compatibility with xorg-server-1.7+, close bug #321175, ack'ed by chithanh Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-drivers/xf86-input-fpit/ChangeLog | 9 +- x11-drivers/xf86-input-fpit/Manifest | 4 +- .../files/xf86-input-fpit-1.3.0-abi.patch | 95 +++++++++++++++++++ .../xf86-input-fpit-1.3.0-r1.ebuild | 21 ++++ 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch create mode 100644 x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild diff --git a/x11-drivers/xf86-input-fpit/ChangeLog b/x11-drivers/xf86-input-fpit/ChangeLog index a2e6f3bb4841..d88d646c4566 100644 --- a/x11-drivers/xf86-input-fpit/ChangeLog +++ b/x11-drivers/xf86-input-fpit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-input-fpit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/ChangeLog,v 1.57 2010/01/23 19:43:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/ChangeLog,v 1.58 2010/07/08 12:32:27 lxnay Exp $ + +*xf86-input-fpit-1.3.0-r1 (08 Jul 2010) + + 08 Jul 2010; Fabio Erculiani + +xf86-input-fpit-1.3.0-r1.ebuild, +files/xf86-input-fpit-1.3.0-abi.patch: + restore compatibility with xorg-server-1.7+, close bug #321175, ack'ed by + chithanh 23 Jan 2010; Tomáš Chvátal -files/xf86-input-fpit-update1.diff, -xf86-input-fpit-1.2.0.ebuild, diff --git a/x11-drivers/xf86-input-fpit/Manifest b/x11-drivers/xf86-input-fpit/Manifest index 4e6103c089d8..ba9e54a41dd6 100644 --- a/x11-drivers/xf86-input-fpit/Manifest +++ b/x11-drivers/xf86-input-fpit/Manifest @@ -1,4 +1,6 @@ +AUX xf86-input-fpit-1.3.0-abi.patch 3343 RMD160 810d5c7382d656ec429248ec69ee4504d8250fec SHA1 dfb5bdfd0110b1d3c31229312ca1ec70e1a774b9 SHA256 bcce6cc3a58692913d6752b80e8db409e167beae5d8e1b868fd123ffb9b3cb5c DIST xf86-input-fpit-1.3.0.tar.bz2 243747 RMD160 46392fb8f7e40120f36b1c42e3b15702ecb5ecee SHA1 bc80c546c1b7838754a02a99391dbe31e5f1c475 SHA256 d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8 +EBUILD xf86-input-fpit-1.3.0-r1.ebuild 637 RMD160 a2130dfacf43f997c26dc5332c1c4f90de9bea18 SHA1 29f61ecf50ec4450131398e5d7098651444dd58b SHA256 daf2567f1ceba32027455ff657981bd5e9d22bfd3e7656f8d61f564d037b7963 EBUILD xf86-input-fpit-1.3.0.ebuild 584 RMD160 ed9817df29a6b6177466b2f653f2d79015e79158 SHA1 1cf7a5071720ad637cd38cd3b30492b127c2044f SHA256 e333c0b431533a55402c017a4fddcbb3886a66bad8a1ff58439b3be026671dff -MISC ChangeLog 7441 RMD160 f0cecc0ba647cff078fa5a7f7a0d9f7c6848465d SHA1 ccfe985d676bfdbdb2bd125a56758bd6e0aee29a SHA256 b61a46bf61112d317bd1ee278747488054e353b6d04466e44d7e66c01cc062bc +MISC ChangeLog 7692 RMD160 cf30f6886ffc8b2287d44c335e82be5d6f1ec5a3 SHA1 bd9a689f476216d45bd83ef51ef9031e17cb4986 SHA256 d68cfe1fcc35006dd743d43d5cf69b29b50e9ad8939808d416dd2eea82d4003c MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch new file mode 100644 index 000000000000..a9864e20ab12 --- /dev/null +++ b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch @@ -0,0 +1,95 @@ +From 7d203627e7e3e7a6f8d0e847ed650b0b89760c09 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 17 Jul 2009 14:38:31 +1000 +Subject: [PATCH] Cope with XINPUT ABI 7. + +--- + src/xf86Fpit.c | 40 +++++++++++++++++++++++++++++++++++----- + 1 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c +index 528ebb9..f40c6a9 100644 +--- a/src/xf86Fpit.c ++++ b/src/xf86Fpit.c +@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv) + * screen to fit one meter. + */ + int quarter_turns; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + priv->screen_width = screenInfo.screens[priv->screen_no]->width; + priv->screen_height = screenInfo.screens[priv->screen_no]->height; +@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv) + } + + if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) { +- InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , + 9500 /* max_res */ ); +- InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , + 10500 /* max_res */ ); + } else { +- InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ , + 9500 /* max_res */ ); +- InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , ++ InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , + 10500 /* max_res */ ); + } + } +@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + unsigned char map[] = { + 0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */ + }; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_labels[3] = { 0 }; ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + + switch (mode) { +@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + /* + * Device reports button press for up to 3 buttons. + */ +- if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) { ++ if (InitButtonClassDeviceStruct(dev, 3, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ btn_labels, ++#endif ++ map) == FALSE) { + ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n"); + return !Success; + } +@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + } + + 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 +-- +1.6.3.rc1.2.g0164.dirty + diff --git a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild new file mode 100644 index 000000000000..ee967dea280e --- /dev/null +++ b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild,v 1.1 2010/07/08 12:32:27 lxnay Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" +XDPVER=4 + +inherit x-modular + +DESCRIPTION="Fujitsu Stylistic input driver" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=x11-base/xorg-server-1.0.99" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/randrproto + x11-proto/xproto" + +PATCHES=( "${FILESDIR}/${P}-abi.patch" ) -- 2.26.2