xorg: bump packages 2010-06-22

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

30 files changed, 430 insertions, 30 deletions

diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 5746254e0d..4563434c21 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Tue May 11 11:49:22 CEST 2010
+#Tue Jun 22 11:11:33 CEST 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -27,7 +27,7 @@ PREFERRED_VERSION_rendercheck ?= "1.3"
 PREFERRED_VERSION_rgb ?= "1.0.3"
 PREFERRED_VERSION_rstart ?= "1.0.3"
 PREFERRED_VERSION_scripts ?= "1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.5"
+PREFERRED_VERSION_sessreg ?= "1.0.6"
 PREFERRED_VERSION_setxkbmap ?= "1.1.0"
 PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.3"
@@ -64,7 +64,7 @@ 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_xinput ?= "1.5.1"
+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"
@@ -73,9 +73,9 @@ PREFERRED_VERSION_xkbutils ?= "1.0.2"
 PREFERRED_VERSION_xkill ?= "1.0.2"
 PREFERRED_VERSION_xload ?= "1.0.2"
 PREFERRED_VERSION_xlogo ?= "1.0.2"
-PREFERRED_VERSION_xlsatoms ?= "1.0.2"
-PREFERRED_VERSION_xlsclients ?= "1.0.2"
-PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xlsatoms ?= "1.1.0"
+PREFERRED_VERSION_xlsclients ?= "1.1.0"
+PREFERRED_VERSION_xlsfonts ?= "1.0.3"
 PREFERRED_VERSION_xmag ?= "1.0.3"
 PREFERRED_VERSION_xman ?= "1.1.0"
 PREFERRED_VERSION_xmessage ?= "1.0.3"
@@ -119,7 +119,7 @@ PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
 PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.2.4"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.4.0"
 PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
@@ -135,21 +135,21 @@ PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1"
 PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
 PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.99.1"
 PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.6"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.9"
 PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.2"
 PREFERRED_VERSION_xf86-video-ark ?= "0.7.2"
 PREFERRED_VERSION_xf86-video-ast ?= "0.89.9"
-PREFERRED_VERSION_xf86-video-ati ?= "6.12.4"
+PREFERRED_VERSION_xf86-video-ati ?= "6.13.0"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.2"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.3"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.2"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.7"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.8"
 PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
 PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
@@ -170,7 +170,7 @@ PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3"
 PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3"
 PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4"
 PREFERRED_VERSION_xf86-video-savage ?= "2.3.1"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.4"
 PREFERRED_VERSION_xf86-video-sis ?= "0.10.2"
 PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3"
 PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
@@ -189,7 +189,7 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
 PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0"
 PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
 PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "11.0.0"
+PREFERRED_VERSION_xf86-video-vmware ?= "11.0.1"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
@@ -242,24 +242,24 @@ PREFERRED_VERSION_libice-native ?= "1.0.6"
 PREFERRED_VERSION_libsm ?= "1.1.1"
 PREFERRED_VERSION_libsm-native ?= "1.1.1"
 PREFERRED_VERSION_libwindowswm ?= "1.0.1"
-PREFERRED_VERSION_libx11 ?= "1.3.3"
-PREFERRED_VERSION_libx11-native ?= "1.3.3"
+PREFERRED_VERSION_libx11 ?= "1.3.4"
+PREFERRED_VERSION_libx11-native ?= "1.3.4"
 PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxau ?= "1.0.5"
 PREFERRED_VERSION_libxau-native ?= "1.0.5"
 PREFERRED_VERSION_libxaw ?= "1.0.7"
-PREFERRED_VERSION_libxcomposite ?= "0.4.1"
+PREFERRED_VERSION_libxcomposite ?= "0.4.2"
 PREFERRED_VERSION_libxcursor ?= "1.1.10"
 PREFERRED_VERSION_libxcursor-native ?= "1.1.10"
-PREFERRED_VERSION_libxdamage ?= "1.1.2"
+PREFERRED_VERSION_libxdamage ?= "1.1.3"
 PREFERRED_VERSION_libxdmcp ?= "1.0.3"
 PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.1.1"
-PREFERRED_VERSION_libxext-native ?= "1.1.1"
-PREFERRED_VERSION_libxfixes ?= "4.0.4"
-PREFERRED_VERSION_libxfixes-native ?= "4.0.4"
+PREFERRED_VERSION_libxext ?= "1.1.2"
+PREFERRED_VERSION_libxext-native ?= "1.1.2"
+PREFERRED_VERSION_libxfixes ?= "4.0.5"
+PREFERRED_VERSION_libxfixes-native ?= "4.0.5"
 PREFERRED_VERSION_libxfont ?= "1.4.1"
 PREFERRED_VERSION_libxfont-native ?= "1.4.1"
 PREFERRED_VERSION_libxfontcache ?= "1.0.5"
