xorg mega commit: merge in change from poky

60 files changed, 654 insertions, 143 deletions

diff --git a/packages/xorg-lib/diet-x11_1.1.2.bb b/packages/xorg-lib/diet-x11_1.1.2.bb
new file mode 100644
index 0000000000..f032987b88
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.2.bb
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+	    file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
new file mode 100644
index 0000000000..f43d38065e
--- /dev/null
+++ b/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/packages/xorg-lib/libapplewm_1.0.0.bb b/packages/xorg-lib/libapplewm_1.0.0.bb
new file mode 100644
index 0000000000..bc502fb505
--- /dev/null
+++ b/packages/xorg-lib/libapplewm_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+
+DEPENDS += "libxext applewmproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libAppleWM"
diff --git a/packages/xorg-lib/libdmx_1.0.2.bb b/packages/xorg-lib/libdmx_1.0.2.bb
new file mode 100644
index 0000000000..9b66101563
--- /dev/null
+++ b/packages/xorg-lib/libdmx_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Distributed Multihead extension library"
+DEPENDS += "libxext dmxproto"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-lib/libfontenc-native_1.0.4.bb b/packages/xorg-lib/libfontenc-native_1.0.4.bb
new file mode 100644
index 0000000000..a907e08f12
--- /dev/null
+++ b/packages/xorg-lib/libfontenc-native_1.0.4.bb
@@ -0,0 +1,8 @@
+require libfontenc_${PV}.bb
+
+DEPENDS = "zlib-native xproto-native"
+PE = "1"
+
+XORG_PN = "libfontenc"
+
+inherit native
diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb
index afb7ffe10e..654fc72eca 100644
--- a/packages/xorg-lib/libfontenc_1.0.4.bb
+++ b/packages/xorg-lib/libfontenc_1.0.4.bb
@@ -1,9 +1,7 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X fontenc library (used by libxfont)."
+DESCRIPTION = "X11 font encoding library"
 LICENSE = "BSD-X"
-PRIORITY = "optional"
-
-DEPENDS += " zlib xproto"
-
+DEPENDS += "zlib xproto"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-lib/libfs_1.0.0.bb b/packages/xorg-lib/libfs_1.0.0.bb
new file mode 100644
index 0000000000..010aa311e0
--- /dev/null
+++ b/packages/xorg-lib/libfs_1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libFS"
diff --git a/packages/xorg-lib/libice_1.0.3.bb b/packages/xorg-lib/libice_1.0.3.bb
index 28d0885370..e4a6557397 100644
--- a/packages/xorg-lib/libice_1.0.3.bb
+++ b/packages/xorg-lib/libice_1.0.3.bb
@@ -1,12 +1,9 @@
 require xorg-lib-common.inc
 
-PE = "1"
-
-DESCRIPTION = "X11 ICE library"
-PRIORITY = "optional"
-
-DEPENDS += " xproto xtrans"
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
 PROVIDES = "ice"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libICE"
-
diff --git a/packages/xorg-lib/liblbxutil_1.0.1.bb b/packages/xorg-lib/liblbxutil_1.0.1.bb
new file mode 100644
index 0000000000..adb7b0513e
--- /dev/null
+++ b/packages/xorg-lib/liblbxutil_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "XFIXES Extension"
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"
+PE = "1"
+
+SRC_URI += "file://mkg3states.patch;patch=1"
+
+export CC_FOR_BUILD = "gcc"
diff --git a/packages/xorg-lib/liboldx_1.0.1.bb b/packages/xorg-lib/liboldx_1.0.1.bb
new file mode 100644
index 0000000000..84470cbc78
--- /dev/null
+++ b/packages/xorg-lib/liboldx_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+
+DEPENDS += " virtual/libx11"
+PE = "1"
+
+XORG_PN = "liboldX"
diff --git a/packages/xorg-lib/libsm_1.0.3.bb b/packages/xorg-lib/libsm_1.0.3.bb
new file mode 100644
index 0000000000..edb6ff45ca
--- /dev/null
+++ b/packages/xorg-lib/libsm_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libSM"
diff --git a/packages/xorg-lib/libwindowswm_1.0.0.bb b/packages/xorg-lib/libwindowswm_1.0.0.bb
new file mode 100644
index 0000000000..a03d49505b
--- /dev/null
+++ b/packages/xorg-lib/libwindowswm_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+
+DEPENDS += "libxext windowswmproto"
+PE = "1"
+
+XORG_PN = "libWindowsWM"
diff --git a/packages/xorg-lib/libx11-native_1.0.1.bb b/packages/xorg-lib/libx11-native_1.0.1.bb
new file mode 100644
index 0000000000..7bc5fd3524
--- /dev/null
+++ b/packages/xorg-lib/libx11-native_1.0.1.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+PE = "1"
+
+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"
+
+XORG_PN = "libX11"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.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/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
index 16f77f7687..3c30890ac8 100644
--- a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
@@ -12,7 +12,7 @@ SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2"
 SRC_URI += "file://makekeys.diff;patch=1"
 S = "${WORKDIR}/libX11-${PV}"
 
