58 files changed, 201 insertions, 70 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 4faecb6630..a721158196 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -10,13 +10,13 @@ PREFERRED_VERSION_pango = "1.26.0"
 PREFERRED_VERSION_udev ?= "145"
 
 PREFERRED_VERSION_mesa-dri ?= "7.7"
-PREFERRED_VERSION_xf86-video-intel ?= "2.7.1"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
-PREFERRED_VERSION_libx11-trim ?= "1.2.1"
+PREFERRED_VERSION_libx11-trim ?= "1.3"
 
-PREFERRED_VERSION_libdrm ?= "2.4.15"
+PREFERRED_VERSION_libdrm ?= "2.4.16"
 PREFERRED_VERSION_xf86-input-keyboard ?= ""
 PREFERRED_VERSION_dri2proto ?= ""
 
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 7e269cd9cb..45a37a2d0f 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -2,30 +2,30 @@
 # The latest Xorg package versions
 #
 
-PREFERRED_VERSION_applewmproto ?= "1.1.0"
-PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
-PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.0.2"
+PREFERRED_VERSION_applewmproto ?= "1.4.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.1.0"
 PREFERRED_VERSION_compositeproto ?= "0.4"
-PREFERRED_VERSION_damageproto ?= "1.1.0"
-PREFERRED_VERSION_dmxproto ?= "2.2.2"
-PREFERRED_VERSION_evieext ?= "1.0.2"
-PREFERRED_VERSION_fixesproto ?= "4.0"
-PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
-PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2"
-PREFERRED_VERSION_fontsproto ?= "2.0.2"
-PREFERRED_VERSION_fontsproto-native ?= "2.0.2"
+PREFERRED_VERSION_damageproto ?= "1.2.0"
+PREFERRED_VERSION_dmxproto ?= "2.3"
+PREFERRED_VERSION_evieext ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.1.1"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
+PREFERRED_VERSION_fontsproto ?= "2.1.0"
+PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_glproto ?= "1.4.9"
+PREFERRED_VERSION_glproto ?= "1.4.11"
 PREFERRED_VERSION_imake ?= "1.0.2"
-#PREFERRED_VERSION_inputproto ?= "1.9.99.12"
-#PREFERRED_VERSION_inputproto-native ?= "1.9.99.12"
-#PREFERRED_VERSION_inputproto-nativesdk ?= "1.9.99.12"
-PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_kbproto-native ?= "1.0.3"
-PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.3"
+#PREFERRED_VERSION_inputproto ?= "2.0"
+#PREFERRED_VERSION_inputproto-native ?= "2.0"
+#PREFERRED_VERSION_inputproto-nativesdk ?= "2.0"
+PREFERRED_VERSION_kbproto ?= "1.0.4"
+PREFERRED_VERSION_kbproto-native ?= "1.0.4"
+PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.4"
 PREFERRED_VERSION_libapplewm ?= "1.0.0"
-PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libdmx ?= "1.1.0"
 PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
 PREFERRED_VERSION_libfs ?= "1.0.1"
@@ -34,11 +34,11 @@ PREFERRED_VERSION_liblbxutil ?= "1.0.1"
 PREFERRED_VERSION_liboldx ?= "1.0.1"
 PREFERRED_VERSION_libsm ?= "1.1.0"
 PREFERRED_VERSION_libwindowswm ?= "1.0.0"
-PREFERRED_VERSION_libx11 ?= "1.2.1"
-PREFERRED_VERSION_libx11-diet ?= "1.2.1"
-PREFERRED_VERSION_libx11-native ?= "1.2.1"
-PREFERRED_VERSION_libx11-nativesdk ?= "1.2.1"
-PREFERRED_VERSION_libx11-trim ?= "1.2.1"
+PREFERRED_VERSION_libx11 ?= "1.3"
+PREFERRED_VERSION_libx11-diet ?= "1.3"
+PREFERRED_VERSION_libx11-native ?= "1.3"
+PREFERRED_VERSION_libx11-nativesdk ?= "1.3"
+PREFERRED_VERSION_libx11-trim ?= "1.3"
 PREFERRED_VERSION_libxau ?= "1.0.4"
 PREFERRED_VERSION_libxau-native ?= "1.0.4"
 PREFERRED_VERSION_libxau-nativesdk ?= "1.0.4"
