---- xorgproto.orig/include/X11/extensions/xcalibrateproto.h 1970-01-01 01:00:00.000000000 +0100
-+++ xorgproto/include/X11/extensions/xcalibrateproto.h 2018-02-20 15:29:03.198392810 +0100
-@@ -0,0 +1,120 @@
-+/*
-+ * $Id: xcalibrateproto.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $
-+ *
-+ * Copyright © 2003 Philip Blundell
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Philip Blundell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Philip Blundell makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef XCALIBRATEPROTO_H
-+#define XCALIBRATEPROTO_H
-+
-+/*
-+ * requests and replies
-+ */
-+typedef struct {
-+ CARD8 reqType;
-+ CARD8 xCalibrateReqType;
-+ CARD16 length B16;
-+ CARD32 majorVersion B32;
-+ CARD32 minorVersion B32;
-+} xXCalibrateQueryVersionReq;
-+
-+#define sz_xXCalibrateQueryVersionReq 12
-+
-+typedef struct {
-+ BYTE type; /* X_Reply */
-+ BYTE pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD32 length B32;
-+ CARD32 majorVersion B32;
-+ CARD32 minorVersion B32;
-+ CARD32 pad2 B32;
-+ CARD32 pad3 B32;
-+ CARD32 pad4 B32;
-+ CARD32 pad5 B32;
-+} xXCalibrateQueryVersionReply;
-+
-+#define sz_xXCalibrateQueryVersionReply 32
-+
-+typedef struct {
-+ CARD8 reqType;
-+ CARD8 xCalibrateReqType;
-+ CARD16 length B16;
-+ CARD16 on B16;
-+ CARD16 pad B16;
-+} xXCalibrateRawModeReq;
-+
-+#define sz_xXCalibrateRawModeReq 8
-+
-+typedef struct {
-+ BYTE type; /* X_Reply */
-+ BYTE pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD32 status;
-+ CARD32 pad2 B32;
-+ CARD32 pad3 B32;
-+ CARD32 pad4 B32;
-+ CARD32 pad5 B32;
-+ CARD32 pad6 B32;
-+ CARD32 pad7 B32;
-+} xXCalibrateRawModeReply;
-+
-+#define sz_xXCalibrateRawModeReply 32
-+
-+typedef struct {
-+ CARD8 reqType;
-+ CARD8 xCalibrateReqType;
-+ CARD16 length B16;
-+ CARD32 x B32;
-+ CARD32 y B32;
-+} xXCalibrateScreenToCoordReq;
-+
-+#define sz_xXCalibrateScreenToCoordReq 12
-+
-+typedef struct {
-+ BYTE type; /* X_Reply */
-+ BYTE pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD32 x;
-+ CARD32 y;
-+ CARD32 pad2 B32;
-+ CARD32 pad3 B32;
-+ CARD32 pad4 B32;
-+ CARD32 pad5 B32;
-+ CARD32 pad6 B32;
-+} xXCalibrateScreenToCoordReply;
-+
-+#define sz_xXCalibrateScreenToCoordReply 32
-+
-+/* Events */
-+
-+typedef struct {
-+ CARD8 type;
-+ CARD8 pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD16 x;
-+ CARD16 y;
-+ CARD16 pressure;
-+ CARD16 pad2;
-+} xXCalibrateRawTouchscreenEvent;
-+
-+#define sz_xXCalibrateRawTouchscreenEvent 12
-+
-+#endif
---- xorgproto.orig/include/X11/extensions/xcalibratewire.h 1970-01-01 01:00:00.000000000 +0100
-+++ xorgproto/include/X11/extensions/xcalibratewire.h 2018-02-20 15:29:03.198392810 +0100
-@@ -0,0 +1,44 @@
-+/*
-+ * $Id: xcalibratewire.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $
-+ *
-+ * Copyright © 2003 Philip Blundell
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Philip Blundell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Philip Blundell makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef XCALIBRATEWIRE_H
-+#define XCALIBRATEWIRE_H
-+
-+#define XCALIBRATE_MAJOR_VERSION 0
-+#define XCALIBRATE_MINOR_VERSION 1
-+#define XCALIBRATE_NAME "XCALIBRATE"
-+
-+#define X_XCalibrateQueryVersion 0
-+#define X_XCalibrateRawMode 1
-+#define X_XCalibrateScreenToCoord 2
-+
-+#define XCalibrateNumberRequests (X_XCalibrateScreenToCoord + 1)
-+
-+#define X_XCalibrateRawTouchscreen 0
-+
-+#define XCalibrateNumberEvents (X_XCalibrateRawTouchscreen + 1)
-+
-+#define XCalibrateNumberErrors 0
-+
-+#endif