(#225181) Revbump to get X working again. Still an issue with moving pointers to other screens on multi-monitor setups.

Package-Manager: portage-2.1.5.4

5 files changed, 138 insertions, 5 deletions

diff --git a/x11-drivers/xf86-input-evdev/ChangeLog b/x11-drivers/xf86-input-evdev/ChangeLog
index fa4ebf102587..c10b140659fd 100644
--- a/x11-drivers/xf86-input-evdev/ChangeLog
+++ b/x11-drivers/xf86-input-evdev/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-evdev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.77 2008/06/06 22:07:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.78 2008/06/07 19:35:15 dberkholz Exp $
+
+*xf86-input-evdev-1.99.2-r1 (07 Jun 2008)
+
+  07 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.99.2/0004-Check-for-XINPUT-ABI-3-corrected-version.patch,
+  +files/1.99.2/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patc
+  h, +xf86-input-evdev-1.99.2-r1.ebuild:
+  (#225181) Revbump to get X working again. Still an issue with moving
+  pointers to other screens on multi-monitor setups.
 
 *xf86-input-evdev-1.99.2 (06 Jun 2008)
 
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index ea5176000c2a..b713ace65643 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -5,19 +5,22 @@ AUX 1.1.5-fix_compatibility.patch 375 RMD160 08f7341b38d6764b6e5f312300dde3c0e4d
 AUX 1.1.5-zaphod-mouse-fix.patch 291 RMD160 cf81f9646159027496aaed7e57c458b9e0da0f7c SHA1 423c33355186d0b751636d7da793ff6c9f9f912a SHA256 e598000f5fd69704f7f2cab7df1b38fac6981fe4ee6db4cc5bd98f6a741b9c3f
 AUX 1.99.2/0001-Fail-if-the-device-cannot-be-grabbed-during-the-prob.patch 1368 RMD160 1781b9e5e09a39d64167bbf04dc55af01e8385dd SHA1 6d4c90ac40f9f64207167e92f7de58506f9b264b SHA256 544d087a21303d3d79989cff354dd6e64d5eb550f46caa2256e25ad1efb67098
 AUX 1.99.2/0002-Check-for-XINPUT-ABI-parameters-of-InitValuatorClas.patch 1360 RMD160 2a1b20d17d9a7bd5a32b85e022a9915e929786f2 SHA1 b438351a052937b32063a00a81575da93030b47f SHA256 ee069763cae792c7f182e79c35781acc21f1a52e51882e0aab5905d66d4b156b
+AUX 1.99.2/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patch 1560 RMD160 8c84ffded3528aa8b4bc6adfa55be66031d48dd9 SHA1 333c0ffbdf9f285d181c3e7ac441cfae2a62006a SHA256 072563e5988970ce69ab6b51891364d8ce13008ab7347ab9de4081dd9b9b496f
+AUX 1.99.2/0004-Check-for-XINPUT-ABI-3-corrected-version.patch 1403 RMD160 c127f5a55e7bd5ec204510b3fa7919a44552b68b SHA1 3d9079586ef579348f8418e6115bd83cc851b3f6 SHA256 557fe159843393d91d56d41308f7556e566f26284c847f469829d62de81f586e
 DIST xf86-input-evdev-1.1.5.tar.bz2 242307 RMD160 13292abea84654828af720c720988a3f6c7f9ac8 SHA1 70650b58c69afdd0ef22e6c647944fc6b5b12e0f SHA256 52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e
 DIST xf86-input-evdev-1.2.0.tar.bz2 259428 RMD160 f5c414d9154a3d130fecf183e71e2b75a476dd02 SHA1 c1ff9c377978158790b5522735743b09090ad8f5 SHA256 b23b231d754cab717a4b145ee3a5f3e73db46d877d23502326e9794d92d976ba
 DIST xf86-input-evdev-1.99.2.tar.bz2 241747 RMD160 7878417e4e2988de92b1322f153202c2978c9d1f SHA1 04edb8dc741bc4b5be4a6eef4f723c61869a6beb SHA256 79bf0df91eba04aabae762ca5da3b47e571b04e715bced03035b1d0dd0ad3933
 EBUILD xf86-input-evdev-1.1.5-r1.ebuild 686 RMD160 f5f297596c9eb437013d3e3a5925072fafeedd33 SHA1 2c4f2875af305077edb747e3e010ac06bd6e15b4 SHA256 95a56edad2c70fd16b109957c139aa92ae264b6ffe1774c7b502700d6d8351b0
 EBUILD xf86-input-evdev-1.1.5-r2.ebuild 733 RMD160 b2eb691eded76f463b39cdb10f65b7367de674ff SHA1 8d61108096dcef7a4c3ea35b945b21d3a1f842d8 SHA256 cc25b4653af87a615991e6407c46ee83c4a085ed45581e83e4d3f5f19a5690c9
 EBUILD xf86-input-evdev-1.2.0.ebuild 996 RMD160 d58b31ad3f04cf2958c146a64517054e0c5227ed SHA1 ef6517402fd412aa4f7eb88f86fe196ac2acffca SHA256 3e290c02f744cfcde86dfbafe06fcb4ec6ee348651e8ab2790a0d8d5dacb1d3c
+EBUILD xf86-input-evdev-1.99.2-r1.ebuild 1342 RMD160 0be7a0c6762cd69bc7fcc83943ae174ae1e65576 SHA1 540c017ce9cebd439eee5fbf68c930a944c0a3ed SHA256 f2c0a09d5f6a8b5c900c4b81900085661f6d9d89765e83bfa70a5a9e2f3e85b4
 EBUILD xf86-input-evdev-1.99.2.ebuild 1183 RMD160 580b3a1f2389fb9eee892488506eb648e7d4f3b8 SHA1 164bd77e5945777743d932988cb802da008fa0bf SHA256 50fc9864a3ce1c8b0f8a7972099efd834f5cab1a209f606af239b609f59befb4
-MISC ChangeLog 12076 RMD160 612f811af4eb4c53b2d10e4ab46d66cc18021bd5 SHA1 e23312c09d6189e9a2dac91da29c50ac39f64422 SHA256 c6fe375170b15b869424ded028b13c085fe3f819f3a1c418bbd47819358bc0b0
+MISC ChangeLog 12486 RMD160 a760b27707a4c7085c2631a1cab4e425c0ed774e SHA1 324030ad26824240ca01318ec4528539fa8c2d37 SHA256 01b9fd514377004e55ad5c2640270f51bf27fa75f0a1e8694e6db3698f9e8a12
 MISC metadata.xml 254 RMD160 4c78a3f1774bde4ae8506ab4619cd8b3f4ae2dde SHA1 3a5ad14cd125c6473ac6784ff8b64106d2d3f9b2 SHA256 b579362a5f108a6f8ba3ea99fcba0b7fa4fa91838428fba80e8c66ef12530cc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhJtRIACgkQXVaO67S1rtsQtgCeNBE1N/hLaw8GffjB2kOFdqrr
-OV4AoN2STC6brmrKbcASGGkaxLY7kYt/
-=gXDO
+iEYEARECAAYFAkhK4vkACgkQXVaO67S1rtv3agCg55C9Koc04FaeSxEd7K0I1wEf
+MNkAnRyw+QKn/Tin1lGBDo5+JrBYY5QC
+=fX7c
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-evdev/files/1.99.2/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patch b/x11-drivers/xf86-input-evdev/files/1.99.2/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patch
new file mode 100644
index 000000000000..e1905c31d53a
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/files/1.99.2/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patch
@@ -0,0 +1,44 @@
+From d40125ea8c2ce6ec0f98bdc0655f79aa7274152e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun, 8 Jun 2008 00:09:40 +0930
+Subject: [PATCH] Revert "Check for XINPUT ABI, parameters of InitValuatorClassRec have changed."
+
+GetMotionEvents() doesn't exist, led to compile errors with servers pre-MPX
+merge. Thanks to Sven Wegener for pointing this out.
+
+This reverts commit 42422d8f69e6806e1adfd93017cac064a75041c7.
+---
+ src/evdev.c |   10 ++--------
+ 1 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index 3fe0708..13f03d3 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -726,10 +726,7 @@ EvdevAddAbsClass(DeviceIntPtr device)
+     pEvdev->min_y = absinfo_y.minimum;
+     pEvdev->max_y = absinfo_y.maximum;
+ 
+-    if (!InitValuatorClassDeviceStruct(device, 2,
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+-                                       GetMotionEvents(),
+-#endif
++    if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+                                        GetMotionHistorySize(), Absolute))
+         return !Success;
+ 
+@@ -759,10 +756,7 @@ EvdevAddRelClass(DeviceIntPtr device)
+ 
+     pInfo = device->public.devicePrivate;
+ 
+-    if (!InitValuatorClassDeviceStruct(device, 2,
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+-                                       GetMotionEvents(),
+-#endif
++    if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+                                        GetMotionHistorySize(), Relative))
+         return !Success;
+ 
+-- 
+1.5.5.1
+
diff --git a/x11-drivers/xf86-input-evdev/files/1.99.2/0004-Check-for-XINPUT-ABI-3-corrected-version.patch b/x11-drivers/xf86-input-evdev/files/1.99.2/0004-Check-for-XINPUT-ABI-3-corrected-version.patch
new file mode 100644
index 000000000000..586048ebde80
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/files/1.99.2/0004-Check-for-XINPUT-ABI-3-corrected-version.patch
@@ -0,0 +1,41 @@
+From da112737eb109dc263169e820b7ef903b7f8624f Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun, 8 Jun 2008 00:12:03 +0930
+Subject: [PATCH] Check for XINPUT ABI < 3 (corrected version)
+
+Thanks to Sven Wegener for pointing out the incorrect previous version.
+---
+ src/evdev.c |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index 13f03d3..b146d41 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -726,7 +726,10 @@ EvdevAddAbsClass(DeviceIntPtr device)
+     pEvdev->min_y = absinfo_y.minimum;
+     pEvdev->max_y = absinfo_y.maximum;
+ 
+-    if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
++    if (!InitValuatorClassDeviceStruct(device, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++                                       GetMotionHistory,
++#endif
+                                        GetMotionHistorySize(), Absolute))
+         return !Success;
+ 
+@@ -756,7 +759,10 @@ EvdevAddRelClass(DeviceIntPtr device)
+ 
+     pInfo = device->public.devicePrivate;
+ 
+-    if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
++    if (!InitValuatorClassDeviceStruct(device, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++                                       GetMotionHistory,
++#endif
+                                        GetMotionHistorySize(), Relative))
+         return !Success;
+ 
+-- 
+1.5.5.1
+
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.99.2-r1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.99.2-r1.ebuild
new file mode 100644
index 000000000000..63454937ed0f
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.99.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.99.2-r1.ebuild,v 1.1 2008/06/07 19:35:15 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+#XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="Generic Linux input driver"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~x86"
+
+RDEPEND=">=x11-base/xorg-server-1.4.0.90
+	>=sys-apps/hal-0.5.10"
+DEPEND="${RDEPEND}
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
+	>=x11-proto/inputproto-1.4
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/0001-Fail-if-the-device-cannot-be-grabbed-during-the-prob.patch"
+	"${FILESDIR}/${PV}/0002-Check-for-XINPUT-ABI-parameters-of-InitValuatorClas.patch"
+	"${FILESDIR}/${PV}/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patch"
+	"${FILESDIR}/${PV}/0004-Check-for-XINPUT-ABI-3-corrected-version.patch"
+	)
+
+pkg_postinst() {
+	elog "If your XKB (keyboard settings) stopped working,"
+	elog "you may uninstall this driver or move your XKB configuration."
+	elog "Download an example from http://dev.gentoo.org/~compnerd/temp/hal-config-examples/"
+	elog "(these will be installed with sys-apps/hal soon),"
+	elog "and drop it into /etc/hal/fdi/policy/"
+}