xorg: new versions for 20101101

* tested on SHR/gta-02, SHR/spitz, SHR/nokia900

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

54 files changed, 506 insertions, 85 deletions

diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 9377338d2d..c38580e81e 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,17 +1,17 @@
-#Sat Oct 30 10:30:36 CEST 2010
+#Mon Nov  1 07:54:05 CET 2010
 #app
-PREFERRED_VERSION_appres ?= "1.0.2"
+PREFERRED_VERSION_appres ?= "1.0.3"
 PREFERRED_VERSION_bdftopcf ?= "1.0.3"
 PREFERRED_VERSION_bdftopcf-native ?= "1.0.3"
-PREFERRED_VERSION_beforelight ?= "1.0.3"
+PREFERRED_VERSION_beforelight ?= "1.0.4"
 PREFERRED_VERSION_bitmap ?= "1.0.5"
-PREFERRED_VERSION_constype ?= "1.0.2"
-PREFERRED_VERSION_editres ?= "1.0.4"
+PREFERRED_VERSION_constype ?= "1.0.3"
+PREFERRED_VERSION_editres ?= "1.0.5"
 PREFERRED_VERSION_fonttosfnt ?= "1.0.4"
-PREFERRED_VERSION_fslsfonts ?= "1.0.2"
-PREFERRED_VERSION_fstobdf ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "1.0.3"
+PREFERRED_VERSION_fstobdf ?= "1.0.4"
 PREFERRED_VERSION_iceauth ?= "1.0.4"
-PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.3"
 PREFERRED_VERSION_lbxproxy ?= "1.0.2"
 PREFERRED_VERSION_listres ?= "1.0.2"
 PREFERRED_VERSION_luit ?= "1.1.0"
@@ -22,17 +22,17 @@ PREFERRED_VERSION_mkfontdir-native ?= "1.0.5"
 PREFERRED_VERSION_mkfontscale ?= "1.0.8"
 PREFERRED_VERSION_mkfontscale-native ?= "1.0.8"
 PREFERRED_VERSION_oclock ?= "1.0.2"
-PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.2"
 PREFERRED_VERSION_rendercheck ?= "1.3"
 PREFERRED_VERSION_rgb ?= "1.0.4"
-PREFERRED_VERSION_rstart ?= "1.0.3"
+PREFERRED_VERSION_rstart ?= "1.0.4"
 PREFERRED_VERSION_scripts ?= "1.0.1"
 PREFERRED_VERSION_sessreg ?= "1.0.6"
 PREFERRED_VERSION_setxkbmap ?= "1.2.0"
-PREFERRED_VERSION_showfont ?= "1.0.2"
+PREFERRED_VERSION_showfont ?= "1.0.3"
 PREFERRED_VERSION_smproxy ?= "1.0.4"
-PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.5"
+PREFERRED_VERSION_viewres ?= "1.0.3"
 PREFERRED_VERSION_x11perf ?= "1.5.2"
 PREFERRED_VERSION_xauth ?= "1.0.5"
 PREFERRED_VERSION_xbacklight ?= "1.1.1"
@@ -45,67 +45,67 @@ PREFERRED_VERSION_xcompmgr ?= "1.1.5"
 PREFERRED_VERSION_xconsole ?= "1.0.4"
 PREFERRED_VERSION_xcursorgen ?= "1.0.4"
 PREFERRED_VERSION_xcursorgen-native ?= "1.0.4"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.1.0"
 PREFERRED_VERSION_xditview ?= "1.0.2"
 PREFERRED_VERSION_xdm ?= "1.1.10"
 PREFERRED_VERSION_xdpyinfo ?= "1.2.0"
 PREFERRED_VERSION_xdriinfo ?= "1.0.3"
-PREFERRED_VERSION_xedit ?= "1.1.2"
-PREFERRED_VERSION_xev ?= "1.0.4"
+PREFERRED_VERSION_xedit ?= "1.2.0"
+PREFERRED_VERSION_xev ?= "1.1.0"
 PREFERRED_VERSION_xeyes ?= "1.1.0"
-PREFERRED_VERSION_xf86dga ?= "1.0.2"
+PREFERRED_VERSION_xf86dga ?= "1.0.3"
 PREFERRED_VERSION_xfd ?= "1.1.0"
 PREFERRED_VERSION_xfindproxy ?= "1.0.1"
 PREFERRED_VERSION_xfontsel ?= "1.0.3"
-PREFERRED_VERSION_xfs ?= "1.1.0"
-PREFERRED_VERSION_xfsinfo ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.1.1"
+PREFERRED_VERSION_xfsinfo ?= "1.0.3"
 PREFERRED_VERSION_xfwp ?= "1.0.1"
 PREFERRED_VERSION_xgamma ?= "1.0.3"
-PREFERRED_VERSION_xgc ?= "1.0.2"
-PREFERRED_VERSION_xhost ?= "1.0.3"
-PREFERRED_VERSION_xinit ?= "1.2.1"
+PREFERRED_VERSION_xgc ?= "1.0.3"
+PREFERRED_VERSION_xhost ?= "1.0.4"
+PREFERRED_VERSION_xinit ?= "1.3.0"
 PREFERRED_VERSION_xinput ?= "1.5.2"
