From e49fcdcc8b1855368b33b4510d1030702926d720 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 11 Feb 2010 16:06:46 +0000
Subject: xserver-kdrive: Add keyboard fix (partially from OE.dev

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../keyboard-resume-workaround.patch               | 25 ++++++++++++++++++++++
 .../xorg-xserver/xserver-kdrive_1.7.99.2.bb        |  6 +++---
 .../xorg-xserver/xserver-xf86-lite_1.7.99.2.bb     |  4 ++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
 create mode 100644 meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
new file mode 100644
index 000000000..d614b547a
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
@@ -0,0 +1,25 @@
+Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c	2007-09-29 18:31:15.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c	2007-09-29 18:33:02.000000000 +0200
+@@ -486,6 +486,8 @@
+     ki->minScanCode = minKeyCode;
+     ki->maxScanCode = maxKeyCode;
+ #endif
++    ki->minScanCode = 0;
++    ki->maxScanCode = NR_KEYS;
+ }
+ 
+ /*
+@@ -743,11 +743,6 @@
+     cfsetispeed(&nTty, 9600);
+     cfsetospeed(&nTty, 9600);
+     tcsetattr(fd, TCSANOW, &nTty);
+-    /*
+-     * Flush any pending keystrokes
+-     */
+-    while ((n = read (fd, buf, sizeof (buf))) > 0)
+-	;
+     KdRegisterFd (fd, LinuxKeyboardRead, ki);
+     return Success;
+ }
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
index 55f44dfec..f0fb6e2d1 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN} += "xkeyboard-config"
 EXTRA_OECONF += "--disable-glx"
 
 PE = "1"
-PR = "r23"
+PR = "r24"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://extra-kmodes.patch;patch=1 \
@@ -16,12 +16,12 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 #	file://kdrive-evdev.patch;patch=1  \
 #	file://kdrive-use-evdev.patch;patch=1  \
 #	file://enable-builtin-fonts.patch;patch=1 \
-#	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
 #	file://optional-xkb.patch;patch=1 \
+	file://keyboard-resume-workaround.patch;patch=1 \
 	file://enable-xcalibrate.patch;patch=1 \
 	file://hide-cursor-and-ppm-root.patch;patch=1 \
 	file://fbdev_xrandr_ioctl.patch;patch=1 \
 	file://fix-newer-xorg-headers.patch;patch=1 \
-        file://crosscompile.patch;patch=1"
+	file://crosscompile.patch;patch=1"
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
new file mode 100644
index 000000000..4771404c4
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
@@ -0,0 +1,4 @@
+require xserver-xf86-lite.inc
+
+SRC_URI += "file://nodolt.patch;patch=1 \
+            file://crosscompile.patch;patch=1"
-- 
cgit v1.2.3