@@ -50,15 +50,15 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2"
 PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
 PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.0.2"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
-#PREFERRED_VERSION_libxext ?= "1.0.5"
-PREFERRED_VERSION_libxext-nativesdk ?= "1.0.5"
+PREFERRED_VERSION_libxext ?= "1.1.1"
+PREFERRED_VERSION_libxext-nativesdk ?= "1.1.1"
 PREFERRED_VERSION_libxfixes ?= "4.0.3"
 PREFERRED_VERSION_libxfont ?= "1.3.4"
 PREFERRED_VERSION_libxfont-native ?= "1.3.4"
 PREFERRED_VERSION_libxfontcache ?= "1.0.4"
 PREFERRED_VERSION_libxft ?= "2.1.13"
-#PREFERRED_VERSION_libxi ?= "1.2.1"
-PREFERRED_VERSION_libxinerama ?= "1.0.3"
+PREFERRED_VERSION_libxi ?= "1.3"
+PREFERRED_VERSION_libxinerama ?= "1.1"
 PREFERRED_VERSION_libxkbfile ?= "1.0.5"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
 PREFERRED_VERSION_libxmu ?= "1.0.4"
@@ -74,58 +74,58 @@ PREFERRED_VERSION_libxres ?= "1.0.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
 PREFERRED_VERSION_libxt ?= "1.0.5"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
-PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxtst ?= "1.1.0"
 PREFERRED_VERSION_libxv ?= "1.0.4"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.1"
 PREFERRED_VERSION_makedepend-native ?= "1.0.1"
-PREFERRED_VERSION_pixman ?= "0.13.2"
+PREFERRED_VERSION_pixman ?= "0.17.4"
 PREFERRED_VERSION_printproto ?= "1.0.4"
-PREFERRED_VERSION_randrproto ?= "1.2.99.3"
-PREFERRED_VERSION_randrproto-nativesdk ?= "1.2.99.3"
-PREFERRED_VERSION_recordproto ?= "1.13.2"
-PREFERRED_VERSION_renderproto ?= "0.9.3"
-PREFERRED_VERSION_renderproto-nativesdk ?= "0.9.3"
-PREFERRED_VERSION_resourceproto ?= "1.0.2"
-PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_randrproto ?= "1.3.1"
+PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.1"
+PREFERRED_VERSION_recordproto ?= "1.14"
+PREFERRED_VERSION_renderproto ?= "0.11"
+PREFERRED_VERSION_renderproto-nativesdk ?= "0.11"
+PREFERRED_VERSION_resourceproto ?= "1.1.0"
+PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
 PREFERRED_VERSION_trapproto ?= "3.4.3"
 PREFERRED_VERSION_util-macros ?= "1.4.1"
 PREFERRED_VERSION_util-macros-native ?= "1.4.1"
-PREFERRED_VERSION_videoproto ?= "2.2.2"
-PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_videoproto ?= "2.3.0"
+PREFERRED_VERSION_windowswmproto ?= "1.0.4"
 PREFERRED_VERSION_x11perf ?= "1.5"
 PREFERRED_VERSION_xauth ?= "1.0.3"
-PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
-PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
-PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.1.2"
+PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
+PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.0"
 PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
 PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xextproto ?= "7.0.5"
-PREFERRED_VERSION_xextproto-native ?= "7.0.5"
-PREFERRED_VERSION_xextproto-nativesdk ?= "7.0.5"
-PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
-PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
-PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.1.2"
-PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xf86driproto ?= "2.0.4"
+PREFERRED_VERSION_xextproto ?= "7.1.0"
+PREFERRED_VERSION_xextproto-native ?= "7.1.0"
+PREFERRED_VERSION_xextproto-nativesdk ?= "7.1.0"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
+PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.2.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.1"
+PREFERRED_VERSION_xf86driproto ?= "2.1.0"
 PREFERRED_VERSION_dri2proto ?= "1.99.3"
-PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
 PREFERRED_VERSION_xhost ?= "1.0.2"
 PREFERRED_VERSION_xinit ?= "1.1.1"
-PREFERRED_VERSION_xineramaproto ?= "1.1.2"
+PREFERRED_VERSION_xineramaproto ?= "1.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.3"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 PREFERRED_VERSION_xprop ?= "1.0.4"
-PREFERRED_VERSION_xproto ?= "7.0.14"
-PREFERRED_VERSION_xproto-native ?= "7.0.14"
-PREFERRED_VERSION_xproto-nativesdk ?= "7.0.14"
-PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
+PREFERRED_VERSION_xproto ?= "7.0.16"
+PREFERRED_VERSION_xproto-native ?= "7.0.16"
+PREFERRED_VERSION_xproto-nativesdk ?= "7.0.16"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
@@ -137,15 +137,15 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.0.4"
 PREFERRED_VERSION_mesa-dri ?= "7.4"
-PREFERRED_VERSION_libdrm ?= "2.4.7"
+PREFERRED_VERSION_libdrm ?= "2.4.16"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_libxcb-nativesdk ?= "1.3"
 PREFERRED_VERSION_libpciaccess ?= "0.10.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.7.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
 
 
diff --git a/meta/packages/drm/libdrm-2.4.15/installtests.patch b/meta/packages/drm/libdrm-2.4.16/installtests.patch
index a16c8a738b..a16c8a738b 100644
--- a/meta/packages/drm/libdrm-2.4.15/installtests.patch
+++ b/meta/packages/drm/libdrm-2.4.16/installtests.patch
diff --git a/meta/packages/drm/libdrm_2.4.15.bb b/meta/packages/drm/libdrm_2.4.16.bb
index 7679035866..7679035866 100644
--- a/meta/packages/drm/libdrm_2.4.15.bb
+++ b/meta/packages/drm/libdrm_2.4.16.bb
diff --git a/meta/packages/xorg-app/mkfontdir_1.0.5.bb b/meta/packages/xorg-app/mkfontdir_1.0.5.bb
new file mode 100644
index 0000000000..98fcdd47c5
--- /dev/null
+++ b/meta/packages/xorg-app/mkfontdir_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a program to create an index of X font files in a directory"
+
+PE = "1"
+
+RDEPENDS += "mkfontscale"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/xorg-app/mkfontscale_1.0.7.bb b/meta/packages/xorg-app/mkfontscale_1.0.7.bb
new file mode 100644
index 0000000000..e7cb66625a
--- /dev/null
+++ b/meta/packages/xorg-app/mkfontscale_1.0.7.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a program to create an index of scalable font files for X"
+
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
+
+BBCLASSEXTEND = "native"
+\ No newline at end of file
diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb
index d1fb0f000d..d1fb0f000d 100644
--- a/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb
+++ b/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
index f554141c97..f554141c97 100644
--- a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb
+++ b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb b/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb
index 39c2e05daf..39c2e05daf 100644
--- a/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb
+++ b/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb b/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb
index f554141c97..81128394c3 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb
@@ -2,3 +2,4 @@ require xf86-input-common.inc
 
 DESCRIPTION = "X.Org X server -- keyboard input driver"
 
+DEPENDS += "libxi"
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
index b4f13f6923..f7dc3b731c 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
@@ -7,3 +7,4 @@ PV = "0.15.2+git${SRCPV}"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
 S = "${WORKDIR}/git"
 
