summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-11 13:59:40 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-11 13:59:40 +0000
commitd56b65fcbdcf6c71e9d42cb0c6427c1b853083ac (patch)
treef12ce9d720848e595a3a26b20f64df4d63d1d4c0 /meta/packages
parenta30424c269479d1e722932c24f1c7e260914c390 (diff)
downloadpoky-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.gz
xserver-kdrive: Remove bogus fbdev patch, merge kmode patches, add a patch to allow the existing framebuffer mode to be reused if appropriate
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3466 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch29
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch83
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev-not-fix.patch14
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch41
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch26
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode-palm.patch34
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode.patch28
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb8
8 files changed, 146 insertions, 117 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
index 717e72f93f..5a971002cd 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
@@ -1,14 +1,14 @@
1--- 1---
2 Xext/Makefile.am | 6 ++++++ 2 Xext/Makefile.am | 6 ++++++
3 configure.ac | 9 ++++++++- 3 configure.ac | 11 +++++++++--
4 include/kdrive-config.h.in | 3 +++ 4 include/kdrive-config.h.in | 3 +++
5 mi/miinitext.c | 6 ++++++ 5 mi/miinitext.c | 6 ++++++
6 4 files changed, 23 insertions(+), 1 deletion(-) 6 4 files changed, 24 insertions(+), 2 deletions(-)
7 7
8Index: xorg-server-1.3.0.0/mi/miinitext.c 8Index: xorg-server-1.3.0.0/mi/miinitext.c
9=================================================================== 9===================================================================
10--- xorg-server-1.3.0.0.orig/mi/miinitext.c 2007-05-15 16:05:34.000000000 +0100 10--- xorg-server-1.3.0.0.orig/mi/miinitext.c 2006-11-16 18:01:26.000000000 +0000
11+++ xorg-server-1.3.0.0/mi/miinitext.c 2007-05-15 16:05:39.000000000 +0100 11+++ xorg-server-1.3.0.0/mi/miinitext.c 2008-01-11 13:45:57.000000000 +0000
12@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS); 12@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS);
13 #ifdef DMXEXT 13 #ifdef DMXEXT
14 extern void DMXExtensionInit(INITARGS); 14 extern void DMXExtensionInit(INITARGS);
@@ -31,8 +31,8 @@ Index: xorg-server-1.3.0.0/mi/miinitext.c
31 void 31 void
32Index: xorg-server-1.3.0.0/configure.ac 32Index: xorg-server-1.3.0.0/configure.ac
33=================================================================== 33===================================================================
34--- xorg-server-1.3.0.0.orig/configure.ac 2007-05-15 16:05:34.000000000 +0100 34--- xorg-server-1.3.0.0.orig/configure.ac 2008-01-11 13:45:57.000000000 +0000
35+++ xorg-server-1.3.0.0/configure.ac 2007-05-15 16:17:54.000000000 +0100 35+++ xorg-server-1.3.0.0/configure.ac 2008-01-11 13:45:58.000000000 +0000
36@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_ST 36@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_ST
37 AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes]) 37 AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
38 AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes]) 38 AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
@@ -54,6 +54,15 @@ Index: xorg-server-1.3.0.0/configure.ac
54 AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) 54 AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
55 if test "x$XEVIE" = xyes; then 55 if test "x$XEVIE" = xyes; then
56 AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) 56 AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
57@@ -1519,7 +1526,7 @@ if test "$KDRIVE" = yes; then
58
59 # tslib...
60 if test "x$TSLIB" = xyes; then
61- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
62+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
63 if test "x$HAVE_TSLIB" = xno; then
64 AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
65 fi
57@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then 66@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then
58 ;; 67 ;;
59 esac 68 esac
@@ -65,8 +74,8 @@ Index: xorg-server-1.3.0.0/configure.ac
65 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) 74 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
66Index: xorg-server-1.3.0.0/include/kdrive-config.h.in 75Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
67=================================================================== 76===================================================================
68--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2007-05-15 16:05:34.000000000 +0100 77--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2006-11-16 18:01:26.000000000 +0000
69+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2007-05-15 16:05:39.000000000 +0100 78+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2008-01-11 13:45:57.000000000 +0000
70@@ -25,4 +25,7 @@ 79@@ -25,4 +25,7 @@
71 /* Verbose debugging output hilarity */ 80 /* Verbose debugging output hilarity */
72 #undef DEBUG 81 #undef DEBUG
@@ -77,8 +86,8 @@ Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
77 #endif /* _KDRIVE_CONFIG_H_ */ 86 #endif /* _KDRIVE_CONFIG_H_ */
78Index: xorg-server-1.3.0.0/Xext/Makefile.am 87Index: xorg-server-1.3.0.0/Xext/Makefile.am
79=================================================================== 88===================================================================
80--- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2007-05-15 16:05:34.000000000 +0100 89--- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2006-10-25 01:25:19.000000000 +0100
81+++ xorg-server-1.3.0.0/Xext/Makefile.am 2007-05-15 16:05:39.000000000 +0100 90+++ xorg-server-1.3.0.0/Xext/Makefile.am 2008-01-11 13:45:57.000000000 +0000
82@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS) 91@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS)
83 # XCalibrare needs tslib 92 # XCalibrare needs tslib
84 endif 93 endif
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch
new file mode 100644
index 0000000000..14cf99055b
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch
@@ -0,0 +1,83 @@
1Add some extra video modes and change the default to VGA.
2
3---
4 hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
5 1 file changed, 39 insertions(+), 2 deletions(-)
6
7Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
8===================================================================
9--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
10+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
11@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
12 /* H V Hz KHz */
13 /* FP BP BLANK POLARITY */
14
15+ /* Treo 650 */
16+
17+ { 320, 320, 64, 16256,
18+ 17, 12, 32, KdSyncNegative,
19+ 1, 11, 14, KdSyncNegative,
20+ },
21+
22+ { 320, 320, 64, 0,
23+ 0, 0, 0, KdSyncNegative,
24+ 0, 0, 0, KdSyncNegative,
25+ },
26+
27+ /* LifeDrive/T3/TX modes */
28+
29+ { 320, 480, 64, 16256,
30+ 17, 12, 32, KdSyncNegative,
31+ 1, 11, 14, KdSyncNegative,
32+ },
33+
34+ { 480, 320, 64, 0,
35+ 0, 0, 0, KdSyncNegative,
36+ 0, 0, 0, KdSyncNegative,
37+ },
38+
39+
40 /* IPAQ modeline:
41 *
42 * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
43@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
44 1, 11, 14, KdSyncNegative,
45 },
46
47+ { 240, 320, 64, 0,
48+ 0, 0, 0, KdSyncNegative,
49+ 0, 0, 0, KdSyncNegative,
50+ },
51+
52 /* Other VESA modes */
53 { 640, 350, 85, 31500, /* VESA */
54 32, 96, 192, KdSyncPositive, /* 26.413 */
55@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
56 16, 120, 176, KdSyncNegative, /* 37.861 */
57 1, 20, 24, KdSyncNegative, /* 72.809 */
58 },
59+ /* DEFAULT */
60+#define MONITOR_TIMING_DEFAULT 13
61 { 640, 480, 60, 25175, /* VESA */
62 16, 48, 160, KdSyncNegative, /* 31.469 */
63 10, 33, 45, KdSyncNegative, /* 59.940 */
64 },
65+
66+
67+ { 480, 640, 60, 0, /* VESA */
68+ 0, 0, 0, KdSyncNegative, /* 31.469 */
69+ 0, 0, 0, KdSyncNegative, /* 59.940 */
70+ },
71+
72
73 /* 800x600 modes */
74 { 800, 600, 85, 56250, /* VESA */
75@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
76 16, 160, 256, KdSyncPositive, /* 46.875 */
77 1, 21, 25, KdSyncPositive, /* 75.000 */
78 },
79- /* DEFAULT */
80-#define MONITOR_TIMING_DEFAULT 9
81 { 800, 600, 72, 50000, /* VESA */
82 56, 64, 240, KdSyncPositive, /* 48.077 */
83 37, 23, 66, KdSyncPositive, /* 72.188 */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev-not-fix.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev-not-fix.patch
deleted file mode 100644
index f87e7cc2cd..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev-not-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
2+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
3@@ -198,6 +198,11 @@
4 return FALSE;
5 }
6
7+ /* Re-get the "fixed" parameters since they might have changed */
8+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
9+ if (k < 0)
10+ perror ("FBIOGET_FSCREENINFO");
11+
12 /* Now get the new screeninfo */
13 ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
14 depth = priv->var.bits_per_pixel;
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
new file mode 100644
index 0000000000..dc957cc825
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
@@ -0,0 +1,41 @@
1---
2 hw/kdrive/fbdev/fbdev.c | 24 ++++++++++++++++--------
3 1 file changed, 16 insertions(+), 8 deletions(-)
4
5Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
6===================================================================
7--- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:16.000000000 +0000
8+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:59.000000000 +0000
9@@ -182,16 +182,24 @@ fbdevScreenInitialize (KdScreenInfo *scr
10 screen->rate = 103; /* FIXME: should get proper value from fb driver */
11 }
12 if (!screen->fb[0].depth)
13- screen->fb[0].depth = 16;
14+ {
15+ if (k >= 0)
16+ screen->fb[0].depth = var.bits_per_pixel;
17+ else
18+ screen->fb[0].depth = 16;
19+ }
20
21- t = KdFindMode (screen, fbdevModeSupported);
22- screen->rate = t->rate;
23- screen->width = t->horizontal;
24- screen->height = t->vertical;
25+ if ((screen->width != var.xres) || (screen->height != var.yres))
26+ {
27+ t = KdFindMode (screen, fbdevModeSupported);
28+ screen->rate = t->rate;
29+ screen->width = t->horizontal;
30+ screen->height = t->vertical;
31
32- /* Now try setting the mode */
33- if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
34- fbdevConvertMonitorTiming (t, &var);
35+ /* Now try setting the mode */
36+ if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
37+ fbdevConvertMonitorTiming (t, &var);
38+ }
39
40 var.activate = FB_ACTIVATE_NOW;
41 var.bits_per_pixel = screen->fb[0].depth;
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
deleted file mode 100644
index edc5146302..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1---
2 hw/kdrive/src/kmode.c | 4 ++--
3 1 file changed, 2 insertions(+), 2 deletions(-)
4
5Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
6===================================================================
7--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2007-05-16 10:30:29.000000000 +0100
8+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2007-05-16 10:31:08.000000000 +0100
9@@ -106,6 +106,8 @@ const KdMonitorTiming kdMonitorTimings[
10 16, 120, 176, KdSyncNegative, /* 37.861 */
11 1, 20, 24, KdSyncNegative, /* 72.809 */
12 },
13+ /* DEFAULT */
14+#define MONITOR_TIMING_DEFAULT 13
15 { 640, 480, 60, 25175, /* VESA */
16 16, 48, 160, KdSyncNegative, /* 31.469 */
17 10, 33, 45, KdSyncNegative, /* 59.940 */
18@@ -127,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
19 16, 160, 256, KdSyncPositive, /* 46.875 */
20 1, 21, 25, KdSyncPositive, /* 75.000 */
21 },
22- /* DEFAULT */
23-#define MONITOR_TIMING_DEFAULT 9
24 { 800, 600, 72, 50000, /* VESA */
25 56, 64, 240, KdSyncPositive, /* 48.077 */
26 37, 23, 66, KdSyncPositive, /* 72.188 */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode-palm.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode-palm.patch
deleted file mode 100644
index 255e707b55..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode-palm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1--- kmode.c 2006-05-03 19:48:42.000000000 +0200
2+++ xserver/hw/kdrive/src/kmode.c 2006-05-03 19:50:43.000000000 +0200
3@@ -32,6 +32,31 @@
4 /* H V Hz KHz */
5 /* FP BP BLANK POLARITY */
6
7+ /* Treo 650 */
8+
9+ { 320, 320, 64, 16256,
10+ 17, 12, 32, KdSyncNegative,
11+ 1, 11, 14, KdSyncNegative,
12+ },
13+
14+ { 320, 320, 64, 0,
15+ 0, 0, 0, KdSyncNegative,
16+ 0, 0, 0, KdSyncNegative,
17+ },
18+
19+ /* LifeDrive/T3/TX modes */
20+
21+ { 320, 480, 64, 16256,
22+ 17, 12, 32, KdSyncNegative,
23+ 1, 11, 14, KdSyncNegative,
24+ },
25+
26+ { 480, 320, 64, 0,
27+ 0, 0, 0, KdSyncNegative,
28+ 0, 0, 0, KdSyncNegative,
29+ },
30+
31+
32 /* IPAQ modeline:
33 *
34 * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode.patch
deleted file mode 100644
index 5ad3e4e277..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1--- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200
2+++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200
3@@ -41,6 +41,11 @@
4 1, 11, 14, KdSyncNegative,
5 },
6
7+ { 240, 320, 64, 0,
8+ 0, 0, 0, KdSyncNegative,
9+ 0, 0, 0, KdSyncNegative,
10+ },
11+
12 /* Other VESA modes */
13 { 640, 350, 85, 31500, /* VESA */
14 32, 96, 192, KdSyncPositive, /* 26.413 */
15@@ -80,6 +85,13 @@
16 16, 48, 160, KdSyncNegative, /* 31.469 */
17 10, 33, 45, KdSyncNegative, /* 59.940 */
18 },
19+
20+
21+ { 480, 640, 60, 0, /* VESA */
22+ 0, 0, 0, KdSyncNegative, /* 31.469 */
23+ 0, 0, 0, KdSyncNegative, /* 59.940 */
24+ },
25+
26
27 /* 800x600 modes */
28 { 800, 600, 85, 56250, /* VESA */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 65a9009ad4..fa1563d549 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,22 +3,20 @@ require xserver-kdrive.inc
3DEPENDS += "libxkbfile libxcalibrate" 3DEPENDS += "libxkbfile libxcalibrate"
4 4
5PE = "1" 5PE = "1"
6PR = "r16" 6PR = "r17"
7 7
8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
9 file://kmode.patch;patch=1 \ 9 file://extra-kmodes.patch;patch=1 \
10 file://fbdev_use_current.patch;patch=1 \
10 file://disable-apm.patch;patch=1 \ 11 file://disable-apm.patch;patch=1 \
11 file://no-serial-probing.patch;patch=1 \ 12 file://no-serial-probing.patch;patch=1 \
12 file://kdrive-evdev.patch;patch=1 \ 13 file://kdrive-evdev.patch;patch=1 \
13 file://kdrive-use-evdev.patch;patch=1 \ 14 file://kdrive-use-evdev.patch;patch=1 \
14 file://fbdev-not-fix.patch;patch=1 \
15 file://enable-builtin-fonts.patch;patch=1 \ 15 file://enable-builtin-fonts.patch;patch=1 \
16 file://disable-xf86-dga-xorgcfg.patch;patch=1 \ 16 file://disable-xf86-dga-xorgcfg.patch;patch=1 \
17 file://optional-xkb.patch;patch=1 \ 17 file://optional-xkb.patch;patch=1 \
18 file://enable-epson.patch;patch=1 \ 18 file://enable-epson.patch;patch=1 \
19 file://enable-tslib.patch;patch=1 \ 19 file://enable-tslib.patch;patch=1 \
20 file://kmode-palm.patch;patch=1 \
21 file://fix_default_mode.patch;patch=1 \
22 file://enable-xcalibrate.patch;patch=1 \ 20 file://enable-xcalibrate.patch;patch=1 \
23 file://hide-cursor-and-ppm-root.patch;patch=1 \ 21 file://hide-cursor-and-ppm-root.patch;patch=1 \
24 file://xcalibrate_coords.patch;patch=1" 22 file://xcalibrate_coords.patch;patch=1"