summaryrefslogtreecommitdiff
path: root/packages/xorg-lib
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-08-02 07:15:30 +0000
committerKoen Kooi <koen@openembedded.org>2007-08-02 07:15:30 +0000
commitb3e110eff605bd2361ea92bd748f59e48d508f33 (patch)
tree585a741d28885236452581e718ba458c6fd02c3d /packages/xorg-lib
parent81ded5cd087778af9e1a13e7a207b55b5448e07b (diff)
xorg mega commit: merge in change from poky
Diffstat (limited to 'packages/xorg-lib')
-rw-r--r--packages/xorg-lib/diet-x11_1.1.2.bb8
-rw-r--r--packages/xorg-lib/files/errordb-keysymdb-path-fix.patch22
-rw-r--r--packages/xorg-lib/libapplewm_1.0.0.bb7
-rw-r--r--packages/xorg-lib/libdmx_1.0.2.bb6
-rw-r--r--packages/xorg-lib/libfontenc-native_1.0.4.bb8
-rw-r--r--packages/xorg-lib/libfontenc_1.0.4.bb10
-rw-r--r--packages/xorg-lib/libfs_1.0.0.bb8
-rw-r--r--packages/xorg-lib/libice_1.0.3.bb11
-rw-r--r--packages/xorg-lib/liblbxutil_1.0.1.bb10
-rw-r--r--packages/xorg-lib/liboldx_1.0.1.bb6
-rw-r--r--packages/xorg-lib/libsm_1.0.3.bb8
-rw-r--r--packages/xorg-lib/libwindowswm_1.0.0.bb6
-rw-r--r--packages/xorg-lib/libx11-native_1.0.1.bb28
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb4
-rw-r--r--packages/xorg-lib/libx11_1.1.2.bb22
-rw-r--r--packages/xorg-lib/libx11_git.bb3
-rw-r--r--packages/xorg-lib/libxau-native_1.0.3.bb8
-rw-r--r--packages/xorg-lib/libxau_1.0.3.bb5
-rw-r--r--packages/xorg-lib/libxaw_1.0.3.bb8
-rw-r--r--packages/xorg-lib/libxcalibrate/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxcalibrate/coords.patch50
-rw-r--r--packages/xorg-lib/libxcalibrate_git.bb20
-rw-r--r--packages/xorg-lib/libxcomposite_0.4.0.bb11
-rw-r--r--packages/xorg-lib/libxcursor_1.1.8.bb10
-rw-r--r--packages/xorg-lib/libxdamage_1.1.1.bb10
-rw-r--r--packages/xorg-lib/libxdmcp-native_1.0.2.bb12
-rw-r--r--packages/xorg-lib/libxdmcp_1.0.2.bb10
-rw-r--r--packages/xorg-lib/libxevie_1.0.2.bb9
-rw-r--r--packages/xorg-lib/libxext_1.0.3.bb9
-rw-r--r--packages/xorg-lib/libxfixes_4.0.3.bb6
-rw-r--r--packages/xorg-lib/libxfont-native_1.3.0.bb10
-rw-r--r--packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch188
-rw-r--r--packages/xorg-lib/libxfont_1.3.0.bb13
-rw-r--r--packages/xorg-lib/libxfontcache_1.0.4.bb9
-rw-r--r--packages/xorg-lib/libxft_2.1.12.bb20
-rw-r--r--packages/xorg-lib/libxi_1.1.2.bb8
-rw-r--r--packages/xorg-lib/libxinerama_1.0.2.bb10
-rw-r--r--packages/xorg-lib/libxkbfile_1.0.4.bb10
-rw-r--r--packages/xorg-lib/libxkbui_1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxmu_1.0.3.bb13
-rw-r--r--packages/xorg-lib/libxp_1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxpm_3.5.6.bb9
-rw-r--r--packages/xorg-lib/libxprintapputil_1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxprintutil_1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxrandr_1.2.1.bb9
-rw-r--r--packages/xorg-lib/libxrender_0.9.2.bb9
-rw-r--r--packages/xorg-lib/libxres_1.0.3.bb9
-rw-r--r--packages/xorg-lib/libxscrnsaver_1.1.2.bb13
-rw-r--r--packages/xorg-lib/libxt_1.0.5.bb11
-rw-r--r--packages/xorg-lib/libxtrap_1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxtst_1.0.2.bb9
-rw-r--r--packages/xorg-lib/libxv_1.0.3.bb7
-rw-r--r--packages/xorg-lib/libxvmc_1.0.4.bb9
-rw-r--r--packages/xorg-lib/libxxf86dga_1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxxf86misc_1.0.1.bb9
-rw-r--r--packages/xorg-lib/libxxf86vm_1.0.1.bb8
-rw-r--r--packages/xorg-lib/xorg-headers-native.bb1
-rw-r--r--packages/xorg-lib/xorg-lib-common.inc10
-rw-r--r--packages/xorg-lib/xtrans-native_1.0.3.bb10
-rw-r--r--packages/xorg-lib/xtrans_1.0.3.bb8
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/