-inherit native autotools pkgconfig
+inherit autotools pkgconfig native
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
@@ -23,3 +23,5 @@ do_compile() {
 	)
 	oe_runmake
 }
+
+
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
new file mode 100644
index 0000000000..bab2277fd0
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.2.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"
+PE = "1"
+
+XORG_PN = "libX11"
+
+EXTRA_OECONF += "--without-xcb"
+
+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
+	)
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index 5a333914e2..f2929624e8 100644
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -2,12 +2,11 @@ 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"
+PR = "r1"
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/packages/xorg-lib/libxau-native_1.0.3.bb b/packages/xorg-lib/libxau-native_1.0.3.bb
new file mode 100644
index 0000000000..953a93adf1
--- /dev/null
+++ b/packages/xorg-lib/libxau-native_1.0.3.bb
@@ -0,0 +1,8 @@
+require libxau_${PV}.bb
+
+DEPENDS = "xproto-native util-macros-native"
+PR = "r1"
+
+XORG_PN = "libXau"
+
+inherit native
diff --git a/packages/xorg-lib/libxau_1.0.3.bb b/packages/xorg-lib/libxau_1.0.3.bb
index dcde9b4da2..3a77534cff 100644
--- a/packages/xorg-lib/libxau_1.0.3.bb
+++ b/packages/xorg-lib/libxau_1.0.3.bb
@@ -1,11 +1,8 @@
 require xorg-lib-common.inc
-PE = "1"
 
 DESCRIPTION = "A Sample Authorization Protocol for X"
-PRIORITY = "optional"
-
 DEPENDS += " xproto"
 PROVIDES = "xau"
+PE = "1"
 
 XORG_PN = "libXau"
-
diff --git a/packages/xorg-lib/libxaw_1.0.3.bb b/packages/xorg-lib/libxaw_1.0.3.bb
index 7e7f91b82f..f45431e79e 100644
--- a/packages/xorg-lib/libxaw_1.0.3.bb
+++ b/packages/xorg-lib/libxaw_1.0.3.bb
@@ -1,14 +1,14 @@
 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"
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
 PROVIDES = "xaw"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXaw"
 
