6 files changed, 27 insertions, 19 deletions
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index c4c1237bae..1f29438061 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -27,7 +27,8 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootf
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
-			      kernel-module-snd-soc-h5000"
+			      kernel-module-snd-soc-h5000 \
+			      kernel-module-i2c-pxa"
 
 #
 # Modules autoload and other boot properties
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index a44056f316..f8a94c63b2 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r58"
+PR = "r59"
 
 inherit task
 
diff --git a/packages/xorg-app/bdftopcf-native_1.0.0.bb b/packages/xorg-app/bdftopcf-native_1.0.0.bb
index 8ab592b2b2..41049946e5 100644
--- a/packages/xorg-app/bdftopcf-native_1.0.0.bb
+++ b/packages/xorg-app/bdftopcf-native_1.0.0.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "Native bdftopdf utility"
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-app-common.inc
 PE = "1"
 
-S="${WORKDIR}/bdftopcf-${PV}"
+XORG_PN = "bdftopcf"
 
 DEPENDS = "libxfont-native"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-font/font-util-native_1.0.1.bb b/packages/xorg-font/font-util-native_1.0.1.bb
index 8db0b71898..32ea62c3d5 100644
--- a/packages/xorg-font/font-util-native_1.0.1.bb
+++ b/packages/xorg-font/font-util-native_1.0.1.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "X font utils."
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-font-common.inc
 
-S="${WORKDIR}/font-util-${PV}"
+XORG_PN = "font-util"
 
 DEPENDS = "bdftopcf-native"
 
 PE = "1"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
-
-inherit native autotools pkgconfig
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
new file mode 100644
index 0000000000..4964ff5479
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
@@ -0,0 +1,16 @@
+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
+@@ -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/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb
index f4d5be38e1..c87090197c 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://xcalibrate-new-input-world-order.patch;patch=1 \
 	file://tslib-default-device.patch;patch=1 \
 	file://fbdev-evdev.patch;patch=1 \
+	file://keyboard-resume-workaround.patch;patch=1 \
 	file://xorg-avr32-support.diff;patch=1 \
         "