@@ -272,8 +272,8 @@ PREFERRED_VERSION_libxpm ?= "3.5.8"
 PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
 PREFERRED_VERSION_libxprintutil ?= "1.0.1"
 PREFERRED_VERSION_libxrandr ?= "1.3.0"
-PREFERRED_VERSION_libxrender ?= "0.9.5"
-PREFERRED_VERSION_libxrender-native ?= "0.9.5"
+PREFERRED_VERSION_libxrender ?= "0.9.6"
+PREFERRED_VERSION_libxrender-native ?= "0.9.6"
 PREFERRED_VERSION_libxres ?= "1.0.4"
 PREFERRED_VERSION_libxt ?= "1.0.8"
 PREFERRED_VERSION_libxt-native ?= "1.0.8"
@@ -292,8 +292,8 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_pixman ?= "0.18.0"
-PREFERRED_VERSION_pixman-native ?= "0.18.0"
+PREFERRED_VERSION_pixman ?= "0.18.2"
+PREFERRED_VERSION_pixman-native ?= "0.18.2"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 #proto
@@ -338,8 +338,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
 PREFERRED_VERSION_xineramaproto ?= "1.2"
-PREFERRED_VERSION_xproto ?= "7.0.16"
-PREFERRED_VERSION_xproto-native ?= "7.0.16"
+PREFERRED_VERSION_xproto ?= "7.0.17"
+PREFERRED_VERSION_xproto-native ?= "7.0.17"
 PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 #util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
@@ -347,8 +347,8 @@ PREFERRED_VERSION_imake ?= "1.0.3"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.2"
 PREFERRED_VERSION_makedepend-native ?= "1.0.2"