-PREFERRED_VERSION_xkbcomp ?= "1.1.1"
-PREFERRED_VERSION_xkbcomp-native ?= "1.1.1"
-PREFERRED_VERSION_xkbevd ?= "1.1.0"
+PREFERRED_VERSION_xkbcomp ?= "1.2.0"
+PREFERRED_VERSION_xkbcomp-native ?= "1.2.0"
+PREFERRED_VERSION_xkbevd ?= "1.1.1"
 PREFERRED_VERSION_xkbprint ?= "1.0.2"
-PREFERRED_VERSION_xkbutils ?= "1.0.2"
+PREFERRED_VERSION_xkbutils ?= "1.0.3"
 PREFERRED_VERSION_xkill ?= "1.0.2"
 PREFERRED_VERSION_xload ?= "1.1.0"
-PREFERRED_VERSION_xlogo ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.3"
 PREFERRED_VERSION_xlsatoms ?= "1.1.0"
 PREFERRED_VERSION_xlsclients ?= "1.1.1"
 PREFERRED_VERSION_xlsfonts ?= "1.0.3"
-PREFERRED_VERSION_xmag ?= "1.0.3"
-PREFERRED_VERSION_xman ?= "1.1.0"
+PREFERRED_VERSION_xmag ?= "1.0.4"
+PREFERRED_VERSION_xman ?= "1.1.1"
 PREFERRED_VERSION_xmessage ?= "1.0.3"
-PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmh ?= "1.0.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.5"
 PREFERRED_VERSION_xmore ?= "1.0.2"
 PREFERRED_VERSION_xphelloworld ?= "1.0.1"
 PREFERRED_VERSION_xplsprinters ?= "1.0.1"
 PREFERRED_VERSION_xpr ?= "1.0.3"
 PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
-PREFERRED_VERSION_xprop ?= "1.1.0"
-PREFERRED_VERSION_xrandr ?= "1.3.3"
+PREFERRED_VERSION_xprop ?= "1.2.0"
+PREFERRED_VERSION_xrandr ?= "1.3.4"
 PREFERRED_VERSION_xrdb ?= "1.0.6"
 PREFERRED_VERSION_xrefresh ?= "1.0.3"
-PREFERRED_VERSION_xrx ?= "1.0.3"
+PREFERRED_VERSION_xrx ?= "1.0.4"
 PREFERRED_VERSION_xset ?= "1.2.0"
 PREFERRED_VERSION_xsetmode ?= "1.0.0"
 PREFERRED_VERSION_xsetpointer ?= "1.0.1"
-PREFERRED_VERSION_xsetroot ?= "1.0.3"
+PREFERRED_VERSION_xsetroot ?= "1.1.0"
 PREFERRED_VERSION_xsm ?= "1.0.2"
 PREFERRED_VERSION_xstdcmap ?= "1.0.2"
 PREFERRED_VERSION_xtrap ?= "1.0.2"
 PREFERRED_VERSION_xvidtune ?= "1.0.2"
 PREFERRED_VERSION_xvinfo ?= "1.1.0"
 PREFERRED_VERSION_xwd ?= "1.0.3"
-PREFERRED_VERSION_xwininfo ?= "1.1.0"
+PREFERRED_VERSION_xwininfo ?= "1.1.1"
 PREFERRED_VERSION_xwud ?= "1.0.2"
 #data
 PREFERRED_VERSION_xbitmaps ?= "1.1.0"
-PREFERRED_VERSION_xcursor-themes ?= "1.0.2"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.3"
 PREFERRED_VERSION_xkbdata ?= "1.0.1"
 #doc
 PREFERRED_VERSION_xorg-docs ?= "1.5"
@@ -125,7 +125,7 @@ PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
 PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
@@ -139,7 +139,7 @@ PREFERRED_VERSION_xf86-input-synaptics ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
 PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.10"
-PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-void ?= "1.3.1"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-ark ?= "0.7.3"
 PREFERRED_VERSION_xf86-video-ast ?= "0.91.10"
@@ -255,7 +255,7 @@ PREFERRED_VERSION_libxcursor-native ?= "1.1.11"
 PREFERRED_VERSION_libxdamage ?= "1.1.3"
 PREFERRED_VERSION_libxdmcp ?= "1.1.0"
 PREFERRED_VERSION_libxdmcp-native ?= "1.1.0"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.3"
 PREFERRED_VERSION_libxext ?= "1.2.0"
 PREFERRED_VERSION_libxext-native ?= "1.2.0"
 PREFERRED_VERSION_libxfixes ?= "4.0.5"
@@ -345,7 +345,7 @@ PREFERRED_VERSION_xproto-native ?= "7.0.18"
 PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 #util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.3"
+PREFERRED_VERSION_imake ?= "1.0.4"
 PREFERRED_VERSION_lndir ?= "1.0.2"
 PREFERRED_VERSION_makedepend ?= "1.0.3"
 PREFERRED_VERSION_makedepend-native ?= "1.0.3"
@@ -353,4 +353,4 @@ PREFERRED_VERSION_util-macros ?= "1.11.0"
 PREFERRED_VERSION_util-macros-native ?= "1.11.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