-do_stage () {
-	autotools_stage_all
+do_stage_append () {
 	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/packages/xorg-lib/libxcalibrate/.mtn2git_empty b/packages/xorg-lib/libxcalibrate/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxcalibrate/.mtn2git_empty
diff --git a/packages/xorg-lib/libxcalibrate/coords.patch b/packages/xorg-lib/libxcalibrate/coords.patch
new file mode 100644
index 0000000000..19cf1639f6
--- /dev/null
+++ b/packages/xorg-lib/libxcalibrate/coords.patch
@@ -0,0 +1,50 @@
+---
+ xcalibrate.c |   26 ++++++++++++++++++++++++++
+ xcalibrate.h |    2 ++
+ 2 files changed, 28 insertions(+)
+
+Index: XCalibrate/xcalibrate.c
+===================================================================
+--- XCalibrate.orig/xcalibrate.c	2007-06-30 14:12:22.000000000 +0100
++++ XCalibrate/xcalibrate.c	2007-06-30 14:18:10.000000000 +0100
+@@ -227,3 +227,29 @@ XCalibrateSetRawMode (Display *dpy, Bool
+   SyncHandle ();
+   return 0;
+ }
++
++Status 
++XCalibrateScreenToCoord (Display *dpy, int *x, int *y)
++{
++  XExtDisplayInfo		*info = XCalibrateFindDisplay (dpy);
++  xXCalibrateScreenToCoordReq *req;
++  xXCalibrateScreenToCoordReply	rep;
++  LockDisplay (dpy);
++  GetReq (XCalibrateScreenToCoord, req);
++  req->reqType = info->codes->major_opcode;
++  req->xCalibrateReqType = X_XCalibrateScreenToCoord;
++  req->x = *x;
++  req->y = *y;
++  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
++    {
++      UnlockDisplay (dpy);
++      SyncHandle ();
++      return 1;
++    }
++  *x = rep.x;
++  *y = rep.y;
++  UnlockDisplay (dpy);
++  SyncHandle ();
++  return 0;
++}
++
+Index: XCalibrate/xcalibrate.h
+===================================================================
+--- XCalibrate.orig/xcalibrate.h	2007-06-30 14:16:16.000000000 +0100
++++ XCalibrate/xcalibrate.h	2007-06-30 14:16:38.000000000 +0100
+@@ -43,4 +43,6 @@ Status XCalibrateQueryVersion (Display *
+ 
+ Status XCalibrateSetRawMode (Display *dpy, Bool enable);
+ 
++Status XCalibrateScreenToCoord (Display *dpy, int *x, int *y);
++
+ #endif
diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb
index 4e70d2670a..99f11e40fd 100644
--- a/packages/xorg-lib/libxcalibrate_git.bb
+++ b/packages/xorg-lib/libxcalibrate_git.bb
@@ -1,20 +1,14 @@
+require xorg-lib-common.inc
+
 DESCRIPTION = "	Touchscreen calibration client library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
 LICENSE = "BSD-X"
-
-PV = "0.0+git4be232e30cd33a44a1ce6d3ec429ee6101540c62"
-
 DEPENDS = "virtual/libx11 calibrateproto libxext"
+PV = "0.0+git${SRCDATE}"
+PR = "r2"
 
-FILES_${PN}-locale += "${datadir}/X11/locale"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \
+           file://coords.patch;patch=1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62"
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
-	
+FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/packages/xorg-lib/libxcomposite_0.4.0.bb b/packages/xorg-lib/libxcomposite_0.4.0.bb
new file mode 100644
index 0000000000..8921b927bf
--- /dev/null
+++ b/packages/xorg-lib/libxcomposite_0.4.0.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"
+PE = "1"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb
index bf795757f6..4713eccc48 100644
--- a/packages/xorg-lib/libxcursor_1.1.8.bb
+++ b/packages/xorg-lib/libxcursor_1.1.8.bb
@@ -1,11 +1,9 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X Cursor library"
+DESCRIPTION = "X cursor management library"
 LICENSE= "BSD-X"
-
-DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
+DEPENDS += "libxrender libxfixes"
+PR = "r2"
+PE = "1"
 
 XORG_PN = "libXcursor"
-
-FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xorg-lib/libxdamage_1.1.1.bb b/packages/xorg-lib/libxdamage_1.1.1.bb
new file mode 100644
index 0000000000..e56d1d0954
--- /dev/null
+++ b/packages/xorg-lib/libxdamage_1.1.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 damaged region extension library"
+LICENSE= "BSD-X"
+DEPENDS += "damageproto libxfixes"
+PROVIDES = "xdamage"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXdamage"
diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb
index 2438a7b599..d57f8ac48e 100644
--- a/packages/xorg-lib/libxdmcp-native_1.0.2.bb
+++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb
@@ -1,11 +1,9 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-PE = "1"
+require libxdmcp_${PV}.bb
 
 DEPENDS = "xproto-native util-macros-native"
+PR = "r1"
+PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdmcp-${PV}"
+XORG_PN = "libXdmcp"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb
index 109c5b5615..0aa95b4677 100644
--- a/packages/xorg-lib/libxdmcp_1.0.2.bb
+++ b/packages/xorg-lib/libxdmcp_1.0.2.bb
@@ -1,11 +1,9 @@
 require xorg-lib-common.inc
-PE = "1"
-
-DESCRIPTION = "X Display Manager Control Protocol library."
-PRIORITY = "optional"
 
-DEPENDS += " xproto"
+DESCRIPTION = "X Display Manager Control Protocol library"
+DEPENDS += "xproto"
 PROVIDES = "xdmcp"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXdmcp"
-
diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb
index 06985bd112..6c6b4595aa 100644
--- a/packages/xorg-lib/libxevie_1.0.2.bb
+++ b/packages/xorg-lib/libxevie_1.0.2.bb
@@ -1,9 +1,8 @@
 require xorg-lib-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
 
-DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
+DESCRIPTION = "X11 EvIE extension library"
+DEPENDS += "libxext evieext"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXevie"
-
diff --git a/packages/xorg-lib/libxext_1.0.3.bb b/packages/xorg-lib/libxext_1.0.3.bb
new file mode 100644
index 0000000000..81231a866c
--- /dev/null
+++ b/packages/xorg-lib/libxext_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
diff --git a/packages/xorg-lib/libxfixes_4.0.3.bb b/packages/xorg-lib/libxfixes_4.0.3.bb
index cffe56a03a..5b2100a815 100644
--- a/packages/xorg-lib/libxfixes_4.0.3.bb
+++ b/packages/xorg-lib/libxfixes_4.0.3.bb
@@ -1,10 +1,8 @@
 require xorg-lib-common.inc
-PE = "1"
 
 DESCRIPTION = "X Fixes extension library."
 LICENSE= "BSD-X"
-
-DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
+DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+PE = "1"
 
 XORG_PN = "libXfixes"
-
diff --git a/packages/xorg-lib/libxfont-native_1.3.0.bb b/packages/xorg-lib/libxfont-native_1.3.0.bb
new file mode 100644
index 0000000000..efd1e07d6a
--- /dev/null
+++ b/packages/xorg-lib/libxfont-native_1.3.0.bb
@@ -0,0 +1,10 @@
+require libxfont_${PV}.bb
+
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \
+           libfontenc-native xtrans-native freetype-native util-macros-native"
+PE = "1"
+
+# no need for patch used in libxfont
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
+inherit native
diff --git a/packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch b/packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
new file mode 100644
index 0000000000..dd307434b9
--- /dev/null
+++ b/packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
@@ -0,0 +1,188 @@
+commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
+Author: Dodji Seketeli <dodji@openedhand.com>
+Date:   Mon Jul 16 12:24:34 2007 +0200
+
+    Remove side effects from BuiltinReadDirectory()
+    
+    The first time BuiltinReadDirectory() is called,
+    save the content of builtin_dir and builtin_alias,
+    before calling FontFileAddFontFile(), because that fonction
+    will modify those.
+    
+    Then, in subsequent calls to BuiltinReadDirectory(), restore
+    builtin_dir and builtin_alias so that the side effect incurred
+    by the first call disappears.
+
+diff --git a/src/builtins/dir.c b/src/builtins/dir.c
+index c272449..97f1e1e 100644
+--- a/src/builtins/dir.c
++++ b/src/builtins/dir.c
+@@ -29,6 +29,133 @@
+ #endif
+ #include "builtin.h"
+ 
++BuiltinDirPtr
++BuiltinDirsDup (const BuiltinDirPtr a_dirs,
++                int a_dirs_len)
++{
++    BuiltinDirPtr dirs=NULL ;
++    int i=0 ;
++
++    if (!a_dirs)
++        return NULL ;
++
++    dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
++    if (!dirs)
++        return NULL ;
++
++    for (i=0; i < a_dirs_len; i++) {
++        int len = strlen (a_dirs[i].file_name) ;
++        dirs[i].file_name = xcalloc (1, len) ;
++        memmove (dirs[i].file_name, a_dirs[i].file_name, len);
++        len = strlen (a_dirs[i].font_name) ;
++        dirs[i].font_name = xcalloc (1, len) ;
++        memmove (dirs[i].font_name, a_dirs[i].font_name, len);
++    }
++    return dirs ;
++}
++
++/**
++ * Copy a_save back into a_cur
++ * @param a_cur the instance of BuiltinDir to restore
++ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
++ * @return 0 if went okay, 1 otherwise.
++ */
++int
++BuiltinDirRestore (BuiltinDirPtr a_cur,
++                   const BuiltinDirPtr a_saved)
++{
++    if (!a_cur)
++        return 1 ;
++    if (!a_saved)
++        return 0 ;
++
++    if (a_saved->font_name)
++        memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
++    return 0 ;
++}
++
++
++int
++BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
++                    const BuiltinDirPtr a_saved_tab,
++                    int a_tab_len)
++{
++    int i=0 ;
++
++    if (!a_cur_tab)
++        return 1 ;
++    if (!a_saved_tab)
++        return 0 ;
++
++    for (i=0 ; i < a_tab_len; i++) {
++        if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
++            return 1 ;
++    }
++    return 0 ;
++}
++
++BuiltinAliasPtr
++BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
++                   int a_aliases_len)
++{
++    BuiltinAliasPtr aliases=NULL ;
++    int i=0 ;
++
++    if (!a_aliases)
++        return NULL ;
++
++    aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
++    if (!aliases)
++        return NULL ;
++
++    for (i=0; i < a_aliases_len; i++) {
++        int len = strlen (a_aliases[i].font_name) ;
++        aliases[i].font_name = xcalloc (1, len) ;
++        memmove (aliases[i].font_name, a_aliases[i].font_name, len);
++    }
++    return aliases ;
++}
++
++/**
++ * Copy a_save back into a_cur
++ * @param a_cur the instance of BuiltinAlias to restore
++ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
++ * @return 0 if went okay, 1 otherwise.
++ */
++int
++BuiltinAliasRestore (BuiltinAliasPtr a_cur,
++                     const BuiltinAliasPtr a_save)
++{
++    if (!a_cur)
++        return 1 ;
++    if (!a_save)
++        return 0 ;
++    if (a_save->alias_name)
++        memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
++    if (a_save->font_name)
++        memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
++    return 0 ;
++}
++
++int
++BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
++                       const BuiltinAliasPtr a_saved_tab,
++                       int a_tab_len)
++{
++    int i=0 ;
++
++    if (!a_cur_tab)
++        return 1 ;
++    if (!a_saved_tab)
++        return 0 ;
++
++    for (i=0 ; i < a_tab_len; i++) {
++        if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
++            return 1 ;
++    }
++    return 0 ;
++}
++
+ int
+ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
+ {
+@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
+     int			i;
+ 
+     dir = FontFileMakeDir ("", builtin_dir_count);
++    static BuiltinDirPtr saved_builtin_dir ;
++    static BuiltinAliasPtr saved_builtin_alias ;
++
++
++    if (saved_builtin_dir)
++    {
++        BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
++                            saved_builtin_dir,
++                            builtin_dir_count) ;
++    }
++    else
++    {
++        saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
++                                            builtin_dir_count) ;
++    }
++
++    if (saved_builtin_alias)
++    {
++        BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
++                               saved_builtin_alias,
++                               builtin_alias_count) ;
++    }
++    else
++    {
++        saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
++                                                 builtin_alias_count) ;
++    }
++
+     for (i = 0; i < builtin_dir_count; i++)
+     {
+ 	if (!FontFileAddFontFile (dir,
diff --git a/packages/xorg-lib/libxfont_1.3.0.bb b/packages/xorg-lib/libxfont_1.3.0.bb
new file mode 100644
index 0000000000..d452d9796d
--- /dev/null
+++ b/packages/xorg-lib/libxfont_1.3.0.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE= "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+PR = "r2"
+PE = "1"
+
+SRC_URI += "file://no-scalable-crash.patch;patch=1 \
+            file://builtinreaddirectory-no-side-effect.patch;patch=1"
+
+XORG_PN = "libXfont"
diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb
index 1e45867950..ee999de4f5 100644
--- a/packages/xorg-lib/libxfontcache_1.0.4.bb
+++ b/packages/xorg-lib/libxfontcache_1.0.4.bb
@@ -1,9 +1,8 @@
 require xorg-lib-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
 
-DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
+DESCRIPTION = "X-TrueType font cache extension client library"
+DEPENDS += "libxext fontcacheproto"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXfontcache"
-
diff --git a/packages/xorg-lib/libxft_2.1.12.bb b/packages/xorg-lib/libxft_2.1.12.bb
new file mode 100644
index 0000000000..8e54dac01d
--- /dev/null
+++ b/packages/xorg-lib/libxft_2.1.12.bb
@@ -0,0 +1,20 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PROVIDES = "xft"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXft"
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}"
diff --git a/packages/xorg-lib/libxi_1.1.2.bb b/packages/xorg-lib/libxi_1.1.2.bb
new file mode 100644
index 0000000000..31e3b4906d
--- /dev/null
+++ b/packages/xorg-lib/libxi_1.1.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXi"
diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
index 9bfe62ae07..b7135bc28e 100644
--- a/packages/xorg-lib/libxinerama_1.0.2.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2.bb
@@ -1,11 +1,9 @@
 require xorg-lib-common.inc
 
-DESCRIPTION = "Xinerama library"
-PRIORITY = "optional"
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxext xextproto xineramaproto"
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
 PROVIDES = "xinerama"
+PR = "r3"
+PE = "1"
 
 XORG_PN = "libXinerama"
-
diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb
index 2d9b778d02..a404180d49 100644
--- a/packages/xorg-lib/libxkbfile_1.0.4.bb
+++ b/packages/xorg-lib/libxkbfile_1.0.4.bb
@@ -1,9 +1,7 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X11 keyboard library"
+DESCRIPTION = "X11 keyboard file manipulation library"
 LICENSE= "GPL"
-PRIORITY = "optional"
-
-DEPENDS += " virtual/libx11 kbproto"
-
+DEPENDS += "virtual/libx11 kbproto"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-lib/libxkbui_1.0.2.bb b/packages/xorg-lib/libxkbui_1.0.2.bb
new file mode 100644
index 0000000000..9a3f5f1327
--- /dev/null
+++ b/packages/xorg-lib/libxkbui_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 keyboard UI presentation library"
+LICENSE= "GPL"
+DEPENDS += "virtual/libx11 libxt libxkbfile"
+PROVIDES = "xkbui"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb
index e055874b3d..9a02bf82be 100644
--- a/packages/xorg-lib/libxmu_1.0.3.bb
+++ b/packages/xorg-lib/libxmu_1.0.3.bb
@@ -1,17 +1,16 @@
 require xorg-lib-common.inc
-PE = "1"
-
-DESCRIPTION = "X Window System miscellaneous utility library"
-PRIORITY = "optional"
 
-DEPENDS += " libxt libxext xextproto virtual/libx11"
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
 PROVIDES = "xmu"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXmu"
 
+LEAD_SONAME = "libXmu"
+
 PACKAGES =+ "libxmuu libxmuu-dev"
 
 FILES_libxmuu = "${libdir}/libXmuu.so.*"
 FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
diff --git a/packages/xorg-lib/libxp_1.0.0.bb b/packages/xorg-lib/libxp_1.0.0.bb
new file mode 100644
index 0000000000..53fb47c054
--- /dev/null
+++ b/packages/xorg-lib/libxp_1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Printing Extension (Xprint) client library"
+DEPENDS += "libxext libxau printproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXp"
+
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb
index 60779da43f..4e0a6eaacd 100644
--- a/packages/xorg-lib/libxpm_3.5.6.bb
+++ b/packages/xorg-lib/libxpm_3.5.6.bb
@@ -1,11 +1,10 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X Pixmap library."
-PRIORITY = "optional"
+DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
-
-DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
+DEPENDS += "libxt libxext"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXpm"
 
diff --git a/packages/xorg-lib/libxprintapputil_1.0.1.bb b/packages/xorg-lib/libxprintapputil_1.0.1.bb
new file mode 100644
index 0000000000..3a24a888d1
--- /dev/null
+++ b/packages/xorg-lib/libxprintapputil_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Xprint job utility client library"
+DEPENDS += "libxp libxt libxprintutil"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXprintAppUtil"
diff --git a/packages/xorg-lib/libxprintutil_1.0.1.bb b/packages/xorg-lib/libxprintutil_1.0.1.bb
new file mode 100644
index 0000000000..327138e7fd
--- /dev/null
+++ b/packages/xorg-lib/libxprintutil_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Xprint printer utility client library"
+DEPENDS += "libxp libxt"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXprintUtil"
diff --git a/packages/xorg-lib/libxrandr_1.2.1.bb b/packages/xorg-lib/libxrandr_1.2.1.bb
index 18e5deffb8..cf2a73a72c 100644
--- a/packages/xorg-lib/libxrandr_1.2.1.bb
+++ b/packages/xorg-lib/libxrandr_1.2.1.bb
@@ -1,10 +1,9 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X Resize and Rotate extension library."
+DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
-
-DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
+DEPENDS += "randrproto libxrender"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXrandr"
-
diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb
index b1372d3dac..f8b9c37b50 100644
--- a/packages/xorg-lib/libxrender_0.9.2.bb
+++ b/packages/xorg-lib/libxrender_0.9.2.bb
@@ -1,10 +1,9 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X Render extension library."
+DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
-
-DEPENDS += " virtual/libx11 renderproto"
+DEPENDS += "virtual/libx11 renderproto xproto"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXrender"
-
diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb
index b9d2fd68ce..02a0cae0d8 100644
--- a/packages/xorg-lib/libxres_1.0.3.bb
+++ b/packages/xorg-lib/libxres_1.0.3.bb
@@ -1,9 +1,8 @@
 require xorg-lib-common.inc
-PE = "1"
-
-DESCRIPTION = "X Resource usage library."
 
-DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
+DESCRIPTION = "X11 Resource extension library"
+DEPENDS += "libxext resourceproto"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXres"
-
diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb
index 163ca199c1..ff22c337a0 100644
--- a/packages/xorg-lib/libxscrnsaver_1.1.2.bb
+++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb
@@ -1,14 +1,11 @@
 require xorg-lib-common.inc
-PE = "1"
 
-DESCRIPTION = "X screen saver extension library."
+DESCRIPTION = "X Screen Saver extension library"
 LICENSE = "GPL"
-
-DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
-
-XORG_PN = "libXScrnSaver"
-
+DEPENDS += "libxext scrnsaverproto"
 PROVIDES = "libxss"
 RREPLACES = "libxss"
+PR = "r1"
+PE = "1"
 
-#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+XORG_PN = "libXScrnSaver"
diff --git a/packages/xorg-lib/libxt_1.0.5.bb b/packages/xorg-lib/libxt_1.0.5.bb
index e67590bdf1..5b25c4b3a5 100644
--- a/packages/xorg-lib/libxt_1.0.5.bb
+++ b/packages/xorg-lib/libxt_1.0.5.bb
@@ -1,15 +1,14 @@
 require xorg-lib-common.inc
-PE = "1"
-
-DESCRIPTION = "X Toolkit Intrinsics"
-PRIORITY = "optional"
 
-DEPENDS += " libsm virtual/libx11 xproto kbproto"
+DESCRIPTION = "X11 toolkit intrinsics library"
+DEPENDS += "libsm virtual/libx11 kbproto"
 PROVIDES = "xt"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXt"
 
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
 
 do_compile() {
 	(
diff --git a/packages/xorg-lib/libxtrap_1.0.0.bb b/packages/xorg-lib/libxtrap_1.0.0.bb
new file mode 100644
index 0000000000..7a25ae5bce
--- /dev/null
+++ b/packages/xorg-lib/libxtrap_1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 event trapping extension library"
+DEPENDS += "libxt trapproto libxext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXTrap"
diff --git a/packages/xorg-lib/libxtst_1.0.2.bb b/packages/xorg-lib/libxtst_1.0.2.bb
new file mode 100644
index 0000000000..14e10ff285
--- /dev/null
+++ b/packages/xorg-lib/libxtst_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto"
+PROVIDES = "xtst"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXtst"
diff --git a/packages/xorg-lib/libxv_1.0.3.bb b/packages/xorg-lib/libxv_1.0.3.bb
index 0d045940e3..6014326e90 100644
--- a/packages/xorg-lib/libxv_1.0.3.bb
+++ b/packages/xorg-lib/libxv_1.0.3.bb
@@ -1,9 +1,8 @@
 require xorg-lib-common.inc
 
-DESCRIPTION = "X Video extension library."
+DESCRIPTION = "X11 Video extension library"
 LICENSE = "GPL"
-
-DEPENDS += " virtual/libx11 libxext xextproto videoproto"
+DEPENDS += "libxext videoproto"
+PR = "r1"
 
 XORG_PN = "libXv"
-
diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb
index 54aaa895ff..64943ce9bd 100644
--- a/packages/xorg-lib/libxvmc_1.0.4.bb
+++ b/packages/xorg-lib/libxvmc_1.0.4.bb
@@ -1,9 +1,8 @@
 require xorg-lib-common.inc
-PE = "1"
-
-DESCRIPTION = "X Video Motion Compensation extension library."
 
-DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto"
+DESCRIPTION = "X Video Motion Compensation extension library"
+DEPENDS += "libxext libxv videoproto"
+PR = "r1"
+PE = "1"
 
 XORG_PN = "libXvMC"
-
diff --git a/packages/xorg-lib/libxxf86dga_1.0.1.bb b/packages/xorg-lib/libxxf86dga_1.0.1.bb
new file mode 100644
index 0000000000..47492d7108
--- /dev/null
+++ b/packages/xorg-lib/libxxf86dga_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXxf86dga"
diff --git a/packages/xorg-lib/libxxf86misc_1.0.1.bb b/packages/xorg-lib/libxxf86misc_1.0.1.bb
new file mode 100644
index 0000000000..d1f8719cde
--- /dev/null
+++ b/packages/xorg-lib/libxxf86misc_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 XFree86 miscellaneous extension library"
+DEPENDS += "libxext xf86miscproto"
+PROVIDES = "xxf86misc"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXxf86misc"
diff --git a/packages/xorg-lib/libxxf86vm_1.0.1.bb b/packages/xorg-lib/libxxf86vm_1.0.1.bb
new file mode 100644
index 0000000000..efb90d4854
--- /dev/null
+++ b/packages/xorg-lib/libxxf86vm_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXxf86vm"
diff --git a/packages/xorg-lib/xorg-headers-native.bb b/packages/xorg-lib/xorg-headers-native.bb
index f88bcc7aee..82d5d79415 100644
--- a/packages/xorg-lib/xorg-headers-native.bb
+++ b/packages/xorg-lib/xorg-headers-native.bb
@@ -6,4 +6,3 @@ do_stage() {
 	install -d ${STAGING_INCDIR}
 	cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR}
 }
-
diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index b1c1153bf4..130f8d1755 100644
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -1,12 +1,12 @@
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
-
 DEPENDS = "util-macros xorg-headers-native"
+
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2 \
-"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
@@ -14,5 +14,5 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "--enable-malloc0returnsnull"
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
 }
diff --git a/packages/xorg-lib/xtrans-native_1.0.3.bb b/packages/xorg-lib/xtrans-native_1.0.3.bb
new file mode 100644
index 0000000000..722d7e15e7
--- /dev/null
+++ b/packages/xorg-lib/xtrans-native_1.0.3.bb
@@ -0,0 +1,10 @@
+require xtrans_${PV}.bb
+
+DEPENDS = "util-macros-native"
+PE = "1"
+
+XORG_PN = "xtrans"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
+inherit native
diff --git a/packages/xorg-lib/xtrans_1.0.3.bb b/packages/xorg-lib/xtrans_1.0.3.bb
index e32509a5c4..42cf655a3f 100644
--- a/packages/xorg-lib/xtrans_1.0.3.bb
+++ b/packages/xorg-lib/xtrans_1.0.3.bb
@@ -1,9 +1,7 @@
 require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
 PE = "1"
 
 SRC_URI += "file://fix-missing-includepath.patch;patch=1"
-
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-