-PREFERRED_VERSION_util-macros ?= "1.7.0"
-PREFERRED_VERSION_util-macros-native ?= "1.7.0"
+PREFERRED_VERSION_util-macros ?= "1.8.0"
+PREFERRED_VERSION_util-macros-native ?= "1.8.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
-PREFERRED_VERSION_xserver-xorg ?= "1.8.1"
+PREFERRED_VERSION_xserver-xorg ?= "1.8.99.901"
diff --git a/recipes/xorg-app/sessreg_1.0.6.bb b/recipes/xorg-app/sessreg_1.0.6.bb
new file mode 100644
index 0000000000..ae77ec98cd
--- /dev/null
+++ b/recipes/xorg-app/sessreg_1.0.6.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+
+DEPENDS += " virtual/libx11"
+
+SRC_URI[archive.md5sum] = "8c8fcda19f4cffe573d43ec9b8255f8e"
+SRC_URI[archive.sha256sum] = "73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190"
diff --git a/recipes/xorg-app/xinput_1.5.2.bb b/recipes/xorg-app/xinput_1.5.2.bb
new file mode 100644
index 0000000000..d811748ddb
--- /dev/null
+++ b/recipes/xorg-app/xinput_1.5.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8cec6023f90180cb8e4be31d98c43fda"
+SRC_URI[archive.sha256sum] = "2ce78601dc9289515749ef11d3af9d09d68c93f3efe69701112e95dd0da76390"
diff --git a/recipes/xorg-app/xlsatoms_1.1.0.bb b/recipes/xorg-app/xlsatoms_1.1.0.bb
new file mode 100644
index 0000000000..e550aab933
--- /dev/null
+++ b/recipes/xorg-app/xlsatoms_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+DEPENDS += " libxcb"
+
+SRC_URI[archive.md5sum] = "c543ccb6489b629d427810d9a57d0724"
+SRC_URI[archive.sha256sum] = "4a017ada25140a71034fc0026500ebe24b81f2d185a4b2ef733de683b79dcb0d"
diff --git a/recipes/xorg-app/xlsclients/strnlen.h b/recipes/xorg-app/xlsclients/strnlen.h
new file mode 100644
index 0000000000..e1cdb85101
--- /dev/null
+++ b/recipes/xorg-app/xlsclients/strnlen.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2009 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+ /*
+  * Author:  Jeremy Huddleston, Apple Inc.
+  */
+
+#ifndef __STRNLEN_H__
+#define __STRNLEN_H__ 1
+#include <stdlib.h>
+
+extern size_t strnlen(const char *s, size_t maxlen);
+#endif /* __STRNLEN_H__ */
diff --git a/recipes/xorg-app/xlsclients_1.1.0.bb b/recipes/xorg-app/xlsclients_1.1.0.bb
new file mode 100644
index 0000000000..2a2e4aec50
--- /dev/null
+++ b/recipes/xorg-app/xlsclients_1.1.0.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+# missing file from source archive, fixed just after release in http://cgit.freedesktop.org/xorg/app/xlsclients/commit/?id=f30f41b8dc37e775279835c97f2bea83a513dc10
+SRC_URI += "file://strnlen.h"
+
+DEPENDS += " virtual/libx11 xcb-util"
+
+do_compile_prepend() {
+  mv ${WORKDIR}/strnlen.h ${S}
+}
+SRC_URI[archive.md5sum] = "550a0fee047c5043f2cbf190b41f8a1b"
+SRC_URI[archive.sha256sum] = "f95b51f55399f46ce5f597a68ccd04a0d68c5770b517428201262bff09bcfa0c"
diff --git a/recipes/xorg-app/xlsfonts_1.0.3.bb b/recipes/xorg-app/xlsfonts_1.0.3.bb
new file mode 100644
index 0000000000..b5c51e4971
--- /dev/null
+++ b/recipes/xorg-app/xlsfonts_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PR = "${INC_PR}.0"
+
+DESCRIPTION = "server font list displayer for X"
+DEPENDS += " virtual/libx11"
+
+SRC_URI[archive.md5sum] = "bf6f3e7074479839d5182ffed735d2be"
+SRC_URI[archive.sha256sum] = "b59358b664f8220e3856d01d6b3e60adcc70f04fc588d71e0f7d9fd35e0e67c2"
diff --git a/recipes/xorg-driver/xf86-input-elographics_1.2.4.bb b/recipes/xorg-driver/xf86-input-elographics_1.2.4.bb
new file mode 100644
index 0000000000..fae047d31e
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-elographics_1.2.4.bb
@@ -0,0 +1,8 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
+PE = "2"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c4dbc216b2ddfcec93ae74ca00fae95a"
+SRC_URI[archive.sha256sum] = "dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b"
diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb
new file mode 100644
index 0000000000..8aaaa78feb
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb
@@ -0,0 +1,10 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+PR = "${INC_PR}.0"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+SRC_URI[archive.md5sum] = "6b7f2ffffc650ed61c9d333aeece893f"
+SRC_URI[archive.sha256sum] = "a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.13.0.bb b/recipes/xorg-driver/xf86-video-ati_6.13.0.bb
new file mode 100644
index 0000000000..b45b01060d
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-ati_6.13.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7b2642442091808002963920c7693aeb"
+SRC_URI[archive.sha256sum] = "6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.8.bb b/recipes/xorg-driver/xf86-video-geode_2.11.8.bb
new file mode 100644
index 0000000000..23689e1325
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-geode_2.11.8.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
+
+SRC_URI[archive.md5sum] = "579ef0bc08e1267db025c3dcb9e588f3"
+SRC_URI[archive.sha256sum] = "eb89afe34ea48c7fed0a911be2c05861e415ba1fd9c4390d568a324307572a82"
diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.7.4.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.4.bb
new file mode 100644
index 0000000000..8d1ff37b0a
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.4.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiliconMotion display driver"
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3059e87586e16c34da89437cc6215b49"
+SRC_URI[archive.sha256sum] = "b47511480fab5c517e12bd67a332f452d1718b32d53a6201edfc1c279e6e04d7"
diff --git a/recipes/xorg-driver/xf86-video-vmware_11.0.1.bb b/recipes/xorg-driver/xf86-video-vmware_11.0.1.bb
new file mode 100644
index 0000000000..dc7300e65d
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-vmware_11.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+
+SRC_URI[archive.md5sum] = "52e9a12843c6469f976db57a7b5f78d2"
+SRC_URI[archive.sha256sum] = "a6371d5acb81ba4457f7ee2c7432941c38f9033ce5278551c6acc9a0827ce7be"
diff --git a/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
new file mode 100644
index 0000000000..7e96075aa3
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: libX11-1.3.4/m4/dolt.m4
+===================================================================
+--- libX11-1.3.4/m4/dolt.m4
++++ libX11-1.3.4/m4/dolt.m4
+@@ -155,7 +155,7 @@ dnl without '=', because automake does n
+     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -171,7 +171,7 @@ done
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
++    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__
+ 
diff --git a/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
new file mode 100644
index 0000000000..0cab165f74
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
@@ -0,0 +1,21 @@
+Index: libX11-1.3.4/configure.ac
+===================================================================
+--- libX11-1.3.4.orig/configure.ac
++++ libX11-1.3.4/configure.ac
+@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`$PKG_CONFIG --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++        AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++        KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++        dir=`${PKG_CONFIG} --variable=includedir xproto`
++        KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
+ if test -f "$KEYSYMDEF"; then
+         AC_MSG_RESULT([$KEYSYMDEF])
+ else
diff --git a/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..9763313975
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===================================================================
+--- libX11-1.3.4.orig/src/util/Makefile.am
++++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+-	$(X11_CFLAGS) \
+-	$(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+-	$(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
diff --git a/recipes/xorg-lib/libx11-native_1.3.4.bb b/recipes/xorg-lib/libx11-native_1.3.4.bb
new file mode 100644
index 0000000000..71b45afdf4
--- /dev/null
+++ b/recipes/xorg-lib/libx11-native_1.3.4.bb
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = ""
+
+inherit native
diff --git a/recipes/xorg-lib/libx11_1.3.4.bb b/recipes/xorg-lib/libx11_1.3.4.bb
new file mode 100644
index 0000000000..1a7432caa6
--- /dev/null
+++ b/recipes/xorg-lib/libx11_1.3.4.bb
@@ -0,0 +1,37 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r7"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://dolt-fix.patch \
+            ${@['file://keysymdef_include.patch', ''][(bb.data.inherits_class('native', d))]} \
+"
+
+# --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; 
+		mv makekeys.c.orig makekeys.c || true
+		touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
+SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.2.bb b/recipes/xorg-lib/libxcomposite_0.4.2.bb
new file mode 100644
index 0000000000..775e5aa812
--- /dev/null
+++ b/recipes/xorg-lib/libxcomposite_0.4.2.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
+PROVIDES = "xcomposite"
+PE = "1"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI[archive.md5sum] = "e38dc98509149083f6c31b49b484e63c"
+SRC_URI[archive.sha256sum] = "442bde0bf7684330d6f5e4dd5a6faa46f1950512ff4e7bb6c01b36702166f800"
diff --git a/recipes/xorg-lib/libxdamage_1.1.3.bb b/recipes/xorg-lib/libxdamage_1.1.3.bb
new file mode 100644
index 0000000000..bcef444951
--- /dev/null
+++ b/recipes/xorg-lib/libxdamage_1.1.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 damaged region extension library"
+LICENSE= "BSD-X"
+DEPENDS += "damageproto libxfixes"
+PROVIDES = "xdamage"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXdamage"
+
+SRC_URI[archive.md5sum] = "44774e1a065158b52f1a0da5100cebec"
+SRC_URI[archive.sha256sum] = "bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8"
diff --git a/recipes/xorg-lib/libxext-native_1.1.2.bb b/recipes/xorg-lib/libxext-native_1.1.2.bb
new file mode 100644
index 0000000000..40ddf6585f
--- /dev/null
+++ b/recipes/xorg-lib/libxext-native_1.1.2.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto-native libx11-native xextproto-native libxau-native util-macros-native"
+PROVIDES = ""
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
+
+inherit native 
+
+SRC_URI[archive.md5sum] = "9e51f9cb7e0a38c7099ac1c0de1a1add"
+SRC_URI[archive.sha256sum] = "ac6a0ff69c52c9b6e2096e5f74e22c8b5eef11ade4e30411cffeb7df32fe4f74"
diff --git a/recipes/xorg-lib/libxext_1.1.2.bb b/recipes/xorg-lib/libxext_1.1.2.bb
new file mode 100644
index 0000000000..7d37c5c3c8
--- /dev/null
+++ b/recipes/xorg-lib/libxext_1.1.2.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
+
+SRC_URI[archive.md5sum] = "9e51f9cb7e0a38c7099ac1c0de1a1add"
+SRC_URI[archive.sha256sum] = "ac6a0ff69c52c9b6e2096e5f74e22c8b5eef11ade4e30411cffeb7df32fe4f74"
diff --git a/recipes/xorg-lib/libxfixes-native_4.0.5.bb b/recipes/xorg-lib/libxfixes-native_4.0.5.bb
new file mode 100644
index 0000000000..5ef6ded80a
--- /dev/null
+++ b/recipes/xorg-lib/libxfixes-native_4.0.5.bb
@@ -0,0 +1,6 @@
+require libxfixes_${PV}.bb
+
+DEPENDS = "libx11-native"
+PE = "1"
+
+inherit native
diff --git a/recipes/xorg-lib/libxfixes_4.0.5.bb b/recipes/xorg-lib/libxfixes_4.0.5.bb
new file mode 100644
index 0000000000..e6a78bb4ac
--- /dev/null
+++ b/recipes/xorg-lib/libxfixes_4.0.5.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+PE = "1"
+
+XORG_PN = "libXfixes"
+
+SRC_URI[archive.md5sum] = "1b4b8386bd5d1751b2c7177223ad4629"
+SRC_URI[archive.sha256sum] = "2e6cd020460e4ef5d5a1d9b5d21143e9f5e580036a79c7de26ae539d7bcb8d74"
diff --git a/recipes/xorg-lib/libxrender-native_0.9.6.bb b/recipes/xorg-lib/libxrender-native_0.9.6.bb
new file mode 100644
index 0000000000..a4f4ba9e36
--- /dev/null
+++ b/recipes/xorg-lib/libxrender-native_0.9.6.bb
@@ -0,0 +1,6 @@
+require libxrender_${PV}.bb
+
+DEPENDS = "libx11-native renderproto-native"
+PE = "1"
+
+inherit native
diff --git a/recipes/xorg-lib/libxrender_0.9.6.bb b/recipes/xorg-lib/libxrender_0.9.6.bb
new file mode 100644
index 0000000000..7d7510d823
--- /dev/null
+++ b/recipes/xorg-lib/libxrender_0.9.6.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
+PE = "1"
+
+XORG_PN = "libXrender"
+
+SRC_URI[archive.md5sum] = "3b3b7d076c2384b6c600c0b5f4ba971f"
+SRC_URI[archive.sha256sum] = "7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668"
diff --git a/recipes/xorg-proto/xproto_7.0.17.bb b/recipes/xorg-proto/xproto_7.0.17.bb
new file mode 100644
index 0000000000..63e22ad475
--- /dev/null
+++ b/recipes/xorg-proto/xproto_7.0.17.bb
@@ -0,0 +1,11 @@
+require xorg-proto-common.inc
+
+PR = "r0"
+PE = "1"
+
+XORG_PN = "xproto"
+
+BBCLASSEXTEND = "native sdk"
+
+SRC_URI[archive.md5sum] = "74abb8fb91af66f35873b1f444731220"
+SRC_URI[archive.sha256sum] = "9b2c1fdc5b3780cedc9f5d9caf8f1364f26d07f8502b0eccdde74319157f9d01"
diff --git a/recipes/xorg-util/util-macros_1.8.0.bb b/recipes/xorg-util/util-macros_1.8.0.bb
new file mode 100644
index 0000000000..7d7d59d4f8
--- /dev/null
+++ b/recipes/xorg-util/util-macros_1.8.0.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "fe73a69d02bd0be6cdf7c773bfd72041"
+SRC_URI[archive.sha256sum] = "2de6954271dbd43f073022c371c15d5f1102a3631eaa4f4053bfd173e148f7d7"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.901/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.901/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000000..a947582f15
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.901/hack-assume-pixman-supports-overlapped-blt.patch
@@ -0,0 +1,14 @@
+diff --git a/fb/fbcopy.c b/fb/fbcopy.c
+index 07eb663..ba394b7 100644
+--- a/fb/fbcopy.c
++++ b/fb/fbcopy.c
+@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
+     while (nbox--)
+     {
+ #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
+-	if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
+-	    !upsidedown)
++	if (pm == FB_ALLONES && alu == GXcopy)
+ 	{
+ 	    if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
+ 			     (pbox->x1 + dx + srcXoff),
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.901.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.901.bb
new file mode 100644
index 0000000000..2b3a6a9715
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.901.bb
@@ -0,0 +1,37 @@
+# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
+DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
+
+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}.0"
+
+# Needs newer mesa-dri, where is D_P = "-1"
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "1"
+
+SRC_URI += " \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
+	    file://hack-fbdev-ignore-return-mode.patch \
+           "
+SRC_URI[archive.md5sum] = "ebc580fcf4ad9fb03ab9119525467f4a"
+SRC_URI[archive.sha256sum] = "98ebdd4bf81fec29335f2c1366074b0212d18789385bcb9dc927c3a2dc94fbfb"
+
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+
+do_install_prepend() {
+        mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "