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

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 @@
+---
+ hw/kdrive/src/kmode.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c      2007-05-16 10:30:29.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c   2007-05-16 10:31:08.000000000 +0100
+@@ -106,6 +106,8 @@ const KdMonitorTiming  kdMonitorTimings[
+                    16,     120,    176,    KdSyncNegative, /* 37.861 */
+                    1,      20,     24,     KdSyncNegative, /* 72.809 */
+     },
++    /* DEFAULT */
++#define MONITOR_TIMING_DEFAULT 13
+     {  640,    480,    60,     25175,                      /* VESA */
+                   16,      48,     160,    KdSyncNegative, /* 31.469 */
+                   10,      33,     45,     KdSyncNegative, /* 59.940 */
+@@ -127,8 +129,6 @@ const KdMonitorTiming  kdMonitorTimings[
+                    16,     160,    256,    KdSyncPositive, /* 46.875 */
+                    1,      21,     25,     KdSyncPositive, /* 75.000 */
+     },
+-    /* DEFAULT */
+-#define MONITOR_TIMING_DEFAULT 9
+     {  800,    600,    72,     50000,                      /* VESA */
+                    56,     64,     240,    KdSyncPositive, /* 48.077 */
+                    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
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         ${KDRIVE_COMMON_PATCHES} \
+        file://fix_default_mode.patch;patch=1 \
         file://enable-xcalibrate.patch;patch=1 "
 
 S = "${WORKDIR}/xorg-server-${PV}"