-PREFERRED_VERSION_xserver-xorg ?= "1.9.1"
+PREFERRED_VERSION_xserver-xorg ?= "1.9.2"
diff --git a/recipes/xorg-app/appres_1.0.3.bb b/recipes/xorg-app/appres_1.0.3.bb
new file mode 100644
index 0000000000..79aea63f67
--- /dev/null
+++ b/recipes/xorg-app/appres_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "The appres program prints the resources seen by an application."
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "48d56924f76738872ef6c90f99030e34"
+SRC_URI[archive.sha256sum] = "93f475046a8c5055131c5551d5a36ff62aa138a7b2f17ac1bf6393cde8dc640a"
diff --git a/recipes/xorg-app/beforelight_1.0.4.bb b/recipes/xorg-app/beforelight_1.0.4.bb
new file mode 100644
index 0000000000..160e751caa
--- /dev/null
+++ b/recipes/xorg-app/beforelight_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a sample implementation of a screen saver for X"
+DEPENDS += " libxscrnsaver libxt libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e248acedcc95d44bdd140bdb861fdcee"
+SRC_URI[archive.sha256sum] = "38f1d5380704234a37306ee13ea53be6eed4a1c6eb2c8ebdacca181465da56bb"
diff --git a/recipes/xorg-app/constype_1.0.3.bb b/recipes/xorg-app/constype_1.0.3.bb
new file mode 100644
index 0000000000..d21edb40f5
--- /dev/null
+++ b/recipes/xorg-app/constype_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7347bb324e3095f8791386b8154edc11"
+SRC_URI[archive.sha256sum] = "41151d05e878d6102eba65ce750de184e183fd2e6db9acba486accae44ce366a"
diff --git a/recipes/xorg-app/editres_1.0.5.bb b/recipes/xorg-app/editres_1.0.5.bb
new file mode 100644
index 0000000000..c1bbd27260
--- /dev/null
+++ b/recipes/xorg-app/editres_1.0.5.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "87e499fd2599910af7961187205ca7ed"
+SRC_URI[archive.sha256sum] = "fd97a3522e97b8b7ead7b5cddeb79bfabe44769d144ac9ae5595c25c41afa33d"
diff --git a/recipes/xorg-app/fslsfonts_1.0.3.bb b/recipes/xorg-app/fslsfonts_1.0.3.bb
new file mode 100644
index 0000000000..610437ab6e
--- /dev/null
+++ b/recipes/xorg-app/fslsfonts_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9b50d967ac6d4bae9bffb62a5e527a50"
+SRC_URI[archive.sha256sum] = "9d5739a2649cbade55c9f5725a3a052253d748d868ddd03f2c036fef2ffe96bc"
diff --git a/recipes/xorg-app/fstobdf_1.0.4.bb b/recipes/xorg-app/fstobdf_1.0.4.bb
new file mode 100644
index 0000000000..88493e5e36
--- /dev/null
+++ b/recipes/xorg-app/fstobdf_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fc1f42aac16d6b76c79a1a3a0fb6a53b"
+SRC_URI[archive.sha256sum] = "f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b"
diff --git a/recipes/xorg-app/ico_1.0.3.bb b/recipes/xorg-app/ico_1.0.3.bb
new file mode 100644
index 0000000000..9c89c9cffb
--- /dev/null
+++ b/recipes/xorg-app/ico_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "an X graphics demo using an animated polyhedron"
+DEPENDS += " libxau libxdmcp"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9574a53c122b3a6e85bbf3476ebf8ee8"
+SRC_URI[archive.sha256sum] = "db00f97a19e7ff87065f70df0a347a4924815cba7bceef801456d9180a3fd896"
diff --git a/recipes/xorg-app/proxymngr_1.0.2.bb b/recipes/xorg-app/proxymngr_1.0.2.bb
new file mode 100644
index 0000000000..71643bac9b
--- /dev/null
+++ b/recipes/xorg-app/proxymngr_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libice libxt xproxymngproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "714c4656e749ce856690b872e3d4ac4c"
+SRC_URI[archive.sha256sum] = "c16aa5137476d7285785e2a51e216a0df7a292daa4c206deedb16641ddeeb000"
diff --git a/recipes/xorg-app/rstart_1.0.4.bb b/recipes/xorg-app/rstart_1.0.4.bb
new file mode 100644
index 0000000000..77ff672375
--- /dev/null
+++ b/recipes/xorg-app/rstart_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+FILES_${PN}-dbg += "${libdir}/X11/${PN}/.debug/"
+SRC_URI[archive.md5sum] = "eb82a6290dfbaa1fc09a3b7426b2eac2"
+SRC_URI[archive.sha256sum] = "133a706735e18946e5260cdd07a8400dbf4f8c557f5384b158b79c342609ecbb"
diff --git a/recipes/xorg-app/showfont_1.0.3.bb b/recipes/xorg-app/showfont_1.0.3.bb
new file mode 100644
index 0000000000..fec9510c4c
--- /dev/null
+++ b/recipes/xorg-app/showfont_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "50b466ab6ed4a5b8df5abf1ef844309a"
+SRC_URI[archive.sha256sum] = "2a9db9b21be37653e534a6cc5facceacf7a1493d3278ef54817f23b070dc0c7e"
diff --git a/recipes/xorg-app/twm-1.0.5/0001-config-replace-AC_CHECK_FILE-with-test-f.patch b/recipes/xorg-app/twm-1.0.5/0001-config-replace-AC_CHECK_FILE-with-test-f.patch
new file mode 100644
index 0000000000..e1ba05709b
--- /dev/null
+++ b/recipes/xorg-app/twm-1.0.5/0001-config-replace-AC_CHECK_FILE-with-test-f.patch
@@ -0,0 +1,32 @@
+From 8f787eb1c7bc26808b46b7b2bb9cf958e636a5e0 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 1 Nov 2010 09:54:44 +0100
+Subject: [PATCH] config: replace AC_CHECK_FILE with test -f
+
+* AC_CHECK_FILE doesn't work for cross compilation
+* https://bugs.freedesktop.org/show_bug.cgi?id=31287
+---
+ configure.ac |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ef9c4b4..b590e57 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,8 +36,11 @@ XORG_DEFAULT_OPTIONS
+ 
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/gram.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])])
++if test ! -f "$srcdir/gram.c"; then
++   if test -z "$YACC_INST"; then
++      AC_MSG_ERROR([yacc not found - unable to compile gram.y])
++   fi
++fi
+ AC_PROG_LEX
+ 
+ AC_CHECK_FUNCS([mkstemp])
+-- 
+1.7.3.2
+
diff --git a/recipes/xorg-app/twm_1.0.5.bb b/recipes/xorg-app/twm_1.0.5.bb
new file mode 100644
index 0000000000..54c51c9435
--- /dev/null
+++ b/recipes/xorg-app/twm_1.0.5.bb
@@ -0,0 +1,15 @@
+require xorg-app-common.inc
+DESCRIPTION = "tiny window manager"
+DEPENDS += " libxext libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0001-config-replace-AC_CHECK_FILE-with-test-f.patch"
+SRC_URI[archive.md5sum] = "e265b44d02872eb2c7b1338ccc82a157"
+SRC_URI[archive.sha256sum] = "717bab9122d91f307ff6f4a43c5368f88e7f85d5525b99607b1508c62fbc327c"
+
+FILES_${PN} += "${datadir}/X11/twm/system.twmrc"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/xorg-app/viewres_1.0.2.bb b/recipes/xorg-app/viewres_1.0.2.bb
deleted file mode 100644
index 12b5ac7d74..0000000000
--- a/recipes/xorg-app/viewres_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f35c4ad7e1aa1ee2b25373dcdc34345b"
-SRC_URI[archive.sha256sum] = "85c7207f89bfb13cc9f3c3c9d9a785094e7576e5e3e7ef0450544c4cd6bbbf3b"
diff --git a/recipes/xorg-app/viewres_1.0.3.bb b/recipes/xorg-app/viewres_1.0.3.bb
new file mode 100644
index 0000000000..fb71b455ad
--- /dev/null
+++ b/recipes/xorg-app/viewres_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c9d15462c0190dce61d04a6717dd7622"
+SRC_URI[archive.sha256sum] = "1ad506fa0a01afeb914d05d58c5c9ff46f0348093dab646a30bbdcf727eede0a"
diff --git a/recipes/xorg-app/xdbedizzy_1.1.0.bb b/recipes/xorg-app/xdbedizzy_1.1.0.bb
new file mode 100644
index 0000000000..9a5a2df077
--- /dev/null
+++ b/recipes/xorg-app/xdbedizzy_1.1.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxp libxprintutil libxp libxau libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7e730d15679490bd00a8b69e775b3487"
+SRC_URI[archive.sha256sum] = "66507b359eb87a7649c9f78aadb7b11efc0a5ffacf9b259392ed54be42cc0d09"
diff --git a/recipes/xorg-app/xedit_1.2.0.bb b/recipes/xorg-app/xedit_1.2.0.bb
new file mode 100644
index 0000000000..d056219018
--- /dev/null
+++ b/recipes/xorg-app/xedit_1.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f55e84713542a36887e966fc0648dd7b"
+SRC_URI[archive.sha256sum] = "6cfe022c2ba42cd3f1acc64ead49f302f766b77f44a01ce3842ad25f62f65d8a"
diff --git a/recipes/xorg-app/xev_1.1.0.bb b/recipes/xorg-app/xev_1.1.0.bb
new file mode 100644
index 0000000000..74d56737ac
--- /dev/null
+++ b/recipes/xorg-app/xev_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "515cfd1fe857b66abe43ec3343634954"
+SRC_URI[archive.sha256sum] = "3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6"
diff --git a/recipes/xorg-app/xf86dga_1.0.3.bb b/recipes/xorg-app/xf86dga_1.0.3.bb
new file mode 100644
index 0000000000..2852281867
--- /dev/null
+++ b/recipes/xorg-app/xf86dga_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxxf86dga libxt libxaw libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "865a17eb6fe8892e58bb1bdb35f059df"
+SRC_URI[archive.sha256sum] = "b4d87411049d5edb6f33b7e57bceb5a07e41ec5c48900aef492fb0ff74e6a252"
diff --git a/recipes/xorg-app/xfs-1.1.1/0001-config-look-for-fontpath.d-only-if-with-default-font.patch b/recipes/xorg-app/xfs-1.1.1/0001-config-look-for-fontpath.d-only-if-with-default-font.patch
new file mode 100644
index 0000000000..5f5d4e156d
--- /dev/null
+++ b/recipes/xorg-app/xfs-1.1.1/0001-config-look-for-fontpath.d-only-if-with-default-font.patch
@@ -0,0 +1,50 @@
+From 994364d923c32e5b56c0348cc46c7782e9749e8f Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 1 Nov 2010 10:08:41 +0100
+Subject: [PATCH] config: look for fontpath.d only if --with-default-font-path wasn't specified
+
+* AC_CHECK_FILE doesn't work when cross compiling
+* https://bugs.freedesktop.org/show_bug.cgi?id=31290
+---
+ configure.ac |   24 +++++++++++++-----------
+ 1 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 99a1ce3..4403e17 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,18 +83,20 @@ XORG_FONTROOTDIR
+ # Determine font path to put in config file
+ # Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ # otherwise uses default path copied from xserver configure.ac
+-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+-	[DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
+-	[
+-	DEFAULT_FONT_PATH='$(FONTROOTDIR)/misc/,$(FONTROOTDIR)/TTF/,$(FONTROOTDIR)/OTF/,$(FONTROOTDIR)/Type1/,$(FONTROOTDIR)/100dpi/,$(FONTROOTDIR)/75dpi/'
+-	case $host_os in
+-        	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+-	esac
+-])
+-
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font path entries]),
+-                                [ FONTPATH="$withval" ],
+-                                [ FONTPATH="${DEFAULT_FONT_PATH}" ])
++                                [ FONTPATH="$withval" ], [])
++
++if test "x$FONTPATH" = "x"; then
++	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
++		[FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
++		[
++		FONT_PATH='$(FONTROOTDIR)/misc/,$(FONTROOTDIR)/TTF/,$(FONTROOTDIR)/OTF/,$(FONTROOTDIR)/Type1/,$(FONTROOTDIR)/100dpi/,$(FONTROOTDIR)/75dpi/'
++		case $host_os in
++	        	darwin*)    FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
++		esac
++	])
++fi
++
+ AC_SUBST([FONTPATH])
+ 
+ # Option to enable support for starting from inetd
+-- 
+1.7.3.2
+
diff --git a/recipes/xorg-app/xfs_1.1.1.bb b/recipes/xorg-app/xfs_1.1.1.bb
new file mode 100644
index 0000000000..a40d95fa84
--- /dev/null
+++ b/recipes/xorg-app/xfs_1.1.1.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--with-default-font-path=${STAGING_ETCDIR}/X11/fontpath.d"
+SRC_URI += "file://0001-config-look-for-fontpath.d-only-if-with-default-font.patch"
+SRC_URI[archive.md5sum] = "e02c6cae689c082b8c98a421df8f8670"
+SRC_URI[archive.sha256sum] = "0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb"
diff --git a/recipes/xorg-app/xfsinfo_1.0.3.bb b/recipes/xorg-app/xfsinfo_1.0.3.bb
new file mode 100644
index 0000000000..809e0a26c9
--- /dev/null
+++ b/recipes/xorg-app/xfsinfo_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aae6fa48b5c2ce9186a5ff4ccc14a1d4"
+SRC_URI[archive.sha256sum] = "59774492e80525b9bd1adbee5324ae7cd117813063e620b4c2c5d8ada189874f"
diff --git a/recipes/xorg-app/xgc-1.0.3/0001-config-replace-AC_CHECK_FILE-with-test-f.patch b/recipes/xorg-app/xgc-1.0.3/0001-config-replace-AC_CHECK_FILE-with-test-f.patch
new file mode 100644
index 0000000000..8b1973ad88
--- /dev/null
+++ b/recipes/xorg-app/xgc-1.0.3/0001-config-replace-AC_CHECK_FILE-with-test-f.patch
@@ -0,0 +1,32 @@
+From 5a95c043a630f1bf6c05eff81468f49d5037b6b2 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 1 Nov 2010 09:49:23 +0100
+Subject: [PATCH] config: replace AC_CHECK_FILE with test -f
+
+* AC_CHECK_FILE doesn't work for cross compilation
+* https://bugs.freedesktop.org/show_bug.cgi?id=31288
+---
+ configure.ac |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 667a3e7..fce6ee8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,8 +36,11 @@ XORG_DEFAULT_OPTIONS
+ AC_PROG_LEX
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/gram.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])])
++if test ! -f "$srcdir/gram.c"; then
++   if test -z "$YACC_INST"; then
++      AC_MSG_ERROR([yacc not found - unable to compile gram.y])
++   fi
++fi
+ 
+ PKG_CHECK_MODULES(XGC, xaw7 xt)
+ xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
+-- 
+1.7.3.2
+
diff --git a/recipes/xorg-app/xgc_1.0.2.bb b/recipes/xorg-app/xgc_1.0.2.bb
deleted file mode 100644
index 23de8eec60..0000000000
--- a/recipes/xorg-app/xgc_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fec79887ca14575bef4c757b4e95a693"
-SRC_URI[archive.sha256sum] = "fed1be13409b6963d88ee668da4670cd6da5bd9aff95576234df8849e2084002"
diff --git a/recipes/xorg-app/xgc_1.0.3.bb b/recipes/xorg-app/xgc_1.0.3.bb
new file mode 100644
index 0000000000..f1076be03d
--- /dev/null
+++ b/recipes/xorg-app/xgc_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0001-config-replace-AC_CHECK_FILE-with-test-f.patch"
+SRC_URI[archive.md5sum] = "f9addda7d1e157fc7d17ff87b1e360f8"
+SRC_URI[archive.sha256sum] = "c57a65c364923d02b0130a4b02117f7d7a0f5c6e01d5dd5c8c263afabc9a19b4"
diff --git a/recipes/xorg-app/xhost_1.0.4.bb b/recipes/xorg-app/xhost_1.0.4.bb
new file mode 100644
index 0000000000..f11b6de079
--- /dev/null
+++ b/recipes/xorg-app/xhost_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Server access control program for X"
+LICENSE = "MIT"
+DEPENDS += "libxmu libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2be663a0afbcc0856c1591477d5bf32a"
+SRC_URI[archive.sha256sum] = "5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594"
diff --git a/recipes/xorg-app/xinit_1.2.1.bb b/recipes/xorg-app/xinit_1.3.0.bb
index b3637e7b07..0ee009f1a9 100644
--- a/recipes/xorg-app/xinit_1.2.1.bb
+++ b/recipes/xorg-app/xinit_1.3.0.bb
@@ -4,7 +4,7 @@ DEPENDS += "util-linux-ng"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI[archive.md5sum] = "56f2d202b3dc10fcd21931a67bb270f7"
-SRC_URI[archive.sha256sum] = "16bcc73ae81b6d80fd1a9419ea757f38870d1043d440b6d56fcaa79d4c6c9b07"
+SRC_URI[archive.md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda"
+SRC_URI[archive.sha256sum] = "ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c"
 
 FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xkbcomp-1.2.0/fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch b/recipes/xorg-app/xkbcomp-1.2.0/fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch
new file mode 100644
index 0000000000..fcc3b03c58
--- /dev/null
+++ b/recipes/xorg-app/xkbcomp-1.2.0/fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch
@@ -0,0 +1,18 @@
+AC_CHECK_FILE([$srcdir/xkbparse.c] fails while cross compiling
+  | checking for ./xkbparse.c... configure: error: cannot check for file existence when cross compiling
+later found bugreport with similar patch
+https://bugs.freedesktop.org/show_bug.cgi?id=31264
+
+--- xkbcomp-1.2.0.orig/configure.ac	2010-10-30 18:59:33.000000000 +0200
++++ xkbcomp-1.2.0/configure.ac	2010-11-01 08:56:36.000000000 +0100
+@@ -36,9 +36,7 @@
+ 
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/xkbparse.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
+-
++test ! -e $srcdir/xkbparse.c -a -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
+ 
+ AC_CHECK_FUNCS([strdup strcasecmp])
+ 
diff --git a/recipes/xorg-app/xkbcomp_1.2.0.bb b/recipes/xorg-app/xkbcomp_1.2.0.bb
new file mode 100644
index 0000000000..3f223d91bc
--- /dev/null
+++ b/recipes/xorg-app/xkbcomp_1.2.0.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix.configure.988eb0e121c0f2c992031002acb7274c2026764b.patch"
+
+SRC_URI[archive.md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
+SRC_URI[archive.sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch b/recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch
new file mode 100644
index 0000000000..7fba81852b
--- /dev/null
+++ b/recipes/xorg-app/xkbevd-1.1.1/0001-config-replace-AC_CHECK_FILE-with-test-f.patch
@@ -0,0 +1,32 @@
+From 16cdb1985052e6d16f724838f575deed7aeaa72a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 1 Nov 2010 09:46:20 +0100
+Subject: [PATCH] config: replace AC_CHECK_FILE with test -f
+
+* AC_CHECK_FILE doesn't work for cross compilation
+* https://bugs.freedesktop.org/show_bug.cgi?id=31289
+---
+ configure.ac |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 611861c..73c7def 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,8 +35,11 @@ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/cfgparse.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])])
++if test ! -f "$srcdir/cfgparse.c"; then
++   if test -z "$YACC_INST"; then
++      AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])
++   fi
++fi
+ 
+ XORG_DEFAULT_OPTIONS
+ 
+-- 
+1.7.3.2
+
diff --git a/recipes/xorg-app/xkbevd_1.1.1.bb b/recipes/xorg-app/xkbevd_1.1.1.bb
new file mode 100644
index 0000000000..582c7465f1
--- /dev/null
+++ b/recipes/xorg-app/xkbevd_1.1.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0001-config-replace-AC_CHECK_FILE-with-test-f.patch"
+SRC_URI[archive.md5sum] = "699198865d6902c39e3c6a9693a6422d"
+SRC_URI[archive.sha256sum] = "b47060a0131edd05d840ee21e8d3c7545151883b9a87c45e62e444d711e4805a"
diff --git a/recipes/xorg-app/xkbutils_1.0.3.bb b/recipes/xorg-app/xkbutils_1.0.3.bb
new file mode 100644
index 0000000000..dbae5a3feb
--- /dev/null
+++ b/recipes/xorg-app/xkbutils_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxkbfile "
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "52ad6d8d87577a8ac736ab5488bec210"
+SRC_URI[archive.sha256sum] = "e409af0730788aa94ee22711750792546465a8f4729a0084d31a32c3ef0849bd"
diff --git a/recipes/xorg-app/xlogo_1.0.2.bb b/recipes/xorg-app/xlogo_1.0.2.bb
deleted file mode 100644
index 4be40d09d2..0000000000
--- a/recipes/xorg-app/xlogo_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7365c0852750134119734bc1879f60ca"
-SRC_URI[archive.sha256sum] = "47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130"
diff --git a/recipes/xorg-app/xlogo_1.0.3.bb b/recipes/xorg-app/xlogo_1.0.3.bb
new file mode 100644
index 0000000000..c1aeb9aa8f
--- /dev/null
+++ b/recipes/xorg-app/xlogo_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8149f95f5a0f04f404549363557eef41"
+SRC_URI[archive.sha256sum] = "868ecf47a6c234fc717f513dc938c8293dbe16c970c064b6aa7dc25e61646a0c"
diff --git a/recipes/xorg-app/xmag_1.0.4.bb b/recipes/xorg-app/xmag_1.0.4.bb
new file mode 100644
index 0000000000..5aa81a588c
--- /dev/null
+++ b/recipes/xorg-app/xmag_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "magnify parts of the screen"
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2a76128511214bde973258baef537be3"
+SRC_URI[archive.sha256sum] = "6eb02bafb5a5b1d8a92c716d37dd7698a72523cadd8ab0869f0a7eb11b4189a6"
diff --git a/recipes/xorg-app/xman_1.1.1.bb b/recipes/xorg-app/xman_1.1.1.bb
new file mode 100644
index 0000000000..28fedae3c3
--- /dev/null
+++ b/recipes/xorg-app/xman_1.1.1.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "manual page browser for X"
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--with-manconfig=${STAGING_ETCDIR}/man.conf"
+SRC_URI[archive.md5sum] = "56a00ccb38996c3518f14bb87c03a03e"
+SRC_URI[archive.sha256sum] = "79475c6106ad6e97183790f207c9fa420631548d30b7c0983926e1290afa7f0c"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xmh_1.0.2.bb b/recipes/xorg-app/xmh_1.0.2.bb
new file mode 100644
index 0000000000..01c887206d
--- /dev/null
+++ b/recipes/xorg-app/xmh_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f5956a63c3d4d4b004b73e8be64d6d6e"
+SRC_URI[archive.sha256sum] = "5bbb6d580d148def32b17faa85012995ceac7d451a65d392adc3e4b439915720"
diff --git a/recipes/xorg-app/xprop_1.2.0.bb b/recipes/xorg-app/xprop_1.2.0.bb
new file mode 100644
index 0000000000..f8e8b27c58
--- /dev/null
+++ b/recipes/xorg-app/xprop_1.2.0.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a property displayer for X"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e6d0673a1e1e469f0a6220a6868fb94b"
+SRC_URI[archive.sha256sum] = "53508c082b03dbbfd68489cb21392023f3e62ca9c921e1fb39b92ad10fbe6b9c"
diff --git a/recipes/xorg-app/xrandr_1.3.3.bb b/recipes/xorg-app/xrandr_1.3.4.bb
index 0f2fba96fc..a05fbea6a3 100644
--- a/recipes/xorg-app/xrandr_1.3.3.bb
+++ b/recipes/xorg-app/xrandr_1.3.4.bb
@@ -5,5 +5,5 @@ DEPENDS += "libxrandr libxrender"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI[archive.md5sum] = "5b2dcfb0d9b736afaf78f6ce7651259c"
-SRC_URI[archive.sha256sum] = "968ff3e6d33bdbdc83876e35f3ff463f6607362716d276d799a6c40dc2e43e46"
+SRC_URI[archive.md5sum] = "d6d20038257eba5178b523e10239d51c"
+SRC_URI[archive.sha256sum] = "5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb"
diff --git a/recipes/xorg-app/xrx_1.0.4.bb b/recipes/xorg-app/xrx_1.0.4.bb
new file mode 100644
index 0000000000..8bc67f779e
--- /dev/null
+++ b/recipes/xorg-app/xrx_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c93be22d20658ac5ff60469207dec118"
+SRC_URI[archive.sha256sum] = "b5eb5ecae105ed4d3b2c91193a1c2ef9fe51b1145190541a59f92645899763a4"
diff --git a/recipes/xorg-app/xsetroot_1.1.0.bb b/recipes/xorg-app/xsetroot_1.1.0.bb
new file mode 100644
index 0000000000..5358df278a
--- /dev/null
+++ b/recipes/xorg-app/xsetroot_1.1.0.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b78a2da4cf128775031a5a3422fc0b78"
+SRC_URI[archive.sha256sum] = "88f13e949e7aea126239e5c9b3fe7bb7c2ecf70c70774ae41218789d9cfe5fad"
diff --git a/recipes/xorg-app/xwininfo_1.1.0.bb b/recipes/xorg-app/xwininfo_1.1.0.bb
deleted file mode 100644
index 789e927dff..0000000000
--- a/recipes/xorg-app/xwininfo_1.1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "932cb1393dee3caaf26f3515f640d783"
-SRC_URI[archive.sha256sum] = "759e03d80b2a8bc843d501d5fd91fe1506da403019b6f165d32aa1b9909f8cf8"
diff --git a/recipes/xorg-app/xwininfo_1.1.1.bb b/recipes/xorg-app/xwininfo_1.1.1.bb
new file mode 100644
index 0000000000..3c314d1d5b
--- /dev/null
+++ b/recipes/xorg-app/xwininfo_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7a7f44b826d877ba39c19cf5913978d7"
+SRC_URI[archive.sha256sum] = "645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d"
diff --git a/recipes/xorg-data/xcursor-themes_1.0.3.bb b/recipes/xorg-data/xcursor-themes_1.0.3.bb
new file mode 100644
index 0000000000..8cf7ccb047
--- /dev/null
+++ b/recipes/xorg-data/xcursor-themes_1.0.3.bb
@@ -0,0 +1,11 @@
+require xorg-data-common.inc
+PE = "1"
+
+DEPENDS += " libxcursor xcursorgen-native"
+
+FILES_${PN} += "${datadir}/icons"
+
+
+SRC_URI[archive.md5sum] = "ba21aad0b353f1881f5069e423a44587"
+SRC_URI[archive.sha256sum] = "9946618cbd57dfb17d77df8be20d2ae5902c1239b4285787d9704e0ca65a44c7"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.5.0.bb b/recipes/xorg-driver/xf86-input-keyboard_1.5.0.bb
new file mode 100644
index 0000000000..765084ddaa
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-keyboard_1.5.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b74d7162db5ce7899c17927c6cfa9522"
+SRC_URI[archive.sha256sum] = "2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0"
diff --git a/recipes/xorg-driver/xf86-input-void_1.3.1.bb b/recipes/xorg-driver/xf86-input-void_1.3.1.bb
new file mode 100644
index 0000000000..e2a9b8c0cf
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-void_1.3.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- void input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3056bc7c57db8c5d56039648c0530c45"
+SRC_URI[archive.sha256sum] = "aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674"
diff --git a/recipes/xorg-lib/libxevie_1.0.3.bb b/recipes/xorg-lib/libxevie_1.0.3.bb
new file mode 100644
index 0000000000..ab33c4b297
--- /dev/null
+++ b/recipes/xorg-lib/libxevie_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 EvIE extension library"
+DEPENDS += "libxext evieext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ffa3f82595211609140440505b0e6301"
+SRC_URI[archive.sha256sum] = "c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73"
+
+XORG_PN = "libXevie"
diff --git a/recipes/xorg-util/imake_1.0.3.bb b/recipes/xorg-util/imake_1.0.3.bb
deleted file mode 100644
index 509b823348..0000000000
--- a/recipes/xorg-util/imake_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "C preprocessor interface to the make utility"
-RDEPENDS_${PN} = "perl xproto"
-
-PR = "r3"
-PE = "1"
-SRC_URI[archive.md5sum] = "579377af36a146913b3429cad1f7e8ab"
-SRC_URI[archive.sha256sum] = "5d149c3cc9a0d7eca2a4bb44e5597f50f6d7ec75b61d7ca2ded842294214012d"
diff --git a/recipes/xorg-util/imake_1.0.4.bb b/recipes/xorg-util/imake_1.0.4.bb
new file mode 100644
index 0000000000..1b557e2d78
--- /dev/null
+++ b/recipes/xorg-util/imake_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "C preprocessor interface to the make utility"
+RDEPENDS_${PN} = "perl xproto"
+
+PR = "r0"
+PE = "1"
+SRC_URI[archive.md5sum] = "0fd1e53d94142ddee5340f87de0b9561"
+SRC_URI[archive.sha256sum] = "68038fa67929c5553044ad7417e1a64cabe954f04213b305dd36a04a61317d31"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.1/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/dolt-fix.patch
index e332ce0bbe..e332ce0bbe 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.1/dolt-fix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.2/dolt-fix.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-assume-pixman-supports-overlapped-blt.patch
index a947582f15..a947582f15 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-assume-pixman-supports-overlapped-blt.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-assume-pixman-supports-overlapped-blt.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-fbdev-ignore-return-mode.patch
index d3661cbea2..d3661cbea2 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.1/hack-fbdev-ignore-return-mode.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-fbdev-ignore-return-mode.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.1/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/randr-support.patch
index abc7db41eb..abc7db41eb 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.1/randr-support.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.2/randr-support.patch
diff --git a/recipes/xorg-xserver/xserver-xorg_1.9.1.bb b/recipes/xorg-xserver/xserver-xorg_1.9.2.bb
index 4b703b5bbc..667bdbc6ca 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.9.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.9.2.bb
@@ -6,15 +6,15 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PE = "2"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 SRC_URI += " \
             file://dolt-fix.patch \
             file://randr-support.patch \
             file://hack-fbdev-ignore-return-mode.patch \
            "
-SRC_URI[archive.md5sum] = "64f2a021667ac3a2bc007f2567170f03"
-SRC_URI[archive.sha256sum] = "33e7624a52a21762c9dfdabde7b7bd1221c5298fd1b429f7c6b683145710114e"
+SRC_URI[archive.md5sum] = "5c8773499a6a8c1ddaedf33577ec9634"
+SRC_URI[archive.sha256sum] = "8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34"
 
 SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
 SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"