summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch152
1 files changed, 0 insertions, 152 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
deleted file mode 100644
index efac5ef67a..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
+++ /dev/null
@@ -1,152 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Yu Ke <ke.yu@intel.com>
4
5---
6 Xext/Makefile.am | 6 ++++++
7 configure.ac | 11 +++++++++--
8 include/kdrive-config.h.in | 3 +++
9 mi/miinitext.c | 6 ++++++
10 4 files changed, 24 insertions(+), 2 deletions(-)
11
12Index: xorg-server-1.7.99.2/mi/miinitext.c
13===================================================================
14--- xorg-server-1.7.99.2.orig/mi/miinitext.c 2010-02-10 18:54:11.959086237 +0000
15+++ xorg-server-1.7.99.2/mi/miinitext.c 2010-02-10 18:54:12.429078513 +0000
16@@ -264,6 +264,9 @@
17 #ifdef DMXEXT
18 extern void DMXExtensionInit(INITARGS);
19 #endif
20+#ifdef XCALIBRATE
21+extern void XCalibrateExtensionInit(INITARGS);
22+#endif
23 #ifdef XFIXES
24 extern void XFixesExtensionInit(INITARGS);
25 #endif
26@@ -493,6 +496,9 @@
27 GlxPushProvider(&__glXDRISWRastProvider);
28 if (!noGlxExtension) GlxExtensionInit();
29 #endif
30+#ifdef XCALIBRATE
31+ XCalibrateExtensionInit ();
32+#endif
33 }
34
35 #else /* XFree86LOADER */
36Index: xorg-server-1.7.99.2/configure.ac
37===================================================================
38--- xorg-server-1.7.99.2.orig/configure.ac 2010-02-10 18:54:11.959086237 +0000
39+++ xorg-server-1.7.99.2/configure.ac 2010-02-11 11:49:50.710736962 +0000
40@@ -1985,7 +1985,7 @@
41 fi
42
43
44- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
45+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
46 if test "x$HAVE_TSLIB" = xno; then
47 AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
48 fi
49@@ -2039,7 +2039,7 @@
50 KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
51 KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
52 KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
53- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
54+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $TSLIB_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
55
56 AC_SUBST([XEPHYR_LIBS])
57 AC_SUBST([XEPHYR_INCS])
58Index: xorg-server-1.7.99.2/include/kdrive-config.h.in
59===================================================================
60--- xorg-server-1.7.99.2.orig/include/kdrive-config.h.in 2010-02-10 18:54:11.959086237 +0000
61+++ xorg-server-1.7.99.2/include/kdrive-config.h.in 2010-02-10 18:54:12.429078513 +0000
62@@ -28,4 +28,7 @@
63 /* Have execinfo.h for backtrace(). */
64 #undef HAVE_EXECINFO_H
65
66+/* Enable XCalibrate extension */
67+#undef XCALIBRATE
68+
69 #endif /* _KDRIVE_CONFIG_H_ */
70Index: xorg-server-1.7.99.2/hw/kdrive/linux/tslib.c
71===================================================================
72--- xorg-server-1.7.99.2.orig/hw/kdrive/linux/tslib.c 2010-02-10 18:58:12.669078495 +0000
73+++ xorg-server-1.7.99.2/hw/kdrive/linux/tslib.c 2010-02-10 19:04:56.927828767 +0000
74@@ -50,12 +50,15 @@
75 int fd;
76 int lastx, lasty;
77 struct tsdev *tsDev;
78- void (*raw_event_hook)(int x, int y, int pressure, void *closure);
79- void *raw_event_closure;
80 int phys_screen;
81 };
82
83
84+/* For XCalibrate extension */
85+void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
86+void *tslib_raw_event_closure;
87+
88+
89 static void
90 TsRead (int fd, void *closure)
91 {
92@@ -65,10 +68,10 @@
93 long x = 0, y = 0;
94 unsigned long flags;
95
96- if (private->raw_event_hook) {
97+ if (tslib_raw_event_hook) {
98 while (ts_read_raw(private->tsDev, &event, 1) == 1)
99- private->raw_event_hook (event.x, event.y, event.pressure,
100- private->raw_event_closure);
101+ tslib_raw_event_hook (event.x, event.y, event.pressure,
102+ tslib_raw_event_closure);
103 return;
104 }
105
106@@ -111,8 +114,8 @@
107 {
108 struct TslibPrivate *private = pi->driverPrivate;
109
110- private->raw_event_hook = NULL;
111- private->raw_event_closure = NULL;
112+ tslib_raw_event_hook = NULL;
113+ tslib_raw_event_closure = NULL;
114 if (!pi->path) {
115 pi->path = strdup("/dev/input/touchscreen0");
116 ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
117Index: xorg-server-1.7.99.2/Xext/xcalibrate.c
118===================================================================
119--- xorg-server-1.7.99.2.orig/Xext/xcalibrate.c 2010-02-10 18:59:24.097829840 +0000
120+++ xorg-server-1.7.99.2/Xext/xcalibrate.c 2010-02-11 11:51:00.930735731 +0000
121@@ -115,6 +115,7 @@
122
123 memset (&rep, 0, sizeof (rep));
124 rep.type = X_Reply;
125+ rep.length = 0;
126 rep.sequenceNumber = client->sequence;
127
128 if (stuff->on)
129@@ -158,6 +159,7 @@
130
131 swaps (&rep.sequenceNumber, n);
132 swaps (&rep.status, n);
133+ swapl (&rep.length, n);
134 }
135 WriteToClient(client, sizeof (rep), (char *) &rep);
136 return (client->noClientException);
137@@ -186,6 +188,7 @@
138
139 memset (&rep, 0, sizeof (rep));
140 rep.type = X_Reply;
141+ rep.length = 0;
142 rep.sequenceNumber = client->sequence;
143 rep.x = stuff->x;
144 rep.y = stuff->y;
145@@ -198,6 +201,7 @@
146
147 swaps (&rep.x, n);
148 swaps (&rep.y, n);
149+ swapl (&rep.length, n);
150 }
151 WriteToClient(client, sizeof (rep), (char *) &rep);
152 return (client->noClientException);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-12 23:01:08 +0000