Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
author: Chris Larson <kergoth@openedhand.com> 2006-08-15 11:58:37 +0000
committer: Chris Larson <kergoth@openedhand.com> 2006-08-15 11:58:37 +0000
commit: ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree: 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-lib
parent: c210d01a7ca8c00ddc45d292878b89086b137129 (diff)
download: poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz
193 files changed, 3427 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff b/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
new file mode 100644
index 0000000000..54b1727a95
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/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/packages/xorg-lib/diet-x11/autofoo.patch b/meta/packages/xorg-lib/diet-x11/autofoo.patch
new file mode 100644
index 0000000000..8bdba09768
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/autofoo.patch
@@ -0,0 +1,22 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libX11-6.2.1/configure.ac~autofoo
+++ libX11-6.2.1/configure.ac
+@@ -7,12 +7,12 @@
+         [jg@freedesktop.org],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_CONFIG_AUX_DIR(.)
+ 
+AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([src/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff b/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..9dbf6dac68
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/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/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..a098db1941
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/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/packages/xorg-lib/diet-x11/xim.patch b/meta/packages/xorg-lib/diet-x11/xim.patch
new file mode 100644
index 0000000000..0eab197a80
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/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/packages/xorg-lib/diet-x11_20050226.bb b/meta/packages/xorg-lib/diet-x11_20050226.bb
new file mode 100644
index 0000000000..1220806052
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_20050226.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/meta/packages/xorg-lib/diet-x11_6.2.1.bb b/meta/packages/xorg-lib/diet-x11_6.2.1.bb
new file mode 100644
index 0000000000..96d63aa0ee
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_6.2.1.bb
@@ -0,0 +1,9 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+        file://xim.patch;patch=1"
diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b30098c850
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
@@ -0,0 +1,13 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+#do_stage_append () {
+#       rm -f ${STAGING_INCDIR}/X11/XKBlib.h
+#}
diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..33e50df13a
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/meta/packages/xorg-lib/diet-x11_cvs.bb b/meta/packages/xorg-lib/diet-x11_cvs.bb
new file mode 100644
index 0000000000..968764b500
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_cvs.bb
@@ -0,0 +1,7 @@
+SECTION = "x11/base"
+require libx11_cvs.bb
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+        file://xim.patch;patch=1"
diff --git a/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
new file mode 100644
index 0000000000..f43d38065e
--- /dev/null
+++ b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
@@ -0,0 +1,22 @@
+--- X11/src/ErrDes.c.orig       2005-09-03 16:15:48 +0200
+++ X11/src/ErrDes.c    2005-09-03 16:16:03 +0200
+@@ -56,7 +56,7 @@
+ #include <stdio.h>
+ 
+ #ifndef ERRORDB
+-#define ERRORDB "/usr/lib/X11/XErrorDB"
+#define ERRORDB "/usr/share/X11/XErrorDB"
+ #endif
+ 
+ /*
+--- X11/src/StrKeysym.c.orig    2005-09-03 16:41:18 +0200
+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200
+@@ -36,7 +36,7 @@
+ #include "Key.h"
+ 
+ #ifndef KEYSYMDB
+-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
+#define KEYSYMDB "/usr/share/X11/XKeysymDB"
+ #endif
+ 
+ static Bool initialized;
diff --git a/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..dca88fba92
--- /dev/null
+++ b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
+++ libX11-6.2.1/include/X11/Xlib.h
+@@ -100,7 +100,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/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..28abffa735
--- /dev/null
+++ b/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxext xextproto applewmproto"
+XORG_PN = "libAppleWM"
diff --git a/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a612982a95
--- /dev/null
+++ b/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
diff --git a/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a612982a95
--- /dev/null
+++ b/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
diff --git a/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..cecd14f57f
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "zlib-native xproto-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2"
+S = "${WORKDIR}/libfontenc-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..0ccc8dd3d3
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X libfontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "zlib-native xproto-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2"
+S = "${WORKDIR}/libfontenc-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a4badc38ce
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS += " zlib xproto"
diff --git a/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a4badc38ce
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS += " zlib xproto"
diff --git a/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..5c07ce682c
--- /dev/null
+++ b/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = " "
+DEPENDS += " xproto fontsproto xtrans"
+XORG_PN = "libFS"
diff --git a/meta/packages/xorg-lib/libice/autofoo.patch b/meta/packages/xorg-lib/libice/autofoo.patch
new file mode 100644
index 0000000000..8ab0585fb8
--- /dev/null
+++ b/meta/packages/xorg-lib/libice/autofoo.patch
@@ -0,0 +1,21 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libICE-6.3.3/configure.ac~autofoo   2004-05-11 01:50:07.000000000 -0400
+++ libICE-6.3.3/configure.ac   2005-01-18 02:30:07.463895544 -0500
+@@ -8,12 +8,12 @@
+         libICE)
+ 
+ AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/libice_6.3.3.bb b/meta/packages/xorg-lib/libice_6.3.3.bb
new file mode 100644
index 0000000000..e771161e59
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_6.3.3.bb
@@ -0,0 +1,18 @@
+SECTION = "libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libx11"
+PROVIDES = "ice"
+DESCRIPTION = "X11 ICE library"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libICE-${PV}"
+inherit autotools pkgconfig 
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..da40983162
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 ICE library"
+PRIORITY = "optional"
+DEPENDS += " xproto xtrans"
+PROVIDES = "ice"
+XORG_PN = "libICE"
diff --git a/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..da40983162
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 ICE library"
+PRIORITY = "optional"
+DEPENDS += " xproto xtrans"
+PROVIDES = "ice"
+XORG_PN = "libICE"
diff --git a/meta/packages/xorg-lib/libice_cvs.bb b/meta/packages/xorg-lib/libice_cvs.bb
new file mode 100644
index 0000000000..1756a235d7
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_cvs.bb
@@ -0,0 +1,17 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11"
+PROVIDES = "ice"
+DESCRIPTION = "X11 ICE library"
+PR = "r1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE"
+S = "${WORKDIR}/ICE"
+inherit autotools pkgconfig 
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
new file mode 100644
index 0000000000..58463db46b
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
@@ -0,0 +1,51 @@
+--- liblbxutil-1.0.0/configure.ac.old   2006-03-31 02:38:44.000000000 -0500
+++ liblbxutil-1.0.0/configure.ac       2006-03-31 02:39:06.000000000 -0500
+@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
+ 
+ AC_OUTPUT([Makefile
+           src/Makefile
+          src/image/Makefile
+           lbxutil.pc])
+--- liblbxutil-1.0.0/src/Makefile.am.old        2006-03-31 02:38:51.000000000 -0500
+++ liblbxutil-1.0.0/src/Makefile.am    2006-03-31 02:39:49.000000000 -0500
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+ 
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES =                           \
+-       $(srcdir)/image/mkg3states.c
+SUBDIRS = image
+ 
+ liblbxutil_la_SOURCES =                                \
+        $(srcdir)/lbx_zlib/reqstats.h           \
+@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ 
+ 
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+ 
+-g3states.h: mkg3states
+-       -rm -f g3states.h
+-       ./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
+ 
+--- liblbxutil-1.0.0/src/image/Makefile.am.old  2006-03-31 02:41:19.000000000 -0500
+++ liblbxutil-1.0.0/src/image/Makefile.am      2006-03-31 02:40:40.000000000 -0500
+@@ -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/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..df8b267601
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+DESCRIPTION = "XFIXES Extension"
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"
diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..df8b267601
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+DESCRIPTION = "XFIXES Extension"
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"
diff --git a/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2a380a65f6
--- /dev/null
+++ b/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11"
+XORG_PN = "liboldX"
diff --git a/meta/packages/xorg-lib/libsm/autofoo.patch b/meta/packages/xorg-lib/libsm/autofoo.patch
new file mode 100644
index 0000000000..8cb204a66e
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm/autofoo.patch
@@ -0,0 +1,21 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libSM-6.0.3/configure.ac~autofoo    2004-05-11 01:51:21.000000000 -0400
+++ libSM-6.0.3/configure.ac    2005-01-18 12:15:50.405356376 -0500
+@@ -8,12 +8,12 @@
+         libSM)
+ 
+ AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/libsm_6.0.3.bb b/meta/packages/xorg-lib/libsm_6.0.3.bb
new file mode 100644
index 0000000000..cd374649bb
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_6.0.3.bb
@@ -0,0 +1,17 @@
+SECTION = "libs"
+LICENSE = "MIT-X"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libx11 libice"
+DESCRIPTION = "Session management library"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libSM-${PV}"
+inherit autotools pkgconfig 
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..383e29e743
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+DEPENDS += " libice xproto xtrans"
+XORG_PN = "libSM"
diff --git a/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..383e29e743
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+DEPENDS += " libice xproto xtrans"
+XORG_PN = "libSM"
diff --git a/meta/packages/xorg-lib/libsm_cvs.bb b/meta/packages/xorg-lib/libsm_cvs.bb
new file mode 100644
index 0000000000..45d6bfa236
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_cvs.bb
@@ -0,0 +1,18 @@
+PV = "6.0.3+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 libice"
+DESCRIPTION = "Session management library"
+PR = "r1"
+DEFAULT_PREFERENCE="-1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM"
+S = "${WORKDIR}/SM"
+inherit autotools pkgconfig 
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..90b8aeca49
--- /dev/null
+++ b/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxext xextproto windowswmproto"
+XORG_PN = "libWindowsWM"
diff --git a/meta/packages/xorg-lib/libx11-native_6.2.1.bb b/meta/packages/xorg-lib/libx11-native_6.2.1.bb
new file mode 100644
index 0000000000..54bb4486e7
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_6.2.1.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+require libx11_${PV}.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2023b5741d
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+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 = "x11-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+inherit native autotools pkgconfig
+EXTRA_OECONF="--enable-malloc0returnsnull"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+        )
+        rm -f ${STAGING_INCDIR}/X11/Xlib.h
+        oe_runmake
+}
diff --git a/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..2b84b2c53c
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+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 = "x11-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+inherit native autotools pkgconfig
+EXTRA_OECONF="--enable-malloc0returnsnull"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+        )
+        rm -f ${STAGING_INCDIR}/X11/Xlib.h
+        oe_runmake
+}
diff --git a/meta/packages/xorg-lib/libx11-native_cvs.bb b/meta/packages/xorg-lib/libx11-native_cvs.bb
new file mode 100644
index 0000000000..c76d4dce8b
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_cvs.bb
@@ -0,0 +1,5 @@
+SECTION = "x11/base"
+require libx11_cvs.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libx11/autofoo.patch b/meta/packages/xorg-lib/libx11/autofoo.patch
new file mode 100644
index 0000000000..8bdba09768
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11/autofoo.patch
@@ -0,0 +1,22 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libX11-6.2.1/configure.ac~autofoo
+++ libX11-6.2.1/configure.ac
+@@ -7,12 +7,12 @@
+         [jg@freedesktop.org],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_CONFIG_AUX_DIR(.)
+ 
+AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([src/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/libx11_20050226.bb b/meta/packages/xorg-lib/libx11_20050226.bb
new file mode 100644
index 0000000000..2fa9e995b8
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_20050226.bb
@@ -0,0 +1,6 @@
+SRCDATE = "20050226"
+require libx11_cvs.bb
+DEFAULT_PREFERENCE = "0"
diff --git a/meta/packages/xorg-lib/libx11_6.2.1.bb b/meta/packages/xorg-lib/libx11_6.2.1.bb
new file mode 100644
index 0000000000..ce57c42f7f
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_6.2.1.bb
@@ -0,0 +1,41 @@
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+PR = "r4"
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
+           file://errordb-keysymdb-path-fix.patch;patch=1 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libX11-${PV}"
+inherit autotools pkgconfig 
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+#               unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+                oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+        )
+        oe_runmake
+}
+do_stage() {
+        install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+        install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+        install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+        install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+        install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+        install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+        install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+        install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+        install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+        oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b31ed72998
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Base X libs."
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+        libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+XORG_PN = "libX11"
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+        )
+        rm -f ${STAGING_INCDIR}/X11/Xlib.h
+        oe_runmake
+}
diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..b31ed72998
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Base X libs."
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+        libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+XORG_PN = "libX11"
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+        )
+        rm -f ${STAGING_INCDIR}/X11/Xlib.h
+        oe_runmake
+}
diff --git a/meta/packages/xorg-lib/libx11_cvs.bb b/meta/packages/xorg-lib/libx11_cvs.bb
new file mode 100644
index 0000000000..aaa052eba3
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_cvs.bb
@@ -0,0 +1,42 @@
+PV = "6.2.1+cvs${SRCDATE}"
+LICENSE = "XFree86"
+PR = "r6"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
+           file://errordb-keysymdb-path-fix.patch;patch=1"
+S = "${WORKDIR}/X11"
+inherit autotools pkgconfig 
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+#               unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+                oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+        )
+        rm -f ${STAGING_INCDIR}/X11/Xlib.h
+        oe_runmake
+}
+do_stage() {
+        install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+        install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+        install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+        install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+        install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+        install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+        install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+        install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+        install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+        oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
new file mode 100644
index 0000000000..3f7fd5853e
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -0,0 +1,33 @@
+DEFAULT_PREFERENCE = "-1"
+DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+S = "${WORKDIR}/git"
+inherit autotools pkgconfig
+EXTRA_OECONF="--enable-malloc0returnsnull"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+        )
+        rm -f ${STAGING_INCDIR}/X11/Xlib.h
+        oe_runmake
+}
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxau-native_0.1.1.bb b/meta/packages/xorg-lib/libxau-native_0.1.1.bb
new file mode 100644
index 0000000000..f5acbee736
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-native_0.1.1.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
+require libxau_${PV}.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..553c3aeacf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "xproto-native util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..c0a3ea802f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "xproto-native util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxau-native_cvs.bb b/meta/packages/xorg-lib/libxau-native_cvs.bb
new file mode 100644
index 0000000000..685f849bd5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-native_cvs.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
+require libxau_cvs.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxau/autofoo.patch b/meta/packages/xorg-lib/libxau/autofoo.patch
new file mode 100644
index 0000000000..1e42eb974d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau/autofoo.patch
@@ -0,0 +1,21 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libXau-0.1.1/configure.ac~autofoo
+++ libXau-0.1.1/configure.ac
+@@ -25,11 +25,10 @@
+ 
+ AC_PREREQ([2.57])
+ AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau)
+-AM_INIT_AUTOMAKE([dist-bzip2])
+-AM_MAINTAINER_MODE
+-
+ AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+ 
+ AC_PROG_CC
+ AC_PROG_INSTALL
diff --git a/meta/packages/xorg-lib/libxau_0.1.1.bb b/meta/packages/xorg-lib/libxau_0.1.1.bb
new file mode 100644
index 0000000000..dc1a28171b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_0.1.1.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xau"
+DESCRIPTION = "Authorization Protocol for X."
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXau-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..5ad793c9b8
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+DEPENDS += " xproto"
+PROVIDES = "xau"
+XORG_PN = "libXau"
diff --git a/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..5ad793c9b8
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+DEPENDS += " xproto"
+PROVIDES = "xau"
+XORG_PN = "libXau"
diff --git a/meta/packages/xorg-lib/libxau_cvs.bb b/meta/packages/xorg-lib/libxau_cvs.bb
new file mode 100644
index 0000000000..518744816d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_cvs.bb
@@ -0,0 +1,18 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+PR = "r1"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xau"
+DESCRIPTION = "Authorization Protocol for X."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
+S = "${WORKDIR}/Xau"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxaw/auxdir.patch b/meta/packages/xorg-lib/libxaw/auxdir.patch
new file mode 100644
index 0000000000..4226ab6a4d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw/auxdir.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.ac   2005-06-17 21:26:17.519157272 +0200
+++ libXaw-7.0.2/configure.ac   2005-06-17 21:26:34.832525240 +0200
+@@ -10,7 +10,6 @@
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxaw_7.0.2.bb b/meta/packages/xorg-lib/libxaw_7.0.2.bb
new file mode 100644
index 0000000000..04f2855101
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_7.0.2.bb
@@ -0,0 +1,21 @@
+SECTION = "x11/libs"
+LICENSE = "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+DESCRIPTION = "X Athena Widgets library"
+SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \
+           file://auxdir.patch;patch=1"
+S = "${WORKDIR}/libXaw-${PV}"
+inherit autotools pkgconfig 
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3961042a2d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xaw is the X Athena Widget Set."
+DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+XORG_PN = "libXaw"
+do_stage () {
+        autotools_stage_all
+        ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+        ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+        ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}
diff --git a/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..3961042a2d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xaw is the X Athena Widget Set."
+DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+XORG_PN = "libXaw"
+do_stage () {
+        autotools_stage_all
+        ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+        ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+        ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}
diff --git a/meta/packages/xorg-lib/libxaw_cvs.bb b/meta/packages/xorg-lib/libxaw_cvs.bb
new file mode 100644
index 0000000000..2c696ceba2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_cvs.bb
@@ -0,0 +1,19 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+DESCRIPTION = "X Athena Widgets library"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
+S = "${WORKDIR}/Xaw"
+inherit autotools pkgconfig 
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
+do_stage () {
+        oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
new file mode 100644
index 0000000000..072cf25214
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
@@ -0,0 +1,17 @@
+Index: libXcomposite-1.0.1/configure.ac
+===================================================================
+--- libXcomposite-1.0.1.orig/configure.ac       2004-01-15 03:59:12.000000000 -0500
+++ libXcomposite-1.0.1/configure.ac    2005-01-18 17:05:25.573929256 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
new file mode 100644
index 0000000000..630b8818fc
--- /dev/null
+++ b/meta/packages/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-X11R7.0-0.2.2.2/src/Makefile.am.orig  2006-03-12 20:10:17.000000000 +0100
+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am       2006-03-12 20:10:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ #  PERFORMANCE OF THIS SOFTWARE.
+ 
+-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+ 
+ lib_LTLIBRARIES = libXcomposite.la
+ 
diff --git a/meta/packages/xorg-lib/libxcomposite_1.0.1.bb b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb
new file mode 100644
index 0000000000..a60f8d5179
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb
@@ -0,0 +1,16 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "virtual/libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
+DESCRIPTION = "X Composite extension library."
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcomposite-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
new file mode 100644
index 0000000000..4cab60a531
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PROVIDES = "xcomposite"
+XORG_PN = "libXcomposite"
+SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
new file mode 100644
index 0000000000..4cab60a531
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PROVIDES = "xcomposite"
+XORG_PN = "libXcomposite"
+SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/meta/packages/xorg-lib/libxcomposite_cvs.bb b/meta/packages/xorg-lib/libxcomposite_cvs.bb
new file mode 100644
index 0000000000..fd31b5dbff
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
+DESCRIPTION = "X Composite extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
+S = "${WORKDIR}/Xcomposite"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch b/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
new file mode 100644
index 0000000000..99cd45a7ea
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
@@ -0,0 +1,20 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libXcursor-1.1.2/configure.ac~autofoo       2004-01-16 23:38:26.000000000 -0500
+++ libXcursor-1.1.2/configure.ac       2005-01-18 13:40:06.539707120 -0500
+@@ -31,11 +31,11 @@
+ dnl not possible to extract the version number here from Xcursor.h
+ dnl
+ AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor])
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ dnl libtool versioning
+ 
diff --git a/meta/packages/xorg-lib/libxcursor/autofoo.patch b/meta/packages/xorg-lib/libxcursor/autofoo.patch
new file mode 100644
index 0000000000..7aa573ce13
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor/autofoo.patch
@@ -0,0 +1,22 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+Index: Xcursor/configure.ac
+===================================================================
+--- Xcursor.orig/configure.ac   2004-04-12 10:11:12.000000000 -0400
+++ Xcursor/configure.ac        2005-01-18 16:04:36.860617992 -0500
+@@ -31,11 +31,11 @@
+ dnl not possible to extract the version number here from Xcursor.h
+ dnl
+ AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor])
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ dnl libtool versioning
+ 
diff --git a/meta/packages/xorg-lib/libxcursor_1.1.2.bb b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
new file mode 100644
index 0000000000..25744c7dca
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r2"
+SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcursor-${PV}"
+FILES_${PN} += "${libdir}/libXcursor.so"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
new file mode 100644
index 0000000000..2b13c4213c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Cursor library"
+LICENSE= "BSD-X"
+DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
+XORG_PN = "libXcursor"
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
new file mode 100644
index 0000000000..2b13c4213c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Cursor library"
+LICENSE= "BSD-X"
+DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
+XORG_PN = "libXcursor"
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/meta/packages/xorg-lib/libxcursor_cvs.bb b/meta/packages/xorg-lib/libxcursor_cvs.bb
new file mode 100644
index 0000000000..5fe2334b85
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_cvs.bb
@@ -0,0 +1,17 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r2"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
+S = "${WORKDIR}/Xcursor"
+FILES_${PN} += "${libdir}/libXcursor.so"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
new file mode 100644
index 0000000000..1e3ec45d4a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
@@ -0,0 +1,17 @@
+Index: libXdamage-1.0.1/configure.ac
+===================================================================
+--- libXdamage-1.0.1.orig/configure.ac  2004-01-15 03:54:55.000000000 -0500
+++ libXdamage-1.0.1/configure.ac       2005-01-18 19:07:16.951430928 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxdamage/m4.patch b/meta/packages/xorg-lib/libxdamage/m4.patch
new file mode 100644
index 0000000000..393f3d13d2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage/m4.patch
@@ -0,0 +1,65 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- /dev/null
+++ Xdamage/m4/pkg.m4
+@@ -0,0 +1,57 @@
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+
diff --git a/meta/packages/xorg-lib/libxdamage_1.0.1.bb b/meta/packages/xorg-lib/libxdamage_1.0.1.bb
new file mode 100644
index 0000000000..a132b751c0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_1.0.1.bb
@@ -0,0 +1,17 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "virtual/libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
+DESCRIPTION = "X Damage extension library."
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \
+           file://m4.patch;patch=1 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXdamage-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
new file mode 100644
index 0000000000..6bb9c39f60
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Damage extension library."
+LICENSE= "BSD-X"
+DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
+PROVIDES = "xdamage"
+XORG_PN = "libXdamage"
diff --git a/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..6bb9c39f60
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Damage extension library."
+LICENSE= "BSD-X"
+DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
+PROVIDES = "xdamage"
+XORG_PN = "libXdamage"
diff --git a/meta/packages/xorg-lib/libxdamage_cvs.bb b/meta/packages/xorg-lib/libxdamage_cvs.bb
new file mode 100644
index 0000000000..a613d0e673
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_cvs.bb
@@ -0,0 +1,16 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
+DESCRIPTION = "X Damage extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
+           file://m4.patch;patch=1"
+S = "${WORKDIR}/Xdamage"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb
new file mode 100644
index 0000000000..41b772376e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb
@@ -0,0 +1,5 @@
+SECTION = "x11/libs"
+require libxdmcp_${PV}.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb
new file mode 100644
index 0000000000..87db29c799
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/libs"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp"
+require libxdmcp_${PV}.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fbbf8e9117
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "xproto-native util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..8ab69a1d41
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "xproto-native util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxdmcp/autofoo.patch b/meta/packages/xorg-lib/libxdmcp/autofoo.patch
new file mode 100644
index 0000000000..ff1a76ad04
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp/autofoo.patch
@@ -0,0 +1,22 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libXdmcp-0.1.3/configure.ac~autofoo
+++ libXdmcp-0.1.3/configure.ac
+@@ -25,12 +25,11 @@
+ 
+ AC_PREREQ([2.57])
+ AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp)
+AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+-
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+-AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
+ 
+ AC_PROG_CC
+ AC_PROG_INSTALL
diff --git a/meta/packages/xorg-lib/libxdmcp_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
new file mode 100644
index 0000000000..19fba1529e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+PR = "r1"
+S = "${WORKDIR}/libXdmcp-${PV}"
+SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxdmcp_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
new file mode 100644
index 0000000000..aa2736cdb2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE= "MIT"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+PR = "r1"
+S = "${WORKDIR}/libXdmcp-${PV}"
+SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..c0139498c5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Display Manager Control Protocol library."
+PRIORITY = "optional"
+DEPENDS += " xproto"
+PROVIDES = "xdmcp"
+XORG_PN = "libXdmcp"
diff --git a/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..c0139498c5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Display Manager Control Protocol library."
+PRIORITY = "optional"
+DEPENDS += " xproto"
+PROVIDES = "xdmcp"
+XORG_PN = "libXdmcp"
diff --git a/meta/packages/xorg-lib/libxdmcp_cvs.bb b/meta/packages/xorg-lib/libxdmcp_cvs.bb
new file mode 100644
index 0000000000..20b957b522
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_cvs.bb
@@ -0,0 +1,18 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+PR = "r1"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
+S = "${WORKDIR}/Xdmcp"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..4c3a134633
--- /dev/null
+++ b/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
+XORG_PN = "libXevie"
diff --git a/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..4c3a134633
--- /dev/null
+++ b/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
+XORG_PN = "libXevie"
diff --git a/meta/packages/xorg-lib/libxext-native_cvs.bb b/meta/packages/xorg-lib/libxext-native_cvs.bb
new file mode 100644
index 0000000000..82360db00d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext-native_cvs.bb
@@ -0,0 +1,6 @@
+SECTION = "unknown"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
+require libxext_${PV}.bb
+inherit native
+DEPENDS = "virtual/libx11-native xextensions-native"
+PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxext/autofoo.patch b/meta/packages/xorg-lib/libxext/autofoo.patch
new file mode 100644
index 0000000000..c006884526
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext/autofoo.patch
@@ -0,0 +1,18 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- Xext/configure.ac~autofoo
+++ Xext/configure.ac
+@@ -8,9 +8,8 @@
+         libXext)
+ 
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
+-
+ AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
diff --git a/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fc2061514a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+DEPENDS += " xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+XORG_PN = "libXext"
diff --git a/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..fc2061514a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+DEPENDS += " xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+XORG_PN = "libXext"
diff --git a/meta/packages/xorg-lib/libxext_cvs.bb b/meta/packages/xorg-lib/libxext_cvs.bb
new file mode 100644
index 0000000000..101c240c5e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext_cvs.bb
@@ -0,0 +1,16 @@
+PV = "0.0+cvs${SRCDATE}"
+PR = "r1"
+LICENSE= "MIT"
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "xproto virtual/libx11 xextensions"
+PROVIDES = "xext"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
+S = "${WORKDIR}/Xext"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxfixes/autofoo.patch b/meta/packages/xorg-lib/libxfixes/autofoo.patch
new file mode 100644
index 0000000000..26803cf7f3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes/autofoo.patch
@@ -0,0 +1,20 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libXfixes-2.0.1/configure.ac~autofoo        2004-01-15 03:40:23.000000000 -0500
+++ libXfixes-2.0.1/configure.ac        2005-01-18 13:35:33.461221360 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxfixes_2.0.1.bb b/meta/packages/xorg-lib/libxfixes_2.0.1.bb
new file mode 100644
index 0000000000..ceebdfaa11
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes_2.0.1.bb
@@ -0,0 +1,15 @@
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "virtual/libx11 fixesext"
+DESCRIPTION = "X Fixes extension library."
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXfixes-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
new file mode 100644
index 0000000000..b63633dea2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
+XORG_PN = "libXfixes"
diff --git a/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
new file mode 100644
index 0000000000..b63633dea2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
+XORG_PN = "libXfixes"
diff --git a/meta/packages/xorg-lib/libxfixes_cvs.bb b/meta/packages/xorg-lib/libxfixes_cvs.bb
new file mode 100644
index 0000000000..92bad48eeb
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes_cvs.bb
@@ -0,0 +1,14 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 fixesext"
+DESCRIPTION = "X Fixes extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
+S = "${WORKDIR}/Xfixes"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..93aac77f7b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfont-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..664f9440a4
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXfont-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfont-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxfont/autofoo.patch b/meta/packages/xorg-lib/libxfont/autofoo.patch
new file mode 100644
index 0000000000..4998625c24
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont/autofoo.patch
@@ -0,0 +1,18 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400
+++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500
+@@ -35,9 +35,9 @@
+ dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
+ dnl not possible to extract the version number here from Xfont.h
+ dnl
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
+ 
+ # Check for progs
diff --git a/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000000..90bded6fba
--- /dev/null
+++ b/meta/packages/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/packages/xorg-lib/libxfont/scalable.patch b/meta/packages/xorg-lib/libxfont/scalable.patch
new file mode 100644
index 0000000000..7f97b9a8f6
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont/scalable.patch
@@ -0,0 +1,27 @@
+Index: fontfile/fontdir.c
+===================================================================
+RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v
+retrieving revision 3.22
+diff -u -r3.22 fontdir.c
+--- xfont/fontfile/fontdir.c    7 Jul 2003 16:40:11 -0000       3.22
+++ xfont/fontfile/fontdir.c    30 Dec 2004 20:37:12 -0000
+@@ -699,6 +699,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));
+@@ -798,6 +803,7 @@
+                                            bitmap->name.name);
+             }
+        }
+      }
+     }
+     return TRUE;
+ }
diff --git a/meta/packages/xorg-lib/libxfont_1.4.2.bb b/meta/packages/xorg-lib/libxfont_1.4.2.bb
new file mode 100644
index 0000000000..0cc45397fe
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_1.4.2.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/libs"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xtrans zlib"
+PROVIDES = "xfont"
+DESCRIPTION = "X font library (used by the X server)."
+PR = "r2"
+SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \
+        file://scalable.patch;patch=1 \
+        file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXfont-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..a3a28d6578
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+PR = "r1"
+SRC_URI += "file://no-scalable-crash.patch;patch=1"
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+XORG_PN = "libXfont"
diff --git a/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..748a71f1ae
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+XORG_PN = "libXfont"
diff --git a/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
new file mode 100644
index 0000000000..8739822a07
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
@@ -0,0 +1,17 @@
+require xorg-lib-common.inc
+PR = "r1"
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
+SRC_URI += "file://no-scalable-crash.patch;patch=1"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+XORG_PN = "libXfont"
+S = "${WORKDIR}/libXfont-1.2.0"
diff --git a/meta/packages/xorg-lib/libxfont_cvs.bb b/meta/packages/xorg-lib/libxfont_cvs.bb
new file mode 100644
index 0000000000..bd21e0fd12
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_cvs.bb
@@ -0,0 +1,18 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "BSD-X"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xtrans zlib"
+PROVIDES = "xfont"
+DESCRIPTION = "X font library (used by the X server)."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
+        file://scalable.patch;patch=1"
+S = "${WORKDIR}/Xfont"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..c75278ecb0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
+XORG_PN = "libXfontcache"
diff --git a/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..c75278ecb0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
+XORG_PN = "libXfontcache"
diff --git a/meta/packages/xorg-lib/libxft/autofoo.patch b/meta/packages/xorg-lib/libxft/autofoo.patch
new file mode 100644
index 0000000000..54120aa612
--- /dev/null
+++ b/meta/packages/xorg-lib/libxft/autofoo.patch
@@ -0,0 +1,21 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libXft-2.1.6/configure.ac~autofoo   2004-03-22 10:02:59.000000000 -0500
+++ libXft-2.1.6/configure.ac   2005-01-17 02:08:10.165951760 -0500
+@@ -33,12 +33,12 @@
+ dnl Please bump the minor library number at each release as well.
+ dnl
+ AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft)
+AC_CONFIG_AUX_DIR(.)
+ 
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # checks for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxft_2.1.6.bb b/meta/packages/xorg-lib/libxft_2.1.6.bb
new file mode 100644
index 0000000000..a793925596
--- /dev/null
+++ b/meta/packages/xorg-lib/libxft_2.1.6.bb
@@ -0,0 +1,27 @@
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXft-${PV}"
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+                ${libdir}/*.a ${libdir}/pkgconfig \
+                ${datadir}/aclocal ${bindir} ${sbindir}
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
+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)
+}
diff --git a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
new file mode 100644
index 0000000000..2c46849fd2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
@@ -0,0 +1,19 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+DEPENDS += " libxrender freetype fontconfig"
+PROVIDES = "xft"
+XORG_PN = "libXft"
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+                ${libdir}/*.a ${libdir}/pkgconfig \
+                ${datadir}/aclocal ${bindir} ${sbindir}
+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)
+}
diff --git a/meta/packages/xorg-lib/libxft_cvs.bb b/meta/packages/xorg-lib/libxft_cvs.bb
new file mode 100644
index 0000000000..38ba5a6d5c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxft_cvs.bb
@@ -0,0 +1,26 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft"
+S = "${WORKDIR}/Xft"
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+                ${libdir}/*.a ${libdir}/pkgconfig \
+                ${datadir}/aclocal ${bindir} ${sbindir}
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
+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)
+}
diff --git a/meta/packages/xorg-lib/libxi/autofoo.patch b/meta/packages/xorg-lib/libxi/autofoo.patch
new file mode 100644
index 0000000000..f1bce9ed7a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi/autofoo.patch
@@ -0,0 +1,12 @@
+Index: libXi-6.0.1/configure.ac
+===================================================================
+--- libXi-6.0.1.orig/configure.ac       2003-11-01 04:11:49.000000000 -0500
+++ libXi-6.0.1/configure.ac    2005-01-20 11:34:06.878357352 -0500
+@@ -8,7 +8,6 @@
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/libxi_6.0.1.bb b/meta/packages/xorg-lib/libxi_6.0.1.bb
new file mode 100644
index 0000000000..b9958ea6ac
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_6.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Input Extension library"
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+DEPENDS = "xproto virtual/libx11 xextensions"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXi-${PV}"
+inherit autotools pkgconfig
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..af5e4008eb
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Input extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+XORG_PN = "libXi"
diff --git a/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..af5e4008eb
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Input extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+XORG_PN = "libXi"
diff --git a/meta/packages/xorg-lib/libxi_cvs.bb b/meta/packages/xorg-lib/libxi_cvs.bb
new file mode 100644
index 0000000000..f37c78e819
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_cvs.bb
@@ -0,0 +1,16 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+DEPENDS = "xproto virtual/libx11 xextensions"
+DESCRIPTION = "X Input extension library."
+PR = "r1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/Xi"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
new file mode 100644
index 0000000000..eb4a6d54cf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xinerama library"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "panoramixext xproto virtual/libx11 libxext"
+PROVIDES = "xinerama"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
+S = "${WORKDIR}/Xinerama"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
new file mode 100644
index 0000000000..429c2fc4d0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
@@ -0,0 +1,17 @@
+LICENSE = "MIT"
+DESCRIPTION = "Xinerama library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "panoramixext xproto virtual/libx11 libxext"
+PROVIDES = "xinerama"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
+S = "${WORKDIR}/libXinerama-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8f72c20898
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xinerama library"
+PRIORITY = "optional"
+DEPENDS += " virtual/libx11 libxext xextproto xineramaproto"
+PROVIDES = "xinerama"
+XORG_PN = "libXinerama"
diff --git a/meta/packages/xorg-lib/libxinerama_cvs.bb b/meta/packages/xorg-lib/libxinerama_cvs.bb
new file mode 100644
index 0000000000..5138367bbf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_cvs.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xinerama library"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "panoramixext xproto virtual/libx11 libxext"
+PROVIDES = "xinerama"
+PV = "0.0+cvs${SRCDATE}"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
+S = "${WORKDIR}/Xinerama"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..715dcd0554
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+DEPENDS += " virtual/libx11 kbproto"
diff --git a/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..715dcd0554
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+DEPENDS += " virtual/libx11 kbproto"
diff --git a/meta/packages/xorg-lib/libxkbfile_cvs.bb b/meta/packages/xorg-lib/libxkbfile_cvs.bb
new file mode 100644
index 0000000000..336caf139a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbfile_cvs.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11"
+DESCRIPTION = "X11 keyboard library"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
+S = "${WORKDIR}/xkbfile"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..e094728c2f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 lbxkbui library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+DEPENDS += " virtual/libx11 libxt libxkbfile"
+PROVIDES = "xkbui"
diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..e094728c2f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 lbxkbui library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+DEPENDS += " virtual/libx11 libxt libxkbfile"
+PROVIDES = "xkbui"
diff --git a/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..02df24cd9f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
@@ -0,0 +1,16 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Window System miscellaneous utility library"
+PRIORITY = "optional"
+DEPENDS += " libxt libxext xextproto virtual/libx11"
+PROVIDES = "xmu"
+XORG_PN = "libXmu"
+PACKAGES =+ "libxmuu libxmuu-dev"
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+LEAD_SONAME = "libXmu"
diff --git a/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..02df24cd9f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
@@ -0,0 +1,16 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Window System miscellaneous utility library"
+PRIORITY = "optional"
+DEPENDS += " libxt libxext xextproto virtual/libx11"
+PROVIDES = "xmu"
+XORG_PN = "libXmu"
+PACKAGES =+ "libxmuu libxmuu-dev"
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+LEAD_SONAME = "libXmu"
diff --git a/meta/packages/xorg-lib/libxmu_cvs.bb b/meta/packages/xorg-lib/libxmu_cvs.bb
new file mode 100644
index 0000000000..500b373c32
--- /dev/null
+++ b/meta/packages/xorg-lib/libxmu_cvs.bb
@@ -0,0 +1,21 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "libxt libxext"
+PROVIDES = "xmu"
+PR = "r2"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
+S = "${WORKDIR}/Xmu"
+PACKAGES =+ "xmuu xmuu-dev"
+FILES_xmuu = "${libdir}/libXmuu.so.*"
+FILES_xmuu-dev = "${libdir}/libXmuu.so"
+inherit autotools pkgconfig 
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fc7ecb5778
--- /dev/null
+++ b/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X print extension library."
+DEPENDS += " virtual/libx11 libxext xextproto libxau printproto"
+XORG_PN = "libXp"
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/meta/packages/xorg-lib/libxp_cvs.bb b/meta/packages/xorg-lib/libxp_cvs.bb
new file mode 100644
index 0000000000..e434e089cf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxp_cvs.bb
@@ -0,0 +1,18 @@
+LICENSE = "MIT"
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "libs"
+DEPENDS = "virtual/libx11 libxext"
+DESCRIPTION = "X print extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
+S = "${WORKDIR}/Xp"
+inherit autotools pkgconfig 
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxpm/autofoo.patch b/meta/packages/xorg-lib/libxpm/autofoo.patch
new file mode 100644
index 0000000000..6b2174bf02
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm/autofoo.patch
@@ -0,0 +1,18 @@
+Index: libXpm-3.5.1/configure.ac
+===================================================================
+--- libXpm-3.5.1.orig/configure.ac      2004-05-11 02:00:35.000000000 -0400
+++ libXpm-3.5.1/configure.ac   2005-01-19 18:35:57.187402008 -0500
+@@ -1,12 +1,12 @@
+ AC_PREREQ(2.57)
+ AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm)
+ AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([lib/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/libxpm_3.5.1.bb b/meta/packages/xorg-lib/libxpm_3.5.1.bb
new file mode 100644
index 0000000000..8447cd3630
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm_3.5.1.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/libs"
+LICENSE = "X-BSD"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto virtual/libx11"
+PROVIDES = "xpm"
+DESCRIPTION = "X Pixmap library."
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXpm-${PV}"
+inherit autotools pkgconfig 
+do_stage () {
+        install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+        oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
new file mode 100644
index 0000000000..3ff582a8e3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Pixmap library."
+PRIORITY = "optional"
+LICENSE = "X-BSD"
+DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
+XORG_PN = "libXpm"
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
new file mode 100644
index 0000000000..3ff582a8e3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Pixmap library."
+PRIORITY = "optional"
+LICENSE = "X-BSD"
+DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
+XORG_PN = "libXpm"
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/meta/packages/xorg-lib/libxpm_cvs.bb b/meta/packages/xorg-lib/libxpm_cvs.bb
new file mode 100644
index 0000000000..4d4d534e9a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm_cvs.bb
@@ -0,0 +1,19 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "X-BSD"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto virtual/libx11"
+PROVIDES = "xpm"
+DESCRIPTION = "X Pixmap library."
+PR = "r1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm"
+S = "${WORKDIR}/Xpm"
+inherit autotools pkgconfig 
+do_stage () {
+        install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+        oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..077ac40a0a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau"
+XORG_PN = "libXprintAppUtil"
diff --git a/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..f965b9a2bc
--- /dev/null
+++ b/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxp libxt printproto libxau"
+XORG_PN = "libXprintUtil"
diff --git a/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch b/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
new file mode 100644
index 0000000000..21f6e7fd78
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
@@ -0,0 +1,20 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libXrandr-1.0.2/configure.ac~autofoo        2004-01-15 03:23:00.000000000 -0500
+++ libXrandr-1.0.2/configure.ac        2005-01-16 11:18:35.924069872 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxrandr/autofoo.patch b/meta/packages/xorg-lib/libxrandr/autofoo.patch
new file mode 100644
index 0000000000..7b1db760f2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr/autofoo.patch
@@ -0,0 +1,30 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- Xrandr/configure.ac~autofoo.patch   2004-07-01 15:01:55.000000000 -0400
+++ Xrandr/configure.ac 2005-01-16 11:22:09.169651616 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
+--- Xrandr/ChangeLog~autofoo.patch      2004-09-19 04:53:38.000000000 -0400
+++ Xrandr/ChangeLog    2005-01-16 11:52:29.694889712 -0500
+@@ -1,3 +1,7 @@
+2005-01-16  Chris Larson <kergoth@handhelds.org>
+
+       * configure.ac: Fix to work with automake 1.9.x.
+
+ 2004-09-19  Carlos Romero  <kidcrash@freedesktop.org>
+ 
+        * Makefile.am:
diff --git a/meta/packages/xorg-lib/libxrandr_1.0.2.bb b/meta/packages/xorg-lib/libxrandr_1.0.2.bb
new file mode 100644
index 0000000000..d87471af05
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_1.0.2.bb
@@ -0,0 +1,15 @@
+SECTION = "x11/libs"
+LICENSE = "BSD-X"
+DEPENDS = "randrext virtual/libx11 libxrender libxext"
+DESCRIPTION = "X Resize and Rotate extension library."
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXrandr-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
new file mode 100644
index 0000000000..363550fade
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
+XORG_PN = "libXrandr"
diff --git a/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..363550fade
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
+XORG_PN = "libXrandr"
diff --git a/meta/packages/xorg-lib/libxrandr_cvs.bb b/meta/packages/xorg-lib/libxrandr_cvs.bb
new file mode 100644
index 0000000000..12f3b4ef38
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "randrext virtual/libx11 libxrender libxext"
+DESCRIPTION = "X Resize and Rotate extension library."
+PR = "r1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
+S = "${WORKDIR}/Xrandr"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxrender/autofoo.patch b/meta/packages/xorg-lib/libxrender/autofoo.patch
new file mode 100644
index 0000000000..eb21c766f8
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender/autofoo.patch
@@ -0,0 +1,20 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- libXrender-0.8.4/configure.ac~autofoo
+++ libXrender-0.8.4/configure.ac
+@@ -33,11 +33,10 @@
+ dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+-
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxrender_0.8.4.bb b/meta/packages/xorg-lib/libxrender_0.8.4.bb
new file mode 100644
index 0000000000..32e1962f26
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_0.8.4.bb
@@ -0,0 +1,15 @@
+SECTION = "libs"
+DEPENDS = "renderext virtual/libx11"
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXrender-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
new file mode 100644
index 0000000000..32ba95721d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 renderproto"
+XORG_PN = "libXrender"
diff --git a/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
new file mode 100644
index 0000000000..32ba95721d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 renderproto"
+XORG_PN = "libXrender"
diff --git a/meta/packages/xorg-lib/libxrender_cvs.bb b/meta/packages/xorg-lib/libxrender_cvs.bb
new file mode 100644
index 0000000000..31a710643c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+PR = "r1"
+SECTION = "libs"
+DEPENDS = "renderext virtual/libx11"
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender"
+S = "${WORKDIR}/Xrender"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxres_1.0.1.bb b/meta/packages/xorg-lib/libxres_1.0.1.bb
new file mode 100644
index 0000000000..3f0d32bfe4
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_1.0.1.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "virtual/libx11 xextensions libxext resourceext"
+PROVIDES = "xres"
+DESCRIPTION = "X Resource usage library."
+LICENSE = "X-MIT"
+SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2"
+S = "${WORKDIR}/libXres-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..282947e7fe
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Resource usage library."
+DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
+XORG_PN = "libXres"
diff --git a/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..282947e7fe
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Resource usage library."
+DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
+XORG_PN = "libXres"
diff --git a/meta/packages/xorg-lib/libxres_cvs.bb b/meta/packages/xorg-lib/libxres_cvs.bb
new file mode 100644
index 0000000000..a457d6c14f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "virtual/libx11 xextensions libxext resourceext"
+PROVIDES = "xres"
+DESCRIPTION = "X Resource usage library."
+LICENSE = "X-MIT"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
+S = "${WORKDIR}/XRes"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2f0168e2b5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X screen saver extension library."
+LICENSE = "GPL"
+DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
+XORG_PN = "libXScrnSaver"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..2f0168e2b5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X screen saver extension library."
+LICENSE = "GPL"
+DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
+XORG_PN = "libXScrnSaver"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/meta/packages/xorg-lib/libxss_cvs.bb b/meta/packages/xorg-lib/libxss_cvs.bb
new file mode 100644
index 0000000000..614133fce7
--- /dev/null
+++ b/meta/packages/xorg-lib/libxss_cvs.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+PV = "0.0+cvs${SRCDATE}"
+PR = "r2"
+SECTION = "libs"
+DEPENDS = "virtual/libx11 libxext"
+DESCRIPTION = "X screen saver extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
+S = "${WORKDIR}/Xss"
+inherit autotools pkgconfig 
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxt/autofoo.patch b/meta/packages/xorg-lib/libxt/autofoo.patch
new file mode 100644
index 0000000000..ff6dfdbbcc
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt/autofoo.patch
@@ -0,0 +1,20 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- libXt-0.1.5/configure.ac~autofoo    2004-05-06 20:19:04.000000000 -0400
+++ libXt-0.1.5/configure.ac    2005-01-18 13:10:13.683262728 -0500
+@@ -28,11 +28,11 @@
+ dnl
+ dnl
+ AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt)
+AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxt_0.1.5.bb b/meta/packages/xorg-lib/libxt_0.1.5.bb
new file mode 100644
index 0000000000..9c31075285
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_0.1.5.bb
@@ -0,0 +1,29 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libx11 libsm"
+PROVIDES = "xt"
+DESCRIPTION = "X Toolkit Intrinsics"
+LICENSE = "X-MIT"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \
+           file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXt-${PV}"
+PARALLEL_MAKE = ""
+inherit autotools pkgconfig 
+#nasty hack as utils need to be native
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+#               unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+                oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
+        )
+        oe_runmake
+}
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b8bbe4dea3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
@@ -0,0 +1,19 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+DEPENDS += " libsm virtual/libx11 xproto kbproto"
+PROVIDES = "xt"
+XORG_PN = "libXt"
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+        )
+        oe_runmake
+}
diff --git a/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..b8bbe4dea3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
@@ -0,0 +1,19 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+DEPENDS += " libsm virtual/libx11 xproto kbproto"
+PROVIDES = "xt"
+XORG_PN = "libXt"
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+        )
+        oe_runmake
+}
diff --git a/meta/packages/xorg-lib/libxt_cvs.bb b/meta/packages/xorg-lib/libxt_cvs.bb
new file mode 100644
index 0000000000..3fd2eabe67
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_cvs.bb
@@ -0,0 +1,26 @@
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 libsm"
+PROVIDES = "xt"
+DESCRIPTION = "X Toolkit Intrinsics"
+LICENSE =  "X-MIT"
+PR = "r1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
+S = "${WORKDIR}/Xt"
+inherit autotools pkgconfig 
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+                oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
+        )
+        oe_runmake
+}
+do_stage () {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..f9ebac47f9
--- /dev/null
+++ b/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto"
+XORG_PN = "libXTrap"
diff --git a/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..802ea2836d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Test Extension: client side library"
+PRIORITY = "optional"
+DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto"
+PROVIDES = "xtst"
+XORG_PN = "libXtst"
diff --git a/meta/packages/xorg-lib/libxtst_cvs.bb b/meta/packages/xorg-lib/libxtst_cvs.bb
new file mode 100644
index 0000000000..dc3e358d64
--- /dev/null
+++ b/meta/packages/xorg-lib/libxtst_cvs.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 recordext libxext"
+PROVIDES = "xtst"
+DESCRIPTION = "X Test Extension: client side library"
+PR = "r3"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst"
+S = "${WORKDIR}/Xtst"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
new file mode 100644
index 0000000000..93c41ce126
--- /dev/null
+++ b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext"
+DESCRIPTION = "X Video extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
+S = "${WORKDIR}/Xv"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxv_2.2.2.bb b/meta/packages/xorg-lib/libxv_2.2.2.bb
new file mode 100644
index 0000000000..d42302979e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxv_2.2.2.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext"
+DESCRIPTION = "X Video extension library."
+SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
+S = "${WORKDIR}/libXv-${PV}"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0d045940e3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video extension library."
+LICENSE = "GPL"
+DEPENDS += " virtual/libx11 libxext xextproto videoproto"
+XORG_PN = "libXv"
diff --git a/meta/packages/xorg-lib/libxvmc/drm.patch b/meta/packages/xorg-lib/libxvmc/drm.patch
new file mode 100644
index 0000000000..d48cdb3d0b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc/drm.patch
@@ -0,0 +1,9 @@
+--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
+++ XvMC/hw/via/Makefile.am     2005-03-06 11:25:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(XVMC_CFLAGS)
+-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
+ 
+ lib_LTLIBRARIES = libviaXvMC.la
+ 
diff --git a/meta/packages/xorg-lib/libxvmc/true.patch b/meta/packages/xorg-lib/libxvmc/true.patch
new file mode 100644
index 0000000000..7059295007
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc/true.patch
@@ -0,0 +1,11 @@
+--- XvMC/hw/via/viaXvMC.c.old   2004-10-18 20:54:49.000000000 +0100
+++ XvMC/hw/via/viaXvMC.c       2004-10-18 20:55:03.000000000 +0100
+@@ -43,6 +43,8 @@
+ #include <xf86drm.h>
+ #include <pthread.h>
+ #include "vldXvMC.h"
+
+#define TRUE 1
+     
+ #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
+                       (((CARD8 *)(ctx)->sAreaAddress) +        \
diff --git a/meta/packages/xorg-lib/libxvmc/via.patch b/meta/packages/xorg-lib/libxvmc/via.patch
new file mode 100644
index 0000000000..21cdfbdd6b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc/via.patch
@@ -0,0 +1,23 @@
+--- XvMC/configure.ac.old       2004-09-18 13:16:31.000000000 +0100
+++ XvMC/configure.ac   2004-09-18 13:16:32.000000000 +0100
+@@ -14,4 +14,5 @@
+ AC_OUTPUT([Makefile
+            hw/Makefile
+           hw/i810/Makefile
+          hw/via/Makefile
+            xvmc.pc])
+--- /dev/null   2004-06-13 02:32:19.000000000 +0100
+++ XvMC/hw/via/Makefile.am     2004-09-18 13:16:01.000000000 +0100
+@@ -0,0 +1,7 @@
+AM_CFLAGS = $(XVMC_CFLAGS)
+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
+
+lib_LTLIBRARIES = libviaXvMC.la
+
+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
+               viaXvMCPriv.h
+--- XvMC/hw/Makefile.am.old     2004-10-17 22:34:27.000000000 +0100
+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = i810
+SUBDIRS = i810 via
diff --git a/meta/packages/xorg-lib/libxvmc_20040919.bb b/meta/packages/xorg-lib/libxvmc_20040919.bb
new file mode 100644
index 0000000000..f256211962
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_20040919.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
+PR = "r2"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+        cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
+        file://via.patch;patch=1 \
+        file://true.patch"
+S = "${WORKDIR}/XvMC"
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg"
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+inherit autotools pkgconfig 
+do_configure_prepend() {
+        install -d ${S}/hw/via
+        cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/
+        ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch )
+}
+do_compile() {
+        oe_runmake
+        oe_runmake -C hw/via
+}
+do_stage() {
+        oe_runmake install prefix=${STAGING_DIR} \
+               bindir=${STAGING_BINDIR} \
+               includedir=${STAGING_INCDIR} \
+               libdir=${STAGING_LIBDIR} \
+               datadir=${STAGING_DATADIR} \
+               mandir=${STAGING_DATADIR}/man
+        oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+        install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
diff --git a/meta/packages/xorg-lib/libxvmc_20041025.bb b/meta/packages/xorg-lib/libxvmc_20041025.bb
new file mode 100644
index 0000000000..ff8dda58a6
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_20041025.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
+PR = "r2"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+        file://true.patch;patch=1 file://drm.patch;patch=1"
+S = "${WORKDIR}/XvMC"
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+inherit autotools pkgconfig 
+do_compile() {
+        oe_runmake
+        oe_runmake -C hw/via
+}
+do_install() {
+        oe_runmake DESTDIR='${D}' install
+        oe_runmake -C hw/via DESTDIR='${D}' install
+}
+do_stage() {
+        oe_runmake install prefix=${STAGING_DIR} \
+               bindir=${STAGING_BINDIR} \
+               includedir=${STAGING_INCDIR} \
+               libdir=${STAGING_LIBDIR} \
+               datadir=${STAGING_DATADIR} \
+               mandir=${STAGING_DATADIR}/man
+        oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+        install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
diff --git a/meta/packages/xorg-lib/libxvmc_20050612.bb b/meta/packages/xorg-lib/libxvmc_20050612.bb
new file mode 100644
index 0000000000..d9be65baa0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_20050612.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
+PR = "r0"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+        ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
+        file://true.patch;patch=1 file://drm.patch;patch=1"
+S = "${WORKDIR}/XvMC"
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+inherit autotools pkgconfig 
+do_compile() {
+        oe_runmake
+        oe_runmake -C hw/via
+}
+do_install() {
+        oe_runmake DESTDIR='${D}' install
+        oe_runmake -C hw/via DESTDIR='${D}' install
+}
+do_stage() {
+        oe_runmake install prefix=${STAGING_DIR} \
+               bindir=${STAGING_BINDIR} \
+               includedir=${STAGING_INCDIR} \
+               libdir=${STAGING_LIBDIR} \
+               datadir=${STAGING_DATADIR} \
+               mandir=${STAGING_DATADIR}/man
+        oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+        install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
diff --git a/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a0f9f7be25
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video Motion Compensation extension library."
+DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto"
+XORG_PN = "libXvMC"
diff --git a/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a0f9f7be25
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video Motion Compensation extension library."
+DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto"
+XORG_PN = "libXvMC"
diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..e067190b84
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xxf86dga extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
+XORG_PN = "libXxf86dga"
diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..e067190b84
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xxf86dga extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
+XORG_PN = "libXxf86dga"
diff --git a/meta/packages/xorg-lib/libxxf86dga_cvs.bb b/meta/packages/xorg-lib/libxxf86dga_cvs.bb
new file mode 100644
index 0000000000..d110e7e4c0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86dga_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "XFree86"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext xxf86dgaext"
+DESCRIPTION = "Xxf86dga extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
+S = "${WORKDIR}/Xxf86dga"
+inherit autotools pkgconfig 
+do_stage() {
+        oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..3af4acba96
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto"
+PROVIDES = "xxf86misc"
+XORG_PN = "libXxf86misc"
diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..3af4acba96
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+#DESCRIPTION = ""
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto"
+PROVIDES = "xxf86misc"
+XORG_PN = "libXxf86misc"
diff --git a/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b85e2d2477
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xxf86vm extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
+XORG_PN = "libXxf86vm"
diff --git a/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..b85e2d2477
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Xxf86vm extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
+XORG_PN = "libXxf86vm"
diff --git a/meta/packages/xorg-lib/libxxf86vm_cvs.bb b/meta/packages/xorg-lib/libxxf86vm_cvs.bb
new file mode 100644
index 0000000000..5464c4330c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86vm_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+DEPENDS = "virtual/libx11 libxext xxf86vmext"
+DESCRIPTION = "Xxf86vm extension library."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
+S = "${WORKDIR}/Xxf86vm"
+inherit autotools pkgconfig 
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc
new file mode 100644
index 0000000000..7a3e0425c7
--- /dev/null
+++ b/meta/packages/xorg-lib/xorg-lib-common.inc
@@ -0,0 +1,17 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+DEPENDS = "util-macros"
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+inherit autotools pkgconfig
+EXTRA_OECONF="--enable-malloc0returnsnull"
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/xtrans-native_0.1.bb b/meta/packages/xorg-lib/xtrans-native_0.1.bb
new file mode 100644
index 0000000000..db1e6e4673
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans-native_0.1.bb
@@ -0,0 +1,3 @@
+SECTION = "x11/base"
+require xtrans_${PV}.bb
+inherit native
diff --git a/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ff63987713
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+DEPENDS = "util-macros-native"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/xtrans-${PV}.tar.bz2"
+S = "${WORKDIR}/xtrans-${PV}"
+inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/xtrans_0.1.bb b/meta/packages/xorg-lib/xtrans_0.1.bb
new file mode 100644
index 0000000000..8fee0d5089
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_0.1.bb
@@ -0,0 +1,15 @@
+SECTION = "x11/libs"
+LICENSE = "MIT"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2"
+S = "${WORKDIR}/libXtrans-${PV}"
+inherit autotools  pkgconfig
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..1ab38ad838
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+#DEPENDS += " "
diff --git a/meta/packages/xorg-lib/xtrans_cvs.bb b/meta/packages/xorg-lib/xtrans_cvs.bb
new file mode 100644
index 0000000000..9714f4017b
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_cvs.bb
@@ -0,0 +1,16 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans"
+S = "${WORKDIR}/xtrans"
+inherit autotools  pkgconfig
+do_stage() {
+        autotools_stage_all
+}
author	Chris Larson <kergoth@openedhand.com>	2006-08-15 11:58:37 +0000
committer	Chris Larson <kergoth@openedhand.com>	2006-08-15 11:58:37 +0000
commit	ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree	2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-lib
parent	c210d01a7ca8c00ddc45d292878b89086b137129 (diff)
download	poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz