summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-16 09:38:51 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-16 09:38:51 +0000
commit9ddbe0c2c8f2aab438693a96b6c7bf0ab0d644b2 (patch)
tree9010f077176601feeb35678b71df3b3c2fef3027
parenteb68c6e3dd355798b4e2c4e026c6124d81025021 (diff)
downloadpoky-9ddbe0c2c8f2aab438693a96b6c7bf0ab0d644b2.tar.gz
xserver-kdrive: Make VGA the default video mode
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1729 311d38ba-8fff-0310-9ca6-ca027cbcb966
-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.bb3
2 files changed, 28 insertions, 1 deletions
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
new file mode 100644
index 0000000000..edc5146302
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
@@ -0,0 +1,26 @@
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.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 59ee2a7c20..a8df78bd59 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,10 +3,11 @@ require xserver-kdrive-common.inc
3DEPENDS += "libxkbfile libxcalibrate" 3DEPENDS += "libxkbfile libxcalibrate"
4 4
5PE = "1" 5PE = "1"
6PR = "r9" 6PR = "r10"
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 ${KDRIVE_COMMON_PATCHES} \ 9 ${KDRIVE_COMMON_PATCHES} \
10 file://fix_default_mode.patch;patch=1 \
10 file://enable-xcalibrate.patch;patch=1 " 11 file://enable-xcalibrate.patch;patch=1 "
11 12
12S = "${WORKDIR}/xorg-server-${PV}" 13S = "${WORKDIR}/xorg-server-${PV}"