summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-23 10:33:39 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-23 10:33:39 +0000
commita2513fb4c43954296aab493312bb6dbd8299c4c9 (patch)
treecbc9fcffada8984b3684d48a5b32f6a395674df1 /meta/packages/xorg-xserver
parentfe4ec82510d6b7ba16268939d3b7dec04184518f (diff)
downloadpoky-a2513fb4c43954296aab493312bb6dbd8299c4c9.tar.gz
xserver-kdrive: use extra-kmodes.patch for 1.4.99.901, changed status of patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4321 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver')
-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.4.99.901/fix_default_mode.patch26
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode-palm.patch34
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode.patch28
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb6
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb18
6 files changed, 11 insertions, 184 deletions
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
deleted file mode 100644
index 14cf99055b..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
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.4.99.901/fix_default_mode.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/fix_default_mode.patch
deleted file mode 100644
index edc5146302..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/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.4.99.901/kmode-palm.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode-palm.patch
deleted file mode 100644
index 255e707b55..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/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.4.99.901/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode.patch
deleted file mode 100644
index 5ad3e4e277..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/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 b2acdd57c8..6b494d3e45 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
@@ -7,7 +7,7 @@ PR = "r18"
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://extra-kmodes.patch;patch=1 \ 9 file://extra-kmodes.patch;patch=1 \
10 file://fbdev_use_current.patch;patch=1 \ 10 file://fbdev_use_current.patch;patch=1;status=merged \
11 file://disable-apm.patch;patch=1 \ 11 file://disable-apm.patch;patch=1 \
12 file://no-serial-probing.patch;patch=1 \ 12 file://no-serial-probing.patch;patch=1 \
13 file://kdrive-evdev.patch;patch=1 \ 13 file://kdrive-evdev.patch;patch=1 \
@@ -15,8 +15,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
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;status=merged \
19 file://enable-tslib.patch;patch=1 \ 19 file://enable-tslib.patch;patch=1;status=merged \
20 file://enable-xcalibrate.patch;patch=1 \ 20 file://enable-xcalibrate.patch;patch=1 \
21 file://hide-cursor-and-ppm-root.patch;patch=1 \ 21 file://hide-cursor-and-ppm-root.patch;patch=1 \
22 file://xcalibrate_coords.patch;patch=1 \ 22 file://xcalibrate_coords.patch;patch=1 \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 611c94c50a..755b7c97f7 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -5,32 +5,30 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
5DEFAULT_PREFERENCE = "-99" 5DEFAULT_PREFERENCE = "-99"
6 6
7PE = "1" 7PE = "1"
8PR = "r2" 8PR = "r3"
9 9
10SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 10SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
11 file://kmode.patch;patch=1 \ 11 file://extra-kmodes.patch;patch=1 \
12 file://disable-apm.patch;patch=1 \ 12 file://disable-apm.patch;patch=1 \
13 file://no-serial-probing.patch;patch=1 \ 13 file://no-serial-probing.patch;patch=1 \
14 file://fbdev-not-fix.patch;patch=1 \ 14 file://fbdev-not-fix.patch;patch=1 \
15 file://optional-xkb.patch;patch=1 \ 15 file://optional-xkb.patch;patch=1 \
16 file://enable-tslib.patch;patch=1;merged \ 16 file://enable-tslib.patch;patch=1;status=merged \
17 file://kmode-palm.patch;patch=1 \ 17 file://enable-epson.patch;patch=1;status=merged \
18 file://enable-epson.patch;patch=1 \
19 file://fix_default_mode.patch;patch=1 \
20# file://hide-cursor-and-ppm-root.patch;patch=1 \ 18# file://hide-cursor-and-ppm-root.patch;patch=1 \
21# file://xcalibrate_coords.patch;patch=1 \ 19# file://xcalibrate_coords.patch;patch=1 \
22 file://w100.patch;patch=1 \ 20 file://w100.patch;patch=1 \
23 file://w100-autofoo.patch;patch=1 \ 21 file://w100-autofoo.patch;patch=1 \
24 file://w100-fix-offscreen-bmp.patch;patch=1 \ 22 file://w100-fix-offscreen-bmp.patch;patch=1 \
25 file://w100-new-input-world-order.patch;patch=1 \ 23 file://w100-new-input-world-order.patch;patch=1 \
26 file://linux-keyboard-mediumraw.patch;patch=1 \ 24 file://linux-keyboard-mediumraw.patch;patch=1;status=merged \
27 file://xcalibrate-new-input-world-order.patch;patch=1 \ 25 file://xcalibrate-new-input-world-order.patch;patch=1 \
28 file://tslib-default-device.patch;patch=1;merged \ 26 file://tslib-default-device.patch;patch=1;status=merged \
29# file://fbdev-evdev.patch;patch=1 \ 27# file://fbdev-evdev.patch;patch=1 \
30 file://keyboard-resume-workaround.patch;patch=1 \ 28 file://keyboard-resume-workaround.patch;patch=1 \
31 file://xorg-avr32-support.diff;patch=1;merged \ 29 file://xorg-avr32-support.diff;patch=1;status=merged \
32# file://pkgconfig_fix.patch;patch=1 \ 30# file://pkgconfig_fix.patch;patch=1 \
33 file://no_xkb.patch;patch=1;pnum=0;merged \ 31 file://no_xkb.patch;patch=1;pnum=0;status=merged \
34 " 32 "
35 33
36S = "${WORKDIR}/xorg-server-${PV}" 34S = "${WORKDIR}/xorg-server-${PV}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-03 06:48:39 +0000