diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-02-11 16:06:46 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-11 16:06:46 +0000 |
| commit | e49fcdcc8b1855368b33b4510d1030702926d720 (patch) | |
| tree | dfee636aa91a79345b069d1db3cfa91455736c8c | |
| parent | 6054d36e7a0baae31f7ccb79c0e60e1126240ba2 (diff) | |
| download | openembedded-core-contrib-e49fcdcc8b1855368b33b4510d1030702926d720.tar.gz | |
xserver-kdrive: Add keyboard fix (partially from OE.dev
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 @@ +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 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" 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 0000000000..4771404c46 --- /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" |