summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-10-12 11:37:45 +0000
committerKoen Kooi <koen@openembedded.org>2007-10-12 11:37:45 +0000
commit1c5df3f485ba9992931e06d07f28c57a29d89e5e (patch)
treef1f786842f479fcdef015d6bfb430f8ea599fac1 /packages/xorg-xserver
parentd6fd6d24ea9cef7d661bed9424f54a7719bea5dc (diff)
parent276e2ad3fd901d3fca0291979abc9c10455232ee (diff)
propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)
to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch23
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb8
2 files changed, 28 insertions, 3 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch b/packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch
new file mode 100644
index 0000000000..56817a7001
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch
@@ -0,0 +1,23 @@
+--- /tmp/kmode.c 2007-10-07 11:49:52.000000000 +0200
++++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2007-10-07 11:51:57.962045000 +0200
+@@ -119,7 +119,19 @@
+ 0, 0, 0, KdSyncNegative, /* 59.940 */
+ },
+
+-
++
++/* gumstix console-vx */
++ { 480, 272, 60, 0, /* VESA */
++ 0, 0, 0, KdSyncNegative, /* 31.469 */
++ 0, 0, 0, KdSyncNegative, /* 59.940 */
++ },
++
++ { 272, 480, 60, 0, /* VESA */
++ 0, 0, 0, KdSyncNegative, /* 31.469 */
++ 0, 0, 0, KdSyncNegative, /* 59.940 */
++ },
++
++
+ /* 800x600 modes */
+ { 800, 600, 85, 56250, /* VESA */
+ 32, 152, 248, KdSyncPositive, /* 53.674 */
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index e49650dc61..7822e4079a 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r18"
+PR = "r19"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -19,8 +19,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://w100.patch;patch=1 \
file://w100-autofoo.patch;patch=1 \
file://w100-fix-offscreen-bmp.patch;patch=1 \
- file://xorg-avr32-support.diff;patch=1 \
- "
+ file://xorg-avr32-support.diff;patch=1 \
+ file://kdrive-1.3-18bpp.patch;patch=1 \
+ file://gumstix-kmode.patch;patch=1 \
+"
S = "${WORKDIR}/xorg-server-${PV}"