summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-11 16:06:46 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-11 16:06:46 +0000
commite49fcdcc8b1855368b33b4510d1030702926d720 (patch)
treedfee636aa91a79345b069d1db3cfa91455736c8c
parent6054d36e7a0baae31f7ccb79c0e60e1126240ba2 (diff)
downloadpoky-e49fcdcc8b1855368b33b4510d1030702926d720.tar.gz
xserver-kdrive: Add keyboard fix (partially from OE.dev
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch25
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb6
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb4
3 files changed, 32 insertions, 3 deletions
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 0000000000..d614b547a8
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
@@ -0,0 +1,25 @@
1Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
2===================================================================
3--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200
4+++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200
5@@ -486,6 +486,8 @@
6 ki->minScanCode = minKeyCode;
7 ki->maxScanCode = maxKeyCode;
8 #endif
9+ ki->minScanCode = 0;
10+ ki->maxScanCode = NR_KEYS;
11 }
12
13 /*
14@@ -743,11 +743,6 @@
15 cfsetispeed(&nTty, 9600);
16 cfsetospeed(&nTty, 9600);
17 tcsetattr(fd, TCSANOW, &nTty);
18- /*
19- * Flush any pending keystrokes
20- */
21- while ((n = read (fd, buf, sizeof (buf))) > 0)
22- ;
23 KdRegisterFd (fd, LinuxKeyboardRead, ki);
24 return Success;
25 }
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 55f44dfec0..f0fb6e2d1f 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"
7EXTRA_OECONF += "--disable-glx" 7EXTRA_OECONF += "--disable-glx"
8 8
9PE = "1" 9PE = "1"
10PR = "r23" 10PR = "r24"
11 11
12SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 12SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
13 file://extra-kmodes.patch;patch=1 \ 13 file://extra-kmodes.patch;patch=1 \
@@ -16,12 +16,12 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
16# file://kdrive-evdev.patch;patch=1 \ 16# file://kdrive-evdev.patch;patch=1 \
17# file://kdrive-use-evdev.patch;patch=1 \ 17# file://kdrive-use-evdev.patch;patch=1 \
18# file://enable-builtin-fonts.patch;patch=1 \ 18# file://enable-builtin-fonts.patch;patch=1 \
19# file://disable-xf86-dga-xorgcfg.patch;patch=1 \
20# file://optional-xkb.patch;patch=1 \ 19# file://optional-xkb.patch;patch=1 \
20 file://keyboard-resume-workaround.patch;patch=1 \
21 file://enable-xcalibrate.patch;patch=1 \ 21 file://enable-xcalibrate.patch;patch=1 \
22 file://hide-cursor-and-ppm-root.patch;patch=1 \ 22 file://hide-cursor-and-ppm-root.patch;patch=1 \
23 file://fbdev_xrandr_ioctl.patch;patch=1 \ 23 file://fbdev_xrandr_ioctl.patch;patch=1 \
24 file://fix-newer-xorg-headers.patch;patch=1 \ 24 file://fix-newer-xorg-headers.patch;patch=1 \
25 file://crosscompile.patch;patch=1" 25 file://crosscompile.patch;patch=1"
26 26
27S = "${WORKDIR}/xorg-server-${PV}" 27S = "${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 0000000000..4771404c46
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
@@ -0,0 +1,4 @@
1require xserver-xf86-lite.inc
2
3SRC_URI += "file://nodolt.patch;patch=1 \
4 file://crosscompile.patch;patch=1"