+DEPENDS += "libxi"
diff --git a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb
index c0297f1d55..c0297f1d55 100644
--- a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb
+++ b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb
diff --git a/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb b/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb
index 74a8848637..74a8848637 100644
--- a/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb
+++ b/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb
diff --git a/meta/packages/xorg-font/encodings_1.0.3.bb b/meta/packages/xorg-font/encodings_1.0.3.bb
new file mode 100644
index 0000000000..ecc3eed540
--- /dev/null
+++ b/meta/packages/xorg-font/encodings_1.0.3.bb
@@ -0,0 +1,5 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+DEPENDS = "mkfontscale-native font-util-native"
diff --git a/meta/packages/xorg-font/font-alias_1.0.2.bb b/meta/packages/xorg-font/font-alias_1.0.2.bb
new file mode 100644
index 0000000000..5314cbc5db
--- /dev/null
+++ b/meta/packages/xorg-font/font-alias_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "X font aliases."
+
+DEPENDS = "virtual/xserver font-util"
+RDEPENDS = "encodings font-util"
+
+PE = "1"
+PR = "${INC_PR}.0"
diff --git a/meta/packages/xorg-font/font-util_1.1.1.bb b/meta/packages/xorg-font/font-util_1.1.1.bb
new file mode 100644
index 0000000000..b7819d1244
--- /dev/null
+++ b/meta/packages/xorg-font/font-util_1.1.1.bb
@@ -0,0 +1,17 @@
+require xorg-font-common.inc
+
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings util-macros"
+DEPENDS_virtclass-native = "util-macros-native"
+RDEPENDS = "mkfontdir mkfontscale encodings"
+
+PR = "${INC_PR}.1"
+
+do_configure_prepend() {
+        sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
+}
+
+BBCLASSEXTEND = "native"
+\ No newline at end of file
diff --git a/meta/packages/xorg-font/xorg-font-common.inc b/meta/packages/xorg-font/xorg-font-common.inc
new file mode 100644
index 0000000000..52dc2208df
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-font-common.inc
@@ -0,0 +1,45 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
+RDEPENDS = "encodings font-util font-alias"
+
+XORG_PN = "${BPN}"
+INC_PR = "r1"
+
+SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OEMAKE += "FCCACHE=/bin/true"
+
+do_configure_prepend() {
+        if [ -f "${S}"/configure.ac ] ; then
+                sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac
+        fi
+}
+
+do_install_append() {
+	find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
+	find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f
+	find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f
+	find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f	
+}
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} += " ${libdir}/X11/fonts ${datadir}"
+
+pkg_postinst_${PN} () {
+        set -x
+        for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
+                mkfontdir $fontdir
+                mkfontscale $fontdir
+        done
+        for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
+                mkfontdir $fontdir
+                mkfontscale $fontdir
+        done
+}
diff --git a/meta/packages/xorg-lib/libdmx_1.0.2.bb b/meta/packages/xorg-lib/libdmx_1.1.0.bb
index 9b66101563..9b66101563 100644
--- a/meta/packages/xorg-lib/libdmx_1.0.2.bb
+++ b/meta/packages/xorg-lib/libdmx_1.1.0.bb
diff --git a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb b/meta/packages/xorg-lib/libx11-diet_1.3.bb
index a76aba16e4..a76aba16e4 100644
--- a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb
+++ b/meta/packages/xorg-lib/libx11-diet_1.3.bb
diff --git a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb b/meta/packages/xorg-lib/libx11-trim_1.3.bb
index 08c8b163ab..08c8b163ab 100644
--- a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb
+++ b/meta/packages/xorg-lib/libx11-trim_1.3.bb
diff --git a/meta/packages/xorg-lib/libx11_1.2.1.bb b/meta/packages/xorg-lib/libx11_1.3.bb
index ff62d90464..ff62d90464 100644
--- a/meta/packages/xorg-lib/libx11_1.2.1.bb
+++ b/meta/packages/xorg-lib/libx11_1.3.bb
diff --git a/meta/packages/xorg-lib/libxext_1.0.5.bb b/meta/packages/xorg-lib/libxext_1.1.1.bb
index e1f13a1d1a..e1f13a1d1a 100644
--- a/meta/packages/xorg-lib/libxext_1.0.5.bb
+++ b/meta/packages/xorg-lib/libxext_1.1.1.bb
diff --git a/meta/packages/xorg-lib/libxi_1.2.1.bb b/meta/packages/xorg-lib/libxi_1.3.bb
index 0c0529d7fe..0c0529d7fe 100644
--- a/meta/packages/xorg-lib/libxi_1.2.1.bb
+++ b/meta/packages/xorg-lib/libxi_1.3.bb
diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/packages/xorg-lib/libxi_git.bb
index 13e51f4378..30c1778c3e 100644
--- a/meta/packages/xorg-lib/libxi_git.bb
+++ b/meta/packages/xorg-lib/libxi_git.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
 PE = "1"
