[gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-input-tslib/files: xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch

[gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-input-tslib/files: xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    13/09/15 15:16:21

  Added:                xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
  Log:
  Add patch for compatibility with more recent xorg-server versions, bug #446432.
  
  (Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch?rev=1.1&content-type=text/plain

Index: xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
===================================================================
diff -ur xf86-input-tslib-0.0.6.orig/src/tslib.c xf86-input-tslib-0.0.6/src/tslib.c
--- xf86-input-tslib-0.0.6.orig/src/tslib.c	2012-12-05 01:12:16.286597071 +0100
+++ xf86-input-tslib-0.0.6/src/tslib.c	2012-12-05 01:11:02.686598595 +0100
@@ -75,6 +75,19 @@
 #define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
 #endif
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 13
+static void
+xf86XInputSetScreen(InputInfoPtr	pInfo,
+		    int			screen_number,
+		    int			x,
+		    int			y)
+{
+    if (miPointerGetScreen(pInfo->dev) !=
+          screenInfo.screens[screen_number]) {
+	miPointerSetScreen(pInfo->dev, screen_number, x, y);
+    }
+}
+#endif
 
 enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };