xorg-kdrive: Add missing dependencies and 600x800 mode

SVN-Revision: 20168

diff --git a/Xorg/xorg/xserver/xorg-kdrive/Makefile b/Xorg/xorg/xserver/xorg-kdrive/Makefile
index 819939780aac8a61d76e561f93d4a5028ef56173..aeaa1ad399d2da5eeb632abb3e0deccbf8fbd249 100644 (file)
--- a/Xorg/xorg/xserver/xorg-kdrive/Makefile
+++ b/Xorg/xorg/xserver/xorg-kdrive/Makefile
@@ -50,6 +50,8 @@ define Package/xserver-kdrive/Default
   +pixman \
   +libopenssl \
   +libdrm \
+  +xkbcomp \
+  +xkbdata \
   @DISPLAY_SUPPORT \
   +X_TSLIB:tslib
 endef

diff --git a/Xorg/xorg/xserver/xorg-kdrive/patches/002-480x640-support.patch b/Xorg/xorg/xserver/xorg-kdrive/patches/002-480x640-support.patch
deleted file mode 100644 (file)
index f2192cf..0000000
--- a/Xorg/xorg/xserver/xorg-kdrive/patches/002-480x640-support.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xorg-server-1.5.1/hw/kdrive/src/kmode.c.orig       2007-10-23 23:26:50.000000000 +0200
-+++ xorg-server-1.5.1/hw/kdrive/src/kmode.c    2008-10-05 14:55:24.000000000 +0200
-@@ -78,6 +78,12 @@
-                  16,      48,     160,    KdSyncNegative, /* 31.469 */
-                  10,      33,     45,     KdSyncNegative, /* 59.940 */
-     },
-+
-+    /* 480x640 modes */
-+       {   480,    640,    60,     0,                      /* VESA */
-+               0,      0,     0,    KdSyncNegative, /* 31.469 */
-+               0,      0,     0,     KdSyncNegative, /* 59.940 */
-+    },
-     
-     /* 800x600 modes */
-     { 800,    600,    85,     56250,                      /* VESA */

diff --git a/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch b/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch
new file mode 100644 (file)
index 0000000..f7b3e02
--- /dev/null
+++ b/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch
@@ -0,0 +1,26 @@
+--- xorg-server-1.5.1/hw/kdrive/src/kmode.c.orig       2007-10-23 23:26:50.000000000 +0200
++++ xorg-server-1.5.1/hw/kdrive/src/kmode.c    2008-10-05 14:55:24.000000000 +0200
+@@ -78,6 +78,12 @@
+                  16,      48,     160,    KdSyncNegative, /* 31.469 */
+                  10,      33,     45,     KdSyncNegative, /* 59.940 */
+     },
++
++    /* 480x640 modes */
++       {   480,    640,    60,     0,                      /* VESA */
++               0,      0,     0,    KdSyncNegative, /* 31.469 */
++               0,      0,     0,     KdSyncNegative, /* 59.940 */
++    },
+     
+     /* 800x600 modes */
+     { 800,    600,    85,     56250,                      /* VESA */
+@@ -102,6 +108,10 @@ const KdMonitorTiming  kdMonitorTimings[] = {
+                   24,     128,    224,    KdSyncPositive, /* 35.156 */
+                   1,      22,     25,     KdSyncPositive, /* 56.250 */
+     },
++    { 600,    800,    56,     36000,                      /* VESA */
++                  24,     128,    224,    KdSyncPositive, /* 35.156 */
++                  1,      22,     25,     KdSyncPositive, /* 56.250 */
++    },
+     
+     /* 1024x768 modes */
+     { 1024,   768,    85,     94500,                      /* VESA */