-PV = "1.9.99.5+gitr${SRCPV}"
+PV = "1.2.99.5+gitr${SRCPV}"
 
 XORG_PN = "libXi"
 
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.3.bb b/meta/packages/xorg-lib/libxinerama_1.1.bb
index b7135bc28e..b7135bc28e 100644
--- a/meta/packages/xorg-lib/libxinerama_1.0.3.bb
+++ b/meta/packages/xorg-lib/libxinerama_1.1.bb
diff --git a/meta/packages/xorg-lib/libxtst_1.0.3.bb b/meta/packages/xorg-lib/libxtst_1.1.0.bb
index a83a69e591..a83a69e591 100644
--- a/meta/packages/xorg-lib/libxtst_1.0.3.bb
+++ b/meta/packages/xorg-lib/libxtst_1.1.0.bb
diff --git a/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb b/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb
index 47492d7108..47492d7108 100644
--- a/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb
+++ b/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb
diff --git a/meta/packages/xorg-lib/pixman_0.13.2.bb b/meta/packages/xorg-lib/pixman_0.17.4.bb
index e4132954ab..e4132954ab 100644
--- a/meta/packages/xorg-lib/pixman_0.13.2.bb
+++ b/meta/packages/xorg-lib/pixman_0.17.4.bb
diff --git a/meta/packages/xorg-proto/applewmproto_1.1.0.bb b/meta/packages/xorg-proto/applewmproto_1.4.1.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/applewmproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/applewmproto_1.4.1.bb
diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb
index 29c9f3fc34..29c9f3fc34 100644
--- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb
diff --git a/meta/packages/xorg-proto/damageproto_1.1.0.bb b/meta/packages/xorg-proto/damageproto_1.2.0.bb
index 202ec2874f..202ec2874f 100644
--- a/meta/packages/xorg-proto/damageproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/damageproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/dmxproto_2.2.2.bb b/meta/packages/xorg-proto/dmxproto_2.3.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/dmxproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/dmxproto_2.3.bb
diff --git a/meta/packages/xorg-proto/dri2proto_1.99.3.bb b/meta/packages/xorg-proto/dri2proto_2.2.bb
index 8decda682f..8decda682f 100644
--- a/meta/packages/xorg-proto/dri2proto_1.99.3.bb
+++ b/meta/packages/xorg-proto/dri2proto_2.2.bb
diff --git a/meta/packages/xorg-proto/evieext_1.0.2.bb b/meta/packages/xorg-proto/evieext_1.1.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/evieext_1.0.2.bb
+++ b/meta/packages/xorg-proto/evieext_1.1.0.bb
diff --git a/meta/packages/xorg-proto/fixesproto_4.0.bb b/meta/packages/xorg-proto/fixesproto_4.1.1.bb
index 20f95282e5..20f95282e5 100644
--- a/meta/packages/xorg-proto/fixesproto_4.0.bb
+++ b/meta/packages/xorg-proto/fixesproto_4.1.1.bb
diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb
index 2a9b73adfc..2a9b73adfc 100644
--- a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb
diff --git a/meta/packages/xorg-proto/fontsproto_2.0.2.bb b/meta/packages/xorg-proto/fontsproto_2.1.0.bb
index 2a9b73adfc..2a9b73adfc 100644
--- a/meta/packages/xorg-proto/fontsproto_2.0.2.bb
+++ b/meta/packages/xorg-proto/fontsproto_2.1.0.bb
diff --git a/meta/packages/xorg-proto/glproto_1.4.9.bb b/meta/packages/xorg-proto/glproto_1.4.11.bb
index 022bea1ee8..022bea1ee8 100644
--- a/meta/packages/xorg-proto/glproto_1.4.9.bb
+++ b/meta/packages/xorg-proto/glproto_1.4.11.bb
diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb b/meta/packages/xorg-proto/inputproto_2.0.bb
index 392aef20f6..392aef20f6 100644
--- a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb
+++ b/meta/packages/xorg-proto/inputproto_2.0.bb
diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.4.bb
index 29c9f3fc34..29c9f3fc34 100644
--- a/meta/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb b/meta/packages/xorg-proto/randrproto_1.3.1.bb
index 42d33fb674..42d33fb674 100644
--- a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb
+++ b/meta/packages/xorg-proto/randrproto_1.3.1.bb
diff --git a/meta/packages/xorg-proto/recordproto_1.13.2.bb b/meta/packages/xorg-proto/recordproto_1.14.bb
index af63403600..af63403600 100644
--- a/meta/packages/xorg-proto/recordproto_1.13.2.bb
+++ b/meta/packages/xorg-proto/recordproto_1.14.bb
diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.11.bb
index 0168b9227c..0168b9227c 100644
--- a/meta/packages/xorg-proto/renderproto_0.9.3.bb
+++ b/meta/packages/xorg-proto/renderproto_0.11.bb
diff --git a/meta/packages/xorg-proto/resourceproto_1.0.2.bb b/meta/packages/xorg-proto/resourceproto_1.1.0.bb
index 1fb8aa7f12..1fb8aa7f12 100644
--- a/meta/packages/xorg-proto/resourceproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/resourceproto_1.1.0.bb
diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/videoproto_2.2.2.bb b/meta/packages/xorg-proto/videoproto_2.3.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/videoproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/videoproto_2.3.0.bb
diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_1.0.4.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/windowswmproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb
index 29c9f3fc34..29c9f3fc34 100644
--- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/xextproto_7.0.5.bb b/meta/packages/xorg-proto/xextproto_7.1.0.bb
index b37de80bf6..e357188ec8 100644
--- a/meta/packages/xorg-proto/xextproto_7.0.5.bb
+++ b/meta/packages/xorg-proto/xextproto_7.1.0.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-PR = "r3"
+PR = "r4"
 PE = "1"
 
 DEPENDS += "util-macros gettext"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb
