[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-input-tslib/files/

[Matt Turner]

commit:     80df3f58ac9916763372ca28c368f5a92cde30c8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep 30 12:49:56 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 13:11:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80df3f58

x11-drivers/xf86-input-tslib: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../files/fix-overlapped-variable.patch            |  20 ---
 ...f86-input-tslib-0.0.6-xf86XInputSetScreen.patch |  23 ---
 .../files/xf86-input-tslib-port-ABI-12-r48.patch   | 191 ---------------------
 3 files changed, 234 deletions(-)

diff --git a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
deleted file mode 100644
index 7a4363e9727..00000000000
--- a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/tslib.c.orig	2010-05-19 19:01:01.000000000 +0200
-+++ src/tslib.c	2010-05-19 19:02:00.000000000 +0200
-@@ -543,7 +543,7 @@
- 	return (pInfo);
- }
- 
--_X_EXPORT InputDriverRec TSLIB = {
-+_X_EXPORT InputDriverRec TSLIB_DRIVER = {
- 	1,			/* driver version */
- 	"tslib",		/* driver name */
- 	NULL,			/* identify */
-@@ -580,7 +580,7 @@
- {
- 	static Bool Initialised = FALSE;
- 
--	xf86AddInputDriver(&TSLIB, module, 0);
-+	xf86AddInputDriver(&TSLIB_DRIVER, module, 0);
- 
- 	return module;
- }

diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
deleted file mode 100644
index d3738bfecb9..00000000000
--- a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 };
- 

diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch
deleted file mode 100644
index a4288fdc135..00000000000
--- a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Index: xf86-input-tslib-trunk/src/tslib.c
-===================================================================
---- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
-+++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
-@@ -69,6 +69,13 @@
- #define DEFAULT_HEIGHT		240
- #define DEFAULT_WIDTH		320
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
-+#else
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
-+#endif
-+
-+
- enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
- 
- enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
-@@ -106,7 +113,7 @@
- }
- 
- static Bool
--ConvertProc( LocalDevicePtr local,
-+ConvertProc( InputInfoPtr local,
- 			 int first,
- 			 int num,
- 			 int v0,
-@@ -135,7 +142,7 @@
-     return t;
- }
- 
--static void ReadInput (LocalDevicePtr local)
-+static void ReadInput (InputInfoPtr local)
- {
- 	struct ts_priv *priv = (struct ts_priv *) (local->private);
- 	struct ts_sample samp;
-@@ -382,7 +389,11 @@
- 					       axiswidth - 1,	/* max val */
- 					       axiswidth,	/* resolution */
- 					       0,		/* min_res */
--					       axiswidth);	/* max_res */
-+					       axiswidth	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		InitValuatorAxisStruct(device, 1,
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-@@ -392,7 +403,11 @@
- 					       axisheight - 1,	/* max val */
- 					       axisheight,	/* resolution */
- 					       0,		/* min_res */
--					       axisheight);	/* max_res */
-+					       axisheight	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		if (InitProximityClassDeviceStruct (device) == FALSE) {
- 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
-@@ -434,7 +449,7 @@
- 	ErrorF("%s\n", __FUNCTION__);
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
--	xfree(pInfo->private);
-+	free(pInfo->private);
- 	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
-@@ -444,47 +459,57 @@
-  *
-  * called when the module subsection is found in XF86Config
-  */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+static int 
-+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-+#else
- static InputInfoPtr
- xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
-+#endif
- {
- 	struct ts_priv *priv;
- 	char *s;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	InputInfoPtr pInfo;
-+#endif
- 
--	priv = xcalloc (1, sizeof (struct ts_priv));
-+	priv = calloc (1, sizeof (struct ts_priv));
-         if (!priv)
--                return NULL;
-+                return BadValue;
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
--		xfree(priv);
--		return NULL;
-+		free(priv);
-+		return BadValue;
- 	}
- 
- 	/* Initialise the InputInfoRec. */
- 	pInfo->name = dev->identifier;
--	pInfo->type_name = XI_TOUCHSCREEN;
- 	pInfo->flags =
- 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
- 	    XI86_SEND_DRAG_EVENTS;
--	pInfo->device_control = xf86TslibControlProc;
--	pInfo->read_input = ReadInput;
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- 	pInfo->motion_history_proc = xf86GetMotionEvents;
- 	pInfo->history_size = 0;
- #endif
--	pInfo->control_proc = NULL;
-+	pInfo->conf_idev = dev;
- 	pInfo->close_proc = NULL;
--	pInfo->switch_mode = NULL;
- 	pInfo->conversion_proc = ConvertProc;
- 	pInfo->reverse_conversion_proc = NULL;
--	pInfo->dev = NULL;
- 	pInfo->private_flags = 0;
- 	pInfo->always_core_feedback = 0;
--	pInfo->conf_idev = dev;
-+#endif
-+
-+	pInfo->type_name = XI_TOUCHSCREEN;
-+	pInfo->control_proc = NULL;
-+	pInfo->read_input = ReadInput;
-+	pInfo->device_control = xf86TslibControlProc;
-+	pInfo->switch_mode = NULL;
- 	pInfo->private = priv;
-+	pInfo->dev = NULL;
- 
- 	/* Collect the options, and process the common options. */
--	xf86CollectInputOptions(pInfo, NULL, NULL);
-+	COLLECT_INPUT_OPTIONS(pInfo, NULL);
- 	xf86ProcessCommonOptions(pInfo, pInfo->options);
- 
- 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
-@@ -510,23 +535,31 @@
- 		priv->rotate = TSLIB_ROTATE_NONE;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
-+#else
-+	s = xf86CheckStrOption(pInfo->options, "path", NULL);
-+#endif
-   	if (!s)
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
-+#else
-+		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
-+#endif
-  
- 	priv->ts = ts_open(s, 1);
--	xfree(s);
-+	free(s);
- 
- 	if (!priv->ts) {
- 		ErrorF("ts_open failed (device=%s)\n",s);
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	if (ts_config(priv->ts)) {
- 		ErrorF("ts_config failed\n");
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	pInfo->fd = ts_fd(priv->ts);
-@@ -536,11 +569,13 @@
- 		priv->state = BUTTON_EMULATION_OFF;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	/* Mark the device configured */
- 	pInfo->flags |= XI86_CONFIGURED;
-+#endif
- 
- 	/* Return the configured device */
--	return (pInfo);
-+	return Success;
- }
- 
- _X_EXPORT InputDriverRec TSLIB = {