83 files changed, 2515 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb
new file mode 100644
index 0000000000..bc502fb505
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+DEPENDS += "libxext applewmproto"
+PR = "r1"
+PE = "1"
+XORG_PN = "libAppleWM"
diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.0.bb
new file mode 100644
index 0000000000..20523b894e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.0.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Distributed Multihead extension library"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94 \
+                    file://src/dmx.c;endline=33;md5=79ff7aacf716dafea0d490316f998a11"
+DEPENDS += "libxext dmxproto"
+PR = "r1"
+PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.0.5.bb
new file mode 100644
index 0000000000..dc7b62d02d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.0.5.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X11 font encoding library"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
+DEPENDS += "zlib xproto"
+PR = "r0"
+PE = "1"
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb
new file mode 100644
index 0000000000..010aa311e0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PR = "r1"
+PE = "1"
+XORG_PN = "libFS"
diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.6.bb b/meta/recipes-graphics/xorg-lib/libice_1.0.6.bb
new file mode 100644
index 0000000000..ec3ad136a0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libice_1.0.6.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X11 Inter-Client Exchange library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93"
+DEPENDS += "xproto xtrans"
+PROVIDES = "ice"
+PR = "r0"
+PE = "1"
+XORG_PN = "libICE"
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
new file mode 100644
index 0000000000..029d761d95
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
@@ -0,0 +1,63 @@
+During the build process the mkg3states binary needs to be run. This patch
+allows it to be built with the build systems gcc allowing this to work.
+RP 31/3/10
+Index: liblbxutil-1.1.0/configure.ac
+===================================================================
+--- liblbxutil-1.1.0.orig/configure.ac  2009-12-04 22:52:04.000000000 +0000
+++ liblbxutil-1.1.0/configure.ac       2010-03-31 15:26:33.000000000 +0100
+@@ -50,4 +50,5 @@
+ 
+ AC_OUTPUT([Makefile
+           src/Makefile
+          src/image/Makefile
+           lbxutil.pc])
+Index: liblbxutil-1.1.0/src/Makefile.am
+===================================================================
+--- liblbxutil-1.1.0.orig/src/Makefile.am       2009-12-04 23:03:17.000000000 +0000
+++ liblbxutil-1.1.0/src/Makefile.am    2010-03-31 15:27:25.000000000 +0100
+@@ -3,10 +3,7 @@
+ AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
+ INCLUDES = -I$(top_srcdir)/include
+ 
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES =                           \
+-       $(srcdir)/image/mkg3states.c
+SUBDIRS = image
+ 
+ liblbxutil_la_SOURCES =                                \
+        $(srcdir)/lbx_zlib/reqstats.h           \
+@@ -38,9 +35,8 @@
+ 
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+ 
+-g3states.h: mkg3states
+-       -rm -f g3states.h
+-       $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+g3states.h: image/mkg3states
+       ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+ 
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ 
+Index: liblbxutil-1.1.0/src/image/Makefile.am
+===================================================================
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
+++ liblbxutil-1.1.0/src/image/Makefile.am      2010-03-31 15:26:33.000000000 +0100
+@@ -0,0 +1,15 @@
+# evil hack
+CFLAGS=$(CFLAGS_FOR_BUILD)
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+noinst_PROGRAMS = mkg3states
+
+mkg3states_SOURCES =                           \
+       mkg3states.c
+
+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
new file mode 100644
index 0000000000..cdf3509246
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "XFIXES Extension"
+DEPENDS += " libxext xextproto xproto zlib"
+PROVIDES = "lbxutil"
+PE = "1"
+PR = "r1"
+SRC_URI += "file://mkg3states.patch;patch=1"
+export CC_FOR_BUILD = "gcc"
diff --git a/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb b/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb
new file mode 100644
index 0000000000..84470cbc78
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+DEPENDS += " virtual/libx11"
+PE = "1"
+XORG_PN = "liboldX"
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.11.0.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.11.0.bb
new file mode 100644
index 0000000000..b4032c0a10
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.11.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Generic PCI access library"
+require xorg-lib-common.inc
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ad1647740bccb2315e6f6368dce05c6d"
+PR = "r0"
+DEPENDS += "xproto virtual/libx11"
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libsm_1.1.1.bb
new file mode 100644
index 0000000000..0ec38c5aa9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libsm_1.1.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X11 Session management library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=451a87de5b38d25ec6b96d548087934d"
+DEPENDS += "libice xproto xtrans e2fsprogs"
+PR = "r0"
+PE = "1"
+XORG_PN = "libSM"
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb
new file mode 100644
index 0000000000..a03d49505b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+DEPENDS += "libxext windowswmproto"
+PE = "1"
+XORG_PN = "libWindowsWM"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
new file mode 100644
index 0000000000..c8aa08595d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+--- libX11-1.3.4.orig/configure.ac
+++ libX11-1.3.4/configure.ac
+@@ -353,9 +353,9 @@
+ #
+ # 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 -f "$KEYSYMDEF"; then
+         AC_MSG_RESULT([$KEYSYMDEF])
+ else
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
new file mode 100644
index 0000000000..011c23e8d8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
@@ -0,0 +1,10 @@
+--- libX11-1.3.4.orig/configure.ac
+++ libX11-1.3.4/configure.ac
+@@ -32,7 +32,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ PKG_PROG_PKG_CONFIG
+ 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..4036757e54
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
@@ -0,0 +1,31 @@
+---
+ src/util/Makefile.am |   21 -----------------
+ 1 file changed, 21 deletions(-)
+--- libX11-1.3.4.orig/src/util/Makefile.am
+++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1,3 @@
+ 
+-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/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
new file mode 100644
index 0000000000..a76aba16e4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -0,0 +1,17 @@
+require libx11.inc
+PR = "r1"
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1 \
+            file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
new file mode 100644
index 0000000000..d1f0a753fa
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
@@ -0,0 +1,12 @@
+require libx11.inc
+require libx11_git.inc
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
new file mode 100644
index 0000000000..2dd27fc94f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
@@ -0,0 +1,568 @@
+---
+ configure.ac       |    9 -
+ src/Makefile.am    |    5 
+ src/X18NCMSstubs.c |  428 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/imConv.c       |    4 
+ src/locking.c      |    4 
+ 5 files changed, 448 insertions(+), 2 deletions(-)
+--- git.orig/configure.ac
+++ git/configure.ac
+@@ -263,11 +263,18 @@ if test -f "$KEYSYMDEF"; then
+ else
+        AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
+ AC_SUBST(KEYSYMDEF)
+ 
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
+AC_ARG_ENABLE(udc,
+              AC_HELP_STRING([--disable-udc],
+                [Disable Xlib support for UDC *EXPERIMENTAL*]),
+              [UDC=$enableval],[UDC=yes])
+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
+if test x"$UDC" = "xyes"; then
+       AC_DEFINE(UDC,1,[Include support for UDC])
+fi
+ 
+ AC_ARG_ENABLE(xcms,
+               AC_HELP_STRING([--disable-xcms],
+                 [Disable Xlib support for CMS *EXPERIMENTAL*]),
+               [XCMS=$enableval],[XCMS=yes])
+--- git.orig/src/Makefile.am
+++ git/src/Makefile.am
+@@ -329,18 +329,21 @@ endif
+ 
+ if THRSTUBS
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+ 
+libX11_la_SOURCES+=X18NCMSstubs.c
+
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+ 
+ EXTRA_DIST = \
+        $(x11data_DATA) \
+        os2Stubs.c \
+        udcInf.c \
+-       UIThrStubs.c 
+       UIThrStubs.c \
+       X18NCMSstubs.c
+ 
+ if XCB
+ libX11_la_SOURCES += \
+                   xcb_lock.c \
+                   xcb_disp.c \
+--- /dev/null
+++ git/src/X18NCMSstubs.c
+@@ -0,0 +1,428 @@
+/*
+ * X18NCMSstubs.c
+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
+ *
+ * Copyright � 2003 Matthew Allum
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Matthew Allum not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard and Compaq makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include "Xlibint.h"
+#include "Xlcint.h"
+#include <X11/Xlocale.h>
+#include <X11/Xos.h>
+#ifdef WIN32
+#undef close
+#endif
+#include <X11/Xutil.h>
+#include "XlcPubI.h"
+
+#include "Xcmsint.h"           /* for XcmsCCC type  */
+#include "XlcPubI.h"            /* for XLCd type */
+#include "config.h"
+
+#if ! XLOCALE
+
+Bool
+XSupportsLocale()
+{
+  return False;
+}
+
+char *
+XSetLocaleModifiers(
+    const char *modifiers)
+{
+  return NULL;
+}
+
+XLCd
+_XOpenLC(
+    char *name)
+{
+  return NULL;
+}
+
+XLCd
+_XlcCurrentLC()
+{
+  return NULL;
+}
+
+void
+_XlcVaToArgList(
+    va_list var,
+    int count,
+    XlcArgList *args_ret)
+{
+  return;
+}
+
+void
+_XlcCountVaList(
+    va_list var,
+    int *count_ret)
+{
+  return;
+}
+
+void
+_XCloseLC(
+    XLCd lcd)
+{
+  return;
+}
+
+int
+_XlcConvert(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+  return 0;
+}
+
+/* XIM Stubs */
+
+XPointer
+_XimGetLocaleCode ( _Xconst char* encoding_name )
+{
+  return NULL;
+}
+
+int
+_XimGetCharCode (
+    XPointer            ucs_conv,
+    KeySym              keysym,
+    unsigned char*      buf,
+    int                 nbytes)
+{
+  return 0;
+}
+
+/* Xrm Stubs */
+
+XrmMethods
+_XrmInitParseInfo(
+    XPointer *state)
+{
+    return (XrmMethods) NULL;
+}
+
+/* Xwc Stubs */
+
+int
+XwcTextExtents(
+    XFontSet            font_set,
+    _Xconst wchar_t    *text,
+    int                 text_len,
+    XRectangle         *overall_ink_extents,
+    XRectangle         *overall_logical_extents)
+{
+  return 0;
+}
+
+void
+XwcDrawString(Display *display,
+             Drawable d,
+             XFontSet font_set,
+             GC gc,
+             int x, int y,
+             _Xconst wchar_t *string,
+             int num_wchars)
+{
+  ;
+}
+
+void
+XwcDrawText(
+    Display            *dpy,
+    Drawable            d,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    XwcTextItem        *text_items,
+    int                 nitems)
+{
+  ;
+}
+
+void
+XwcDrawImageString(
+    Display            *dpy,
+    Drawable            d,
+    XFontSet            font_set,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    _Xconst wchar_t    *text,
+    int                 text_len)
+{
+  ;
+}
+
+int
+XwcTextEscapement(
+    XFontSet            font_set,
+    _Xconst wchar_t    *text,
+    int                 text_len)
+{
+  return 0;
+}
+
+Status
+XwcTextPerCharExtents(
+    XFontSet            font_set,
+    _Xconst wchar_t    *text,
+    int                 text_len,
+    XRectangle         *ink_extents_buffer,
+    XRectangle         *logical_extents_buffer,
+    int                 buffer_size,
+    int                *num_chars,
+    XRectangle         *max_ink_extents,
+    XRectangle         *max_logical_extents)
+{
+  ;
+}
+
+int
+XwcTextPropertyToTextList(
+    Display *dpy,
+    const XTextProperty *text_prop,
+    wchar_t ***list_ret,
+    int *count_ret)
+{
+  return 0;
+}
+
+int
+XwcTextListToTextProperty(
+    Display *dpy,
+    wchar_t **list,
+    int count,
+    XICCEncodingStyle style,
+    XTextProperty *text_prop)
+{
+  return 0;
+}
+
+void
+XwcFreeStringList(wchar_t **list)
+{
+  return;
+}
+
+
+void XmbSetWMProperties (        /* Actually from mbWMProps.c */
+    Display *dpy,
+    Window w,
+    _Xconst char *windowName,
+    _Xconst char *iconName,
+    char **argv,
+    int argc,
+    XSizeHints *sizeHints,
+    XWMHints *wmHints,
+    XClassHint *classHints)
+{
+  return;
+}
+
+int
+XmbTextPropertyToTextList(
+    Display *dpy,
+    const XTextProperty *text_prop,
+    char ***list_ret,
+    int *count_ret)
+{
+  return XLocaleNotSupported;
+}
+
+int
+XmbTextListToTextProperty(
+    Display *dpy,
+    char **list,
+    int count,
+    XICCEncodingStyle style,
+    XTextProperty *text_prop)
+{
+  return XLocaleNotSupported;
+}
+
+int
+XmbTextExtents(
+    XFontSet        font_set,
+    _Xconst char   *text,
+    int             text_len,
+    XRectangle     *overall_ink_extents,
+    XRectangle     *overall_logical_extents)
+{
+  return 0;
+}
+
+void
+XmbDrawText(
+    Display            *dpy,
+    Drawable            d,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    XmbTextItem        *text_items,
+    int                 nitems)
+{
+  ;
+}
+
+void
+XmbDrawString(
+    Display            *dpy,
+    Drawable            d,
+    XFontSet            font_set,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    _Xconst char       *text,
+    int                 text_len)
+{
+  ;
+}
+
+void
+XmbDrawImageString(
+    Display            *dpy,
+    Drawable            d,
+    XFontSet            font_set,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    _Xconst char       *text,
+    int                 text_len)
+{
+  ;
+}
+
+int
+XmbTextEscapement(
+    XFontSet        font_set,
+    _Xconst char   *text,
+    int             text_len)
+{
+  return 0;
+}
+
+Status
+XmbTextPerCharExtents(
+    XFontSet        font_set,
+    _Xconst char   *text,
+    int             text_len,
+    XRectangle     *ink_extents_buffer,
+    XRectangle     *logical_extents_buffer,
+    int             buffer_size,
+    int            *num_chars,
+    XRectangle     *max_ink_extents,
+    XRectangle     *max_logical_extents)
+{
+  return 0;
+}
+
+unsigned int
+KeySymToUcs4(KeySym keysym)
+{
+  return 0;
+}
+
+#endif
+
+#if ! XCMS
+
+XcmsCCC
+XcmsCCCOfColormap(dpy, cmap)
+    Display *dpy;
+    Colormap cmap;
+{
+  return NULL;
+}
+
+Status
+_XcmsResolveColorString (
+    XcmsCCC ccc,
+    const char **color_string,
+    XcmsColor *pColor_exact_return,
+    XcmsColorFormat result_format)
+{
+  return(XcmsFailure);
+}
+
+void
+_XcmsUnresolveColor(
+    XcmsCCC ccc,
+    XcmsColor *pColor)
+{
+  return;
+}
+
+void
+_XUnresolveColor(
+    XcmsCCC ccc,
+    XColor *pXColor)
+{
+  return;
+}
+
+XcmsCmapRec *
+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
+    Display *dpy;
+    Colormap cmap;
+    Window windowID;
+    Visual *visual;
+{
+  return NULL;
+}
+
+void
+_XcmsRGB_to_XColor(
+    XcmsColor *pColors,
+    XColor *pXColors,
+    unsigned int nColors)
+{
+  return;
+}
+
+XcmsCmapRec *
+_XcmsCopyCmapRecAndFree(
+    Display *dpy,
+    Colormap src_cmap,
+    Colormap copy_cmap)
+{
+  return NULL;
+}
+
+void
+_XcmsDeleteCmapRec(
+    Display *dpy,
+    Colormap cmap)
+{
+  return;
+}
+
+#endif
+--- git.orig/src/imConv.c
+++ git/src/imConv.c
+@@ -81,10 +81,11 @@ static const struct SubstRec SubstTable[
+ /*
+  * Given the name of a charset, returns the pointer to convertors
+  * from UCS char to specified charset char.
+  * This converter is needed for _XimGetCharCode subroutine.
+  */
+#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+     _Xconst char*      encoding_name)
+ {
+     XPointer cvt = _Utf8GetConvByName(encoding_name);
+@@ -94,10 +95,11 @@ _XimGetLocaleCode (
+            if (!strcmp(encoding_name, SubstTable[i].encoding_name))
+                return _Utf8GetConvByName(SubstTable[i].charset_name);
+     }
+     return cvt;
+ }
+#endif
+ 
+ /*
+  * Returns the locale dependent representation of a keysym.
+  * The locale's encoding is passed in form of pointer to UCS convertor.
+  * The resulting multi-byte sequence is placed starting at buf (a buffer
+@@ -105,10 +107,11 @@ _XimGetLocaleCode (
+  * Returns the length of the resulting multi-byte sequence, excluding the
+  * terminating NUL byte. Return 0 if the keysym is not representable in the
+  * locale
+  */
+ /*ARGSUSED*/
+#ifdef XLOCALE
+ int
+ _XimGetCharCode (
+     XPointer            ucs_conv,
+     KeySym             keysym,
+     unsigned char*     buf,
+@@ -133,10 +136,11 @@ _XimGetCharCode (
+         return nbytes;
+     if (count<nbytes)
+         buf[count]= '\0';
+     return count;
+ }
+#endif
+ 
+ #ifdef XKB
+ static int lookup_string(
+     XKeyEvent*         event,
+     char*              buffer,
+--- git.orig/src/locking.c
+++ git/src/locking.c
+@@ -53,11 +53,13 @@ in this Software without prior written a
+ #endif
+ 
+ #define NUM_FREE_CVLS 4
+ 
+ /* in lcWrap.c */
+#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
+#endif
+ 
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+ 
+ void _Xthread_init()
+@@ -623,13 +625,15 @@ Status XInitThreads()
+        return 0;
+     }
+     _Xglobal_lock = &global_lock;
+     xmutex_init(_Xglobal_lock->lock);
+     xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
+#ifdef XLOCALE
+     _Xi18n_lock = &i18n_lock;
+     xmutex_init(_Xi18n_lock->lock);
+     xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
+#endif
+     _XLockMutex_fn = _XLockMutex;
+     _XUnlockMutex_fn = _XUnlockMutex;
+     _XCreateMutex_fn = _XCreateMutex;
+     _XFreeMutex_fn = _XFreeMutex;
+     _XInitDisplayLock_fn = _XInitDisplayLock;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..9dbf6dac68
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig        2006-03-12 18:35:42.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/Font.c     2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+     }
+     if (l - 2 - (p - charset) < 0)
+        return 0;
+#ifdef XLOCALE
+     if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
+#else
+    if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
+#endif
+        return 0;
+     if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+        return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..a098db1941
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
+@@ -103,7 +103,7 @@
+ 
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+    November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
+#undef X_HAVE_UTF8_STRING
+ 
+ typedef char *XPointer;
+ 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
new file mode 100644
index 0000000000..99ed57194e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
@@ -0,0 +1,23 @@
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+--- libX11-1.1.5.orig/configure.ac
+++ libX11-1.1.5/configure.ac
+@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+ 
+ #
+ # 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 -f "$KEYSYMDEF"; then
+         AC_MSG_RESULT([$KEYSYMDEF])
+ else
+        AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
@@ -0,0 +1,12 @@
+Index: libX11-1.2.1/configure.ac
+===================================================================
+--- libX11-1.2.1.orig/configure.ac      2009-07-02 14:07:54.000000000 +0100
+++ libX11-1.2.1/configure.ac   2009-07-02 14:08:01.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
+ 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..9cc2bbbbdd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
@@ -0,0 +1,28 @@
+---
+ src/util/Makefile.am |   17 -----------------
+ 1 file changed, 17 deletions(-)
+Index: git/src/util/Makefile.am
+===================================================================
+--- git.orig/src/util/Makefile.am       2010-01-28 22:24:29.000000000 +0000
+++ git/src/util/Makefile.am    2010-01-28 22:29:26.000000000 +0000
+@@ -1,19 +1,2 @@
+ 
+-noinst_PROGRAMS=makekeys
+ 
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-CC = @CC_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/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
new file mode 100644
index 0000000000..0eab197a80
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c     2003-12-04 22:47:47.000000000 +0000
+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+   return;
+ }
+ 
+XIM
+XOpenIM (
+    Display* display,
+    struct _XrmHashBucketRec* rdb,
+    char* res_name,
+    char* res_class)
+{
+  return (XIM) NULL;
+}
+
+Status
+XCloseIM ( XIM im )
+{
+  return NULL;
+}
+
+XIC
+XCreateIC ( XIM im, ...)
+{
+  return NULL;
+}
+
+void
+XDestroyIC ( XIC ic )
+{
+  return;
+}
+
+int
+XmbLookupString (
+    XIC ic,
+    XKeyPressedEvent* ev,
+    char* buffer,
+    int nbytes,
+    KeySym* keysym,
+    Status* status)
+{
+  return XLookupNone;
+}
+
+char *
+XGetICValues( XIC ic, ...)
+{
+  return (char *) NULL;
+}
+
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
new file mode 100644
index 0000000000..99ed57194e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
@@ -0,0 +1,23 @@
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+--- libX11-1.1.5.orig/configure.ac
+++ libX11-1.1.5/configure.ac
+@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+ 
+ #
+ # 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 -f "$KEYSYMDEF"; then
+         AC_MSG_RESULT([$KEYSYMDEF])
+ else
+        AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
@@ -0,0 +1,12 @@
+Index: libX11-1.2.1/configure.ac
+===================================================================
+--- libX11-1.2.1.orig/configure.ac      2009-07-02 14:07:54.000000000 +0100
+++ libX11-1.2.1/configure.ac   2009-07-02 14:08:01.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
+ 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..670578257c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+---
+ src/util/Makefile.am |   17 -----------------
+ 1 file changed, 17 deletions(-)
+Index: libX11-1.2.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.2.1.orig/src/util/Makefile.am      2008-10-07 18:18:19.000000000 +0100
+++ libX11-1.2.1/src/util/Makefile.am   2009-07-02 14:04:38.000000000 +0100
+@@ -1,20 +1,3 @@
+ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+ 
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-CC = @CC_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/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
new file mode 100644
index 0000000000..190217d387
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -0,0 +1,14 @@
+require libx11.inc
+LICENSE = "MIT & MIT-style & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
+PR = "r0"
+DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
+SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
+            file://../libx11-${PV}/include_fix.patch \
+            file://../libx11-${PV}/nodolt.patch"
+EXTRA_OECONF += "--disable-xcms --with-xcb"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
new file mode 100644
index 0000000000..99426c3c5d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+require libx11_git.inc
+PR = "r2"
+DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
+EXTRA_OECONF += "--disable-xcms --with-xcb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
new file mode 100644
index 0000000000..f8c17b1a6d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -0,0 +1,34 @@
+DESCRIPTION = "X11 protocol and utility library"
+require xorg-lib-common.inc
+PROVIDES = "virtual/libx11"
+XORG_PN = "libX11"
+LEAD_SONAME = "libX11.so"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+do_compile() {
+        cd ${S}/src/util
+        mv makekeys.c.orig makekeys.c || true
+        touch makekeys-makekeys.o
+        (
+                unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+                ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+        )
+        if [ "$?" != "0" ]; then
+                exit 1
+        fi
+        # mv to stop it getting rebuilt
+        mv makekeys.c makekeys.c.orig
+        cd ${S}
+        oe_runmake
+}
+# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
+# A world build should only build the correct version, not all of them.
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
new file mode 100644
index 0000000000..54b1727a95
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -0,0 +1,528 @@
+--- libX11-X11R7.0-1.0.0/src/imConv.c.orig      2006-03-08 09:46:03.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/imConv.c   2006-03-08 10:50:10.000000000 +0100
+@@ -83,6 +83,7 @@
+  * from UCS char to specified charset char.
+  * This converter is needed for _XimGetCharCode subroutine.
+  */
+#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+     _Xconst char*      encoding_name)
+@@ -96,6 +97,7 @@
+     }
+     return cvt;
+ }
+#endif
+ 
+ /*
+  * Returns the locale dependent representation of a keysym.
+@@ -107,6 +109,7 @@
+  * locale
+  */
+ /*ARGSUSED*/
+#ifdef XLOCALE
+ int 
+ _XimGetCharCode (
+     XPointer            ucs_conv,
+@@ -135,6 +138,7 @@
+         buf[count]= '\0';
+     return count;
+ }
+#endif
+ 
+ #ifdef XKB
+ static int lookup_string(
+--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig        2006-03-08 08:43:19.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c     2006-03-08 11:41:28.000000000 +0100
+@@ -0,0 +1,428 @@
+/*
+ * X18NCMSstubs.c
+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
+ *
+ * Copyright � 2003 Matthew Allum
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Matthew Allum not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard and Compaq makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, 
+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include "Xlibint.h"
+#include "Xlcint.h"
+#include <X11/Xlocale.h>
+#include <X11/Xos.h>
+#ifdef WIN32
+#undef close
+#endif
+#include <X11/Xutil.h>
+#include "XlcPubI.h"
+
+#include "Xcmsint.h"           /* for XcmsCCC type  */
+#include "XlcPubI.h"            /* for XLCd type */
+#include "config.h"
+
+#if ! XLOCALE
+
+Bool
+XSupportsLocale()
+{
+  return False;                
+}
+
+char *
+XSetLocaleModifiers(
+    const char *modifiers)
+{
+  return NULL;
+}
+
+XLCd
+_XOpenLC(
+    char *name)
+{
+  return NULL;
+}
+
+XLCd
+_XlcCurrentLC()
+{
+  return NULL;
+}
+
+void
+_XlcVaToArgList(
+    va_list var,
+    int count,
+    XlcArgList *args_ret)
+{
+  return;
+}
+
+void
+_XlcCountVaList(
+    va_list var,
+    int *count_ret)
+{
+  return;
+}
+
+void
+_XCloseLC(
+    XLCd lcd)
+{
+  return;
+}
+
+int
+_XlcConvert(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+  return 0;
+}
+
+/* XIM Stubs */
+
+XPointer
+_XimGetLocaleCode ( _Xconst char* encoding_name )
+{
+  return NULL;
+}
+
+int
+_XimGetCharCode (
+    XPointer            ucs_conv,
+    KeySym              keysym,
+    unsigned char*      buf,
+    int                 nbytes)
+{
+  return 0;
+}
+
+/* Xrm Stubs */
+
+XrmMethods
+_XrmInitParseInfo(
+    XPointer *state)
+{
+    return (XrmMethods) NULL;
+}
+
+/* Xwc Stubs */
+
+int
+XwcTextExtents(
+    XFontSet            font_set,
+    _Xconst wchar_t    *text,
+    int                 text_len,
+    XRectangle         *overall_ink_extents,
+    XRectangle         *overall_logical_extents)
+{
+  return 0;
+}
+
+void 
+XwcDrawString(Display *display,
+             Drawable d,
+             XFontSet font_set,
+             GC gc,
+             int x, int y,
+             _Xconst wchar_t *string,
+             int num_wchars)
+{
+  ;
+}
+
+void
+XwcDrawText(
+    Display            *dpy,
+    Drawable            d,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    XwcTextItem        *text_items,
+    int                 nitems)
+{
+  ;
+}
+
+void
+XwcDrawImageString(
+    Display            *dpy,
+    Drawable            d,
+    XFontSet            font_set,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    _Xconst wchar_t    *text,
+    int                 text_len)
+{
+  ;
+}
+
+int
+XwcTextEscapement(
+    XFontSet            font_set,
+    _Xconst wchar_t    *text,
+    int                 text_len)
+{
+  return 0;
+}
+
+Status
+XwcTextPerCharExtents(
+    XFontSet            font_set,
+    _Xconst wchar_t    *text,
+    int                 text_len,
+    XRectangle         *ink_extents_buffer,
+    XRectangle         *logical_extents_buffer,
+    int                 buffer_size,
+    int                *num_chars,
+    XRectangle         *max_ink_extents,
+    XRectangle         *max_logical_extents)
+{
+  ;
+}
+
+int
+XwcTextPropertyToTextList(
+    Display *dpy,
+    const XTextProperty *text_prop,
+    wchar_t ***list_ret,
+    int *count_ret)
+{
+  return 0;
+}
+
+int
+XwcTextListToTextProperty(
+    Display *dpy,
+    wchar_t **list,
+    int count,
+    XICCEncodingStyle style,
+    XTextProperty *text_prop)
+{
+  return 0;
+}
+
+void
+XwcFreeStringList(wchar_t **list)
+{
+  return;
+}
+
+
+void XmbSetWMProperties (        /* Actually from mbWMProps.c */
+    Display *dpy,
+    Window w,
+    _Xconst char *windowName,
+    _Xconst char *iconName,
+    char **argv,
+    int argc,
+    XSizeHints *sizeHints,
+    XWMHints *wmHints,
+    XClassHint *classHints)
+{
+  return;
+}
+
+int
+XmbTextPropertyToTextList(
+    Display *dpy,
+    const XTextProperty *text_prop,
+    char ***list_ret,
+    int *count_ret)
+{
+  return XLocaleNotSupported;
+}
+
+int
+XmbTextListToTextProperty(
+    Display *dpy,
+    char **list,
+    int count,
+    XICCEncodingStyle style,
+    XTextProperty *text_prop)
+{
+  return XLocaleNotSupported;
+}
+
+int
+XmbTextExtents(
+    XFontSet        font_set,
+    _Xconst char   *text,
+    int             text_len,
+    XRectangle     *overall_ink_extents,
+    XRectangle     *overall_logical_extents)
+{
+  return 0;
+}
+
+void
+XmbDrawText(
+    Display            *dpy,
+    Drawable            d,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    XmbTextItem        *text_items,
+    int                 nitems)
+{
+  ;
+}
+
+void
+XmbDrawString(
+    Display            *dpy,
+    Drawable            d,
+    XFontSet            font_set,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    _Xconst char       *text,
+    int                 text_len)
+{
+  ;
+}
+
+void
+XmbDrawImageString(
+    Display            *dpy,
+    Drawable            d,
+    XFontSet            font_set,
+    GC                  gc,
+    int                 x,
+    int                 y,
+    _Xconst char       *text,
+    int                 text_len)
+{
+  ;
+}
+
+int
+XmbTextEscapement(
+    XFontSet        font_set,
+    _Xconst char   *text,
+    int             text_len)
+{
+  return 0;
+}
+
+Status
+XmbTextPerCharExtents(
+    XFontSet        font_set,
+    _Xconst char   *text,
+    int             text_len,
+    XRectangle     *ink_extents_buffer,
+    XRectangle     *logical_extents_buffer,
+    int             buffer_size,
+    int            *num_chars,
+    XRectangle     *max_ink_extents,
+    XRectangle     *max_logical_extents)
+{
+  return 0;
+}
+
+unsigned int
+KeySymToUcs4(KeySym keysym)
+{
+  return 0;
+}
+
+#endif 
+
+#if ! XCMS
+
+XcmsCCC 
+XcmsCCCOfColormap(dpy, cmap)
+    Display *dpy;
+    Colormap cmap;
+{
+  return NULL;
+}
+
+Status
+_XcmsResolveColorString (
+    XcmsCCC ccc,
+    const char **color_string,
+    XcmsColor *pColor_exact_return,
+    XcmsColorFormat result_format)
+{
+  return(XcmsFailure);
+}
+
+void
+_XcmsUnresolveColor(
+    XcmsCCC ccc,
+    XcmsColor *pColor)
+{
+  return;
+}
+
+void
+_XUnresolveColor(
+    XcmsCCC ccc,
+    XColor *pXColor)
+{
+  return;
+}
+
+XcmsCmapRec *
+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
+    Display *dpy;
+    Colormap cmap;
+    Window windowID;
+    Visual *visual;
+{
+  return NULL;
+}
+
+void
+_XcmsRGB_to_XColor(
+    XcmsColor *pColors,
+    XColor *pXColors,
+    unsigned int nColors)
+{
+  return;
+}
+
+XcmsCmapRec *
+_XcmsCopyCmapRecAndFree(
+    Display *dpy,
+    Colormap src_cmap,
+    Colormap copy_cmap)
+{
+  return NULL;
+}
+
+void
+_XcmsDeleteCmapRec(
+    Display *dpy,
+    Colormap cmap)
+{
+  return;
+}
+
+#endif
+--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig   2006-03-08 08:31:09.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/Makefile.am        2006-03-08 09:36:23.000000000 +0100
+@@ -331,6 +331,8 @@
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+ 
+libX11_la_SOURCES+=X18NCMSstubs.c
+
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+ 
+@@ -338,7 +340,8 @@
+        $(x11data_DATA) \
+        os2Stubs.c \
+        udcInf.c \
+-       UIThrStubs.c 
+       UIThrStubs.c \
+       X18NCMSstubs.c
+ 
+ #
+ # Figure out which sub-libraries to link into Xlib
+--- libX11-X11R7.0-1.0.0/src/locking.c.orig     2006-03-08 11:05:56.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/locking.c  2006-03-08 11:06:37.000000000 +0100
+@@ -55,7 +55,9 @@
+ #define NUM_FREE_CVLS 4
+ 
+ /* in lcWrap.c */
+#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
+#endif
+ 
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+@@ -625,9 +627,11 @@
+     _Xglobal_lock = &global_lock;
+     xmutex_init(_Xglobal_lock->lock);
+     xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
+#ifdef XLOCALE
+     _Xi18n_lock = &i18n_lock;
+     xmutex_init(_Xi18n_lock->lock);
+     xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
+#endif
+     _XLockMutex_fn = _XLockMutex;
+     _XUnlockMutex_fn = _XUnlockMutex;
+     _XCreateMutex_fn = _XCreateMutex;
+--- libX11-X11R7.0-1.0.0/configure.ac.orig      2006-03-08 10:03:57.000000000 +0100
+++ libX11-X11R7.0-1.0.0/configure.ac   2006-03-08 10:06:01.000000000 +0100
+@@ -215,7 +215,14 @@
+ esac
+ AC_SUBST(KEYSYMDEF)
+ 
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
+AC_ARG_ENABLE(udc,
+              AC_HELP_STRING([--disable-udc],
+                [Disable Xlib support for UDC *EXPERIMENTAL*]),
+              [UDC=$enableval],[UDC=yes])
+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
+if test x"$UDC" = "xyes"; then
+       AC_DEFINE(UDC,1,[Include support for UDC])
+fi
+ 
+ AC_ARG_ENABLE(xcms, 
+               AC_HELP_STRING([--disable-xcms],
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..9dbf6dac68
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig        2006-03-12 18:35:42.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/Font.c     2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+     }
+     if (l - 2 - (p - charset) < 0)
+        return 0;
+#ifdef XLOCALE
+     if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
+#else
+    if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
+#endif
+        return 0;
+     if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+        return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..a098db1941
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
+@@ -103,7 +103,7 @@
+ 
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+    November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
+#undef X_HAVE_UTF8_STRING
+ 
+ typedef char *XPointer;
+ 
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
new file mode 100644
index 0000000000..99ed57194e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
@@ -0,0 +1,23 @@
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+--- libX11-1.1.5.orig/configure.ac
+++ libX11-1.1.5/configure.ac
+@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+ 
+ #
+ # 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 -f "$KEYSYMDEF"; then
+         AC_MSG_RESULT([$KEYSYMDEF])
+ else
+        AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
@@ -0,0 +1,12 @@
+Index: libX11-1.2.1/configure.ac
+===================================================================
+--- libX11-1.2.1.orig/configure.ac      2009-07-02 14:07:54.000000000 +0100
+++ libX11-1.2.1/configure.ac   2009-07-02 14:08:01.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
+ 
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..670578257c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+---
+ src/util/Makefile.am |   17 -----------------
+ 1 file changed, 17 deletions(-)
+Index: libX11-1.2.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.2.1.orig/src/util/Makefile.am      2008-10-07 18:18:19.000000000 +0100
+++ libX11-1.2.1/src/util/Makefile.am   2009-07-02 14:04:38.000000000 +0100
+@@ -1,20 +1,3 @@
+ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+ 
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-CC = @CC_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/meta/recipes-graphics/xorg-lib/libx11/xim.patch b/meta/recipes-graphics/xorg-lib/libx11/xim.patch
new file mode 100644
index 0000000000..0eab197a80
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/xim.patch
@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c     2003-12-04 22:47:47.000000000 +0000
+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+   return;
+ }
+ 
+XIM
+XOpenIM (
+    Display* display,
+    struct _XrmHashBucketRec* rdb,
+    char* res_name,
+    char* res_class)
+{
+  return (XIM) NULL;
+}
+
+Status
+XCloseIM ( XIM im )
+{
+  return NULL;
+}
+
+XIC
+XCreateIC ( XIM im, ...)
+{
+  return NULL;
+}
+
+void
+XDestroyIC ( XIC ic )
+{
+  return;
+}
+
+int
+XmbLookupString (
+    XIC ic,
+    XKeyPressedEvent* ev,
+    char* buffer,
+    int nbytes,
+    KeySym* keysym,
+    Status* status)
+{
+  return XLookupNone;
+}
+
+char *
+XGetICValues( XIC ic, ...)
+{
+  return (char *) NULL;
+}
+
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
new file mode 100644
index 0000000000..aaeb38e2d6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
@@ -0,0 +1,18 @@
+require libx11.inc
+LICENSE = "MIT & MIT-style & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
+PE = "1"
+PR = "r0"
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://nodolt.patch \
+            file://include_fix.patch"
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native gettext"
+EXTRA_OECONF += "--without-xcb"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
new file mode 100644
index 0000000000..a976a16cd3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_git.bb
@@ -0,0 +1,11 @@
+require libx11.inc
+require libx11_git.inc
+PR = "r2"
+DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
+           bigreqsproto xtrans libxau libxcb libxdmcp util-macros gettext"
+DEFAULT_PREFERENCE = "-1"
+BBCLASSEXTEND = "nativesdk"
+\ No newline at end of file
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.inc b/meta/recipes-graphics/xorg-lib/libx11_git.inc
new file mode 100644
index 0000000000..40d806178f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_git.inc
@@ -0,0 +1,11 @@
+PV = "1.2.1+git${SRCPV}"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+S = "${WORKDIR}/git"
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1 \
+            file://nodolt.patch;patch=1"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
+FILESPATH = "${FILE_DIRNAME}/libx11-git"
diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.5.bb
new file mode 100644
index 0000000000..65374611ba
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A Sample Authorization Protocol for X"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec"
+DEPENDS += " xproto gettext"
+PROVIDES = "xau"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXau"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
new file mode 100644
index 0000000000..489f456647
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
@@ -0,0 +1,21 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXaw"
+do_install_append () {
+        ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
+        ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
+        ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
+}
+PACKAGES =+ "libxaw6 libxaw7 libxaw8"
+FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
+FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
new file mode 100644
index 0000000000..0d7efc70f3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
@@ -0,0 +1,27 @@
+There is no extra reply data and if we say not to disgard it, xcb
+throws fatal asserts.
+RP - 26/11/09
+Index: git/xcalibrate.c
+===================================================================
+--- git.orig/xcalibrate.c       2009-11-26 08:11:48.000000000 +0000
+++ git/xcalibrate.c    2009-11-26 08:09:55.000000000 +0000
+@@ -216,7 +216,7 @@
+   req->reqType = info->codes->major_opcode;
+   req->xCalibrateReqType = X_XCalibrateRawMode;
+   req->on = enable;
+-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
+  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+     {
+       UnlockDisplay (dpy);
+       SyncHandle ();
+@@ -240,7 +240,7 @@
+   req->xCalibrateReqType = X_XCalibrateScreenToCoord;
+   req->x = *x;
+   req->y = *y;
+-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
+  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+     {
+       UnlockDisplay (dpy);
+       SyncHandle ();
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
new file mode 100644
index 0000000000..8ca731b2ef
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Touchscreen calibration client library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \
+                    file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7"
+DEPENDS = "virtual/libx11 calibrateproto libxext"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git \
+           file://fix-xcb.patch"
+S = "${WORKDIR}/git"
+FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
new file mode 100644
index 0000000000..9b10d1a26d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
@@ -0,0 +1,14 @@
+This patch makes the build use its own Xcomposite.h over rather than an
+older Xcomposite.h that might already be installed in the staging dir.
+--- libXcomposite-0.4.1/src/Makefile.am.orig    2010-06-27 15:50:05.000000000 +0800
+++ libXcomposite-0.4.1/src/Makefile.am 2010-06-27 15:51:48.000000000 +0800
+@@ -19,7 +19,7 @@
+ #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ #  PERFORMANCE OF THIS SOFTWARE.
+ 
+-AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ lib_LTLIBRARIES = libXcomposite.la
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb
new file mode 100644
index 0000000000..8c5ca022c7
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Composite extension library."
+require xorg-lib-common.inc
+LICENSE= "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
+DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
+PROVIDES = "xcomposite"
+PE = "1"
+PR = "r0"
+XORG_PN = "libXcomposite"
+SRC_URI += " file://change-include-order.patch"
diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.10.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.10.bb
new file mode 100644
index 0000000000..4b0a3b1ab4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.10.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X cursor management library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4"
+DEPENDS += "libxrender libxfixes"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXcursor"
diff --git a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.2.bb
new file mode 100644
index 0000000000..2ea9891c92
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X11 damaged region extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c8c88d1faea6d7c3a82d54c2b8fd2b"
+DEPENDS += "damageproto libxfixes"
+PROVIDES = "xdamage"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXdamage"
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.0.3.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.0.3.bb
new file mode 100644
index 0000000000..b1648fbf38
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.0.3.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X Display Manager Control Protocol library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123"
+DEPENDS += "xproto"
+PROVIDES = "xdmcp"
+PR = "r0"
+PE = "1"
+DEPENDS += "gettext"
+XORG_PN = "libXdmcp"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
new file mode 100644
index 0000000000..6c6b4595aa
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 EvIE extension library"
+DEPENDS += "libxext evieext"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXevie"
diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxext_1.1.2.bb
new file mode 100644
index 0000000000..14e6c1fb7e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxext_1.1.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X11 miscellaneous extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c70692f0f710dda89d6cfcc412d8a1aa"
+DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
+PROVIDES = "xext"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXext"
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxext_git.bb b/meta/recipes-graphics/xorg-lib/libxext_git.bb
new file mode 100644
index 0000000000..d0b3d7fbf5
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxext_git.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
+PROVIDES = "xext"
+PE = "1"
+PV = "1.0.99.1+gitr${SRCPV}"
+XORG_PN = "libXext"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN};protocol=git"
+S = "${WORKDIR}/git/"
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_4.0.4.bb b/meta/recipes-graphics/xorg-lib/libxfixes_4.0.4.bb
new file mode 100644
index 0000000000..b3ee0711dc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxfixes_4.0.4.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X Fixes extension library."
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
+DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXfixes"
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000000..90bded6fba
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
@@ -0,0 +1,22 @@
+--- /tmp/fontdir.c      2006-08-01 16:17:22.000000000 +0200
+++ libXfont-1.2.0/src/fontfile/fontdir.c       2006-08-01 16:20:37.248306000 +0200
+@@ -695,6 +695,11 @@
+      */
+     if (isscale)
+     {
+       /* If the fontname says it is scalable, make sure that the
+        * renderer supports OpenScalable and GetInfoScalable.
+        */
+       if (renderer->OpenScalable && renderer->GetInfoScalable)
+       {
+        if (vals.values_supplied & SIZE_SPECIFY_MASK)
+        {
+            bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -794,6 +799,7 @@
+                                            bitmap->name.name);
+             }
+        }
+       }
+     }
+     return TRUE;
+ }
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.4.2.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.4.2.bb
new file mode 100644
index 0000000000..6aa83c4ac6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.4.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X11 font rasterisation library"
+require xorg-lib-common.inc
+LICENSE= "MIT & MIT-style & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=deeee1c29f32ca774cecf0c83b46bb5c"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+PR = "r0"
+PE = "1"
+#SRC_URI += "file://no-scalable-crash.patch;patch=1"
+XORG_PN = "libXfont"
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb
new file mode 100644
index 0000000000..97f7ed6272
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X-TrueType font cache extension client library"
+DEPENDS += "libxext fontcacheproto"
+LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXfontcache"
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.1.14.bb b/meta/recipes-graphics/xorg-lib/libxft_2.1.14.bb
new file mode 100644
index 0000000000..7f5ccdd0fb
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.1.14.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "FreeType-based font drawing library for X"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
+DEPENDS += "libxrender freetype fontconfig"
+PROVIDES = "xft"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXft"
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+                ${libdir}/*.a ${libdir}/pkgconfig \
+                ${datadir}/aclocal ${bindir} ${sbindir}"
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.3.bb b/meta/recipes-graphics/xorg-lib/libxi_1.3.bb
new file mode 100644
index 0000000000..bd21eadd13
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2aafbfe6127f6f03eb776283e6138cce \
+                    file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f"
+DEPENDS += "libxext inputproto"
+PE = "1"
+XORG_PN = "libXi"
diff --git a/meta/recipes-graphics/xorg-lib/libxi_git.bb b/meta/recipes-graphics/xorg-lib/libxi_git.bb
new file mode 100644
index 0000000000..30c1778c3e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxi_git.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PV = "1.2.99.5+gitr${SRCPV}"
+XORG_PN = "libXi"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN};protocol=git"
+S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.bb
new file mode 100644
index 0000000000..35a967cff0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Xinerama extension library"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94 \
+                    file://src/Xinerama.c;beginline=2;endline=25;md5=098e0bc089368a988092b3cbda617a57"
+DEPENDS += "libxext xineramaproto"
+PROVIDES = "xinerama"
+PR = "r3"
+PE = "1"
+XORG_PN = "libXinerama"
diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.6.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.6.bb
new file mode 100644
index 0000000000..f46c147e4a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.6.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 keyboard file manipulation library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=aa32e1b87f1da02948ab7b55e129bf5f"
+DEPENDS += "virtual/libx11 kbproto"
+PR = "r0"
+PE = "1"
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
new file mode 100644
index 0000000000..9a3f5f1327
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard UI presentation library"
+LICENSE= "GPL"
+DEPENDS += "virtual/libx11 libxt libxkbfile"
+PROVIDES = "xkbui"
+PR = "r1"
+PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.0.5.bb
new file mode 100644
index 0000000000..761746e2cc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxmu_1.0.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "X11 miscellaneous utility library"
+require xorg-lib-common.inc
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bb8d1df693806ad17c7268086f1d5394"
+DEPENDS += "libxt libxext"
+PROVIDES = "xmu"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXmu"
+LEAD_SONAME = "libXmu"
+PACKAGES =+ "libxmuu libxmuu-dev"
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
diff --git a/meta/recipes-graphics/xorg-lib/libxp_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libxp_1.0.0.bb
new file mode 100644
index 0000000000..7d3b87473c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxp_1.0.0.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Printing Extension (Xprint) client library"
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=329e54eb6793b3d4830a4f6f1ca16e3f \
+                    file://src/XpPage.c;beginline=2;endline=37;md5=886b68ac3721003d54abfbd82bafc5ad"
+DEPENDS += "libxext libxau printproto"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXp"
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.7.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.7.bb
new file mode 100644
index 0000000000..75c10bf2c9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.7.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxext libsm libxt"
+PR = "r3"
+PE = "1"
+XORG_PN = "libXpm"
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb
new file mode 100644
index 0000000000..3a24a888d1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xprint job utility client library"
+DEPENDS += "libxp libxt libxprintutil"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXprintAppUtil"
diff --git a/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb
new file mode 100644
index 0000000000..327138e7fd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xprint printer utility client library"
+DEPENDS += "libxp libxt"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXprintUtil"
diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.3.0.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.3.0.bb
new file mode 100644
index 0000000000..461dff424b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.3.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X11 Resize and Rotate extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=660ef232af253760087c069d76287b85"
+DEPENDS += "randrproto libxrender libxext"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXrandr"
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.5.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.5.bb
new file mode 100644
index 0000000000..662796e90b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.5.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X11 Rendering Extension client library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
+DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXrender"
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxres_1.0.4.bb b/meta/recipes-graphics/xorg-lib/libxres_1.0.4.bb
new file mode 100644
index 0000000000..5c8c47ccbf
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxres_1.0.4.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 Resource extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa"
+DEPENDS += "libxext resourceproto"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXres"
diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.0.bb
new file mode 100644
index 0000000000..ff22c337a0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.0.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXScrnSaver"
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxt_1.0.8.bb
new file mode 100644
index 0000000000..a35d03eb03
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.0.8.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "X11 toolkit intrinsics library"
+require xorg-lib-common.inc
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0629f81eb944a4317bc6fe134614769f"
+DEPENDS += "libsm virtual/libx11 kbproto libxdmcp"
+PROVIDES = "xt"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXt"
+BBCLASSEXTEND = "native"
+EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
+do_compile() {
+        (
+                unset CC LD CXX CCLD CFLAGS
+                oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+        )
+        if [ "$?" != "0" ]; then
+                exit 1
+        fi
+        oe_runmake
+}
diff --git a/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb
new file mode 100644
index 0000000000..7a25ae5bce
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 event trapping extension library"
+DEPENDS += "libxt trapproto libxext"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXTrap"
diff --git a/meta/recipes-graphics/xorg-lib/libxtst_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxtst_1.1.0.bb
new file mode 100644
index 0000000000..bd18fb3c6b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxtst_1.1.0.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Test Extension: client side library"
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cba677ca25c42ad29ee8ff351b50ece8 \
+                    file://src/XTest.c;beginline=2;endline=32;md5=1491d278aeb574e84c5235eb44cdac74"
+DEPENDS += "libxext recordproto inputproto libxi"
+PROVIDES = "xtst"
+PR = "r2"
+PE = "1"
+XORG_PN = "libXtst"
diff --git a/meta/recipes-graphics/xorg-lib/libxv_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxv_1.0.5.bb
new file mode 100644
index 0000000000..d6e5777bcc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxv_1.0.5.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X11 Video extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=916ffd3d79baef9fb56d2c2af28f93f2"
+DEPENDS += "libxext videoproto"
+PR = "r0"
+XORG_PN = "libXv"
diff --git a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.5.bb
new file mode 100644
index 0000000000..7a8013fa53
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.5.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Video Motion Compensation extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94 \
+                    file://src/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de"
+DEPENDS += "libxext libxv videoproto"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXvMC"
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.1.bb
new file mode 100644
index 0000000000..6d5bd6aaa8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PR = "r1"
+PE = "1"
+XORG_PN = "libXxf86dga"
+LIC_FILES_CHKSUM = "file://COPYING;md5=978fbe536ab97ed49f45ba81159fe4b3"
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.2.bb
new file mode 100644
index 0000000000..8284dac231
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X11 XFree86 miscellaneous extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45"
+DEPENDS += "libxext xf86miscproto"
+PROVIDES = "xxf86misc"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXxf86misc"
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.0.bb
new file mode 100644
index 0000000000..7dc4a3a12b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 XFree86 video mode extension library"
+require xorg-lib-common.inc
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=de77b7cff98cf5d7a9a148069ebb4e1a"
+DEPENDS += "libxext xf86vidmodeproto"
+PR = "r0"
+PE = "1"
+XORG_PN = "libXxf86vm"
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb
new file mode 100644
index 0000000000..3bc1f0202f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Library for lowlevel pixel operations"
+require xorg-lib-common.inc
+LICENSE = "MIT & MIT-style & Public Domain"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fea989a44fb012b5e79584972a863d22 \
+                    file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
+                    file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
+                    file://pixman/pixman-x64-mmx-emulation.h;beginline=4;endline=9;md5=4e32716f2efaa6c4659222667c339bb8"
+DEPENDS = "virtual/libx11"
+PR="r0"
+EXTRA_OECONF="--disable-gtk"
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_1.9.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_1.9.bb
new file mode 100644
index 0000000000..0e59bd506f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_1.9.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Keyboard configuration database for X Window"
+HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config"
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
+SRC_URI = "http://people.freedesktop.org/~svu/xkeyboard-config-${PV}.tar.bz2"
+SECTION = "x11/libs"
+DEPENDS = "intltool xkbcomp-native glib-2.0"
+PR = "r0"
+EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
+RDEPENDS_${PN} += "xkbcomp"
+FILES_${PN} += "${datadir}/X11/xkb"
+inherit autotools pkgconfig
+do_install_append () {
+    install -d ${D}/usr/share/X11/xkb/compiled
+    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
+}
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
new file mode 100644
index 0000000000..4ed8c866ea
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -0,0 +1,16 @@
+HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+DEPENDS = "util-macros"
+XORG_PN = "${BPN}"
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+inherit autotools pkgconfig
+EXTRA_OECONF = "--enable-malloc0returnsnull"
diff --git a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
new file mode 100644
index 0000000000..197da0735d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
@@ -0,0 +1,58 @@
+From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001
+From: Loïc Minier <lool@dooz.org>
+Date: Mon, 24  Mar  2008  19:38:27  +0000
+Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT.
+If the socket isn't there, it's not gonna magically appear.  Either it's
+a server socket and you should have just waited for the SIGUSR1 from the
+server, or it's a stale reference to an ICE socket.
+However, do retry once, so fallback from abstract to filesystem namespace
+works.
+Originally Debian bug #385976.
+---
+diff --git a/Xtranssock.c b/Xtranssock.c
+index 8a7d2ec..da4afe9 100644
+--- a/Xtranssock.c
+++ b/Xtranssock.c
+@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
+            errno = olderrno;
+            
+            /*
+-            * If the error was ENOENT, the server may be starting up
+-            * and we should try again.
+            * If the error was ENOENT, the server may be starting up; we used
+            * to suggest to try again in this case with
+            * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
+            * processes still referencing stale sockets in their environment.
+            * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
+            * is suggested that higher level stacks handle retries on their
+            * level when they face a slow starting server.
+             *
+             * If the error was EWOULDBLOCK or EINPROGRESS then the socket
+             * was non-blocking and we should poll using select
+@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
+            else if (olderrno == EINTR)
+                return TRANS_TRY_CONNECT_AGAIN;
+            else if (olderrno == ENOENT) {
+-               /*
+-               * If opening as abstract socket failed, try again "normally"
+-               */
+-               if (abstract)
+               /* If opening as abstract socket failed, try again normally */
+               if (abstract) {
+                    ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
+-               return TRANS_TRY_CONNECT_AGAIN;
+-           }
+-           else {
+                   return TRANS_TRY_CONNECT_AGAIN;
+               } else {
+                   return TRANS_CONNECT_FAILED;
+               }
+           } else {
+                PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
+                       EGET(),0, 0);
+ 
+--
+cgit v0.7.2-37-g538c
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.2.5.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.2.5.bb
new file mode 100644
index 0000000000..52609b7e2b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.2.5.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+require xorg-lib-common.inc
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e334229ea6378ccb4a6202d7b715831c"
+PE = "1"
+PR = "r0"
+RDEPENDS_${PN}-dev = ""
+DEPENDS += "gettext"
+BBCLASSEXTEND = "native nativesdk"