index d54c9011a0..d54c9011a0 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb b/meta/packages/xorg-proto/xf86dgaproto_2.1.bb
index 2e0e734858..2e0e734858 100644
--- a/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb
+++ b/meta/packages/xorg-proto/xf86dgaproto_2.1.bb
diff --git a/meta/packages/xorg-proto/xf86driproto_2.0.4.bb b/meta/packages/xorg-proto/xf86driproto_2.1.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86driproto_2.0.4.bb
+++ b/meta/packages/xorg-proto/xf86driproto_2.1.0.bb
diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
+++ b/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb
diff --git a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_1.2.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xineramaproto_1.2.bb
diff --git a/meta/packages/xorg-proto/xproto_7.0.14.bb b/meta/packages/xorg-proto/xproto_7.0.16.bb
index 4a9bc806b5..4a9bc806b5 100644
--- a/meta/packages/xorg-proto/xproto_7.0.14.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.16.bb
diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb
index 9c3d9efa71..9c3d9efa71 100644
--- a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
+++ b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
new file mode 100644
index 0000000000..2341e40bca
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
@@ -0,0 +1,19 @@
+Index: xorg-server-1.7.99.2/configure.ac
+===================================================================
+--- xorg-server-1.7.99.2.orig/configure.ac	2010-01-29 16:38:49.000000000 +0000
++++ xorg-server-1.7.99.2/configure.ac	2010-01-29 16:42:39.000000000 +0000
+@@ -503,14 +503,10 @@
+ 
+ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ dnl otherwise uses standard subdirectories of FONTROOTDIR
+-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+-	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+-	[
+ 		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+ 		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 dirs]),
+ 				[ FONTPATH="$withval" ],
+ 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb
new file mode 100644
index 0000000000..cde1712992
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb
@@ -0,0 +1,18 @@
+require xserver-xf86-dri-lite.inc
+
+PE = "1"
+PR = "r3"
+
+PROTO_DEPS += "xf86driproto dri2proto"
+
+DEPENDS += "font-util"
+
+SRC_URI += "file://nodolt.patch;patch=1 \
+            file://crosscompile.patch;patch=1"
+#           file://libdri-xinerama-symbol.patch;patch=1 \
+#           file://xserver-boottime.patch;patch=1"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
+
+EXTRA_OECONF += "--enable-dri --enable-dri2"