Update xlibs to follow restructuring in OE (in preparation for X11R7)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966

43 files changed, 172 insertions, 33 deletions

diff --git a/openembedded/packages/xlibs/diet-x11_6.2.1.bb b/openembedded/packages/xlibs/diet-x11_6.2.1.bb
new file mode 100644
index 0000000000..284fcc21cc
--- /dev/null
+++ b/openembedded/packages/xlibs/diet-x11_6.2.1.bb
@@ -0,0 +1,10 @@
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+include 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"
+
+
diff --git a/openembedded/packages/xlibs/ice/autofoo.patch b/openembedded/packages/xlibs/libice/autofoo.patch
index 8ab0585fb8..8ab0585fb8 100644
--- a/openembedded/packages/xlibs/ice/autofoo.patch
+++ b/openembedded/packages/xlibs/libice/autofoo.patch
diff --git a/openembedded/packages/xlibs/ice_6.3.3.bb b/openembedded/packages/xlibs/libice_6.3.3.bb
index 7722bc4ae5..1311145334 100644
--- a/openembedded/packages/xlibs/ice_6.3.3.bb
+++ b/openembedded/packages/xlibs/libice_6.3.3.bb
@@ -2,7 +2,8 @@ SECTION = "libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
+PROVIDES = "ice"
 DESCRIPTION = "X11 ICE library"
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/libsm_6.0.3.bb b/openembedded/packages/xlibs/libsm_6.0.3.bb
index 6a85eaf6cc..08f9597045 100644
--- a/openembedded/packages/xlibs/libsm_6.0.3.bb
+++ b/openembedded/packages/xlibs/libsm_6.0.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "MIT-X"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 ice"
+DEPENDS = "libx11 libice"
 DESCRIPTION = "Session management library"
 PR = "r1"
 
@@ -13,5 +13,5 @@ S = "${WORKDIR}/libSM-${PV}"
 inherit autotools pkgconfig 
 
 do_stage () {
-        oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+        autotools_stage_all
 }
diff --git a/openembedded/packages/xlibs/libx11-native_6.2.1.bb b/openembedded/packages/xlibs/libx11-native_6.2.1.bb
new file mode 100644
index 0000000000..9513c4237e
--- /dev/null
+++ b/openembedded/packages/xlibs/libx11-native_6.2.1.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+include libx11_${PV}.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/openembedded/packages/xlibs/libx11/autofoo.patch b/openembedded/packages/xlibs/libx11/autofoo.patch
new file mode 100644
index 0000000000..8bdba09768
--- /dev/null
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
new file mode 100644
index 0000000000..f43d38065e
--- /dev/null
+++ b/openembedded/packages/xlibs/libx11/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/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..dca88fba92
--- /dev/null
+++ b/openembedded/packages/xlibs/libx11/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/openembedded/packages/xlibs/libx11_6.2.1.bb b/openembedded/packages/xlibs/libx11_6.2.1.bb
new file mode 100644
index 0000000000..901746bafa
--- /dev/null
+++ b/openembedded/packages/xlibs/libx11_6.2.1.bb
@@ -0,0 +1,40 @@
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "x11"
+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/openembedded/packages/xlibs/xau-native_cvs.bb b/openembedded/packages/xlibs/libxau-native_0.1.1.bb
index ac8b19c749..ecb71ce3d6 100644
--- a/openembedded/packages/xlibs/xau-native_cvs.bb
+++ b/openembedded/packages/xlibs/libxau-native_0.1.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include xau_cvs.bb
+include libxau_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
-
diff --git a/openembedded/packages/xlibs/xau-native_0.1.1.bb b/openembedded/packages/xlibs/libxau-native_cvs.bb
index e4d62da929..cd070033ce 100644
--- a/openembedded/packages/xlibs/xau-native_0.1.1.bb
+++ b/openembedded/packages/xlibs/libxau-native_cvs.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include xau_${PV}.bb
+include libxau_cvs.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
-
diff --git a/openembedded/packages/xlibs/xau/autofoo.patch b/openembedded/packages/xlibs/libxau/autofoo.patch
index 1e42eb974d..1e42eb974d 100644
--- a/openembedded/packages/xlibs/xau/autofoo.patch
+++ b/openembedded/packages/xlibs/libxau/autofoo.patch
diff --git a/openembedded/packages/xlibs/xau_0.1.1.bb b/openembedded/packages/xlibs/libxau_0.1.1.bb
index 3c8b4a030b..dc1a28171b 100644
--- a/openembedded/packages/xlibs/xau_0.1.1.bb
+++ b/openembedded/packages/xlibs/libxau_0.1.1.bb
@@ -3,6 +3,7 @@ LICENSE= "MIT"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
+PROVIDES = "xau"
 DESCRIPTION = "Authorization Protocol for X."
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/xau_cvs.bb b/openembedded/packages/xlibs/libxau_cvs.bb
index a0e2bd312f..518744816d 100644
--- a/openembedded/packages/xlibs/xau_cvs.bb
+++ b/openembedded/packages/xlibs/libxau_cvs.bb
@@ -5,6 +5,7 @@ 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"
diff --git a/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch b/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
index 072cf25214..072cf25214 100644
--- a/openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch
+++ b/openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
diff --git a/openembedded/packages/xlibs/xcomposite_1.0.1.bb b/openembedded/packages/xlibs/libxcomposite_1.0.1.bb
index 1e8d96ce2e..e2ca3bbc7b 100644
--- a/openembedded/packages/xlibs/xcomposite_1.0.1.bb
+++ b/openembedded/packages/xlibs/libxcomposite_1.0.1.bb
@@ -1,6 +1,7 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "x11 compositeext xextensions libxfixes"
+DEPENDS = "libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."
 PR = "r1"
 
@@ -11,9 +12,5 @@ S = "${WORKDIR}/libXcomposite-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-        oe_runmake install prefix=${STAGING_DIR} \
-               bindir=${STAGING_BINDIR} \
-               includedir=${STAGING_INCDIR} \
-               libdir=${STAGING_LIBDIR} \
-               datadir=${STAGING_DATADIR}
+        autotools_stage_all
 }
diff --git a/openembedded/packages/xlibs/xcomposite_cvs.bb b/openembedded/packages/xlibs/libxcomposite_cvs.bb
index c2ec718cd6..1d8b69c8c6 100644
--- a/openembedded/packages/xlibs/xcomposite_cvs.bb
+++ b/openembedded/packages/xlibs/libxcomposite_cvs.bb
@@ -1,7 +1,8 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 compositeext xextensions libxfixes"
+DEPENDS = "libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
diff --git a/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch b/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch
index 1e3ec45d4a..1e3ec45d4a 100644
--- a/openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch
+++ b/openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch
diff --git a/openembedded/packages/xlibs/xdamage/m4.patch b/openembedded/packages/xlibs/libxdamage/m4.patch
index 393f3d13d2..393f3d13d2 100644
--- a/openembedded/packages/xlibs/xdamage/m4.patch
+++ b/openembedded/packages/xlibs/libxdamage/m4.patch
diff --git a/openembedded/packages/xlibs/xdamage_1.0.1.bb b/openembedded/packages/xlibs/libxdamage_1.0.1.bb
index 5b6c301374..040e863447 100644
--- a/openembedded/packages/xlibs/xdamage_1.0.1.bb
+++ b/openembedded/packages/xlibs/libxdamage_1.0.1.bb
@@ -1,6 +1,7 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "x11 damageext libxfixes xproto"
+DEPENDS = "libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
 DESCRIPTION = "X Damage extension library."
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/xdamage_cvs.bb b/openembedded/packages/xlibs/libxdamage_cvs.bb
index d7d9e33f8d..ba8a68033a 100644
--- a/openembedded/packages/xlibs/xdamage_cvs.bb
+++ b/openembedded/packages/xlibs/libxdamage_cvs.bb
@@ -1,7 +1,8 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 damageext libxfixes xproto"
+DEPENDS = "libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
 DESCRIPTION = "X Damage extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
diff --git a/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb b/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb
index 90f5a33f22..8d7162b351 100644
--- a/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ b/openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb
@@ -4,5 +4,3 @@ include libxdmcp_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""
-
-
diff --git a/openembedded/packages/xlibs/xext-native_cvs.bb b/openembedded/packages/xlibs/libxext-native_cvs.bb
index b6e0673bbe..9294b080b7 100644
--- a/openembedded/packages/xlibs/xext-native_cvs.bb
+++ b/openembedded/packages/xlibs/libxext-native_cvs.bb
@@ -1,6 +1,6 @@
 SECTION = "unknown"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
-include xext_${PV}.bb
+include libxext_${PV}.bb
 inherit native
-DEPENDS = "x11-native xextensions-native"
-
+DEPENDS = "libx11-native xextensions-native"
+PROVIDES = ""
diff --git a/openembedded/packages/xlibs/xext/autofoo.patch b/openembedded/packages/xlibs/libxext/autofoo.patch
index c006884526..c006884526 100644
--- a/openembedded/packages/xlibs/xext/autofoo.patch
+++ b/openembedded/packages/xlibs/libxext/autofoo.patch
diff --git a/openembedded/packages/xlibs/xext_cvs.bb b/openembedded/packages/xlibs/libxext_cvs.bb
index 4ea5061264..0ef675ca70 100644
--- a/openembedded/packages/xlibs/xext_cvs.bb
+++ b/openembedded/packages/xlibs/libxext_cvs.bb
@@ -4,7 +4,8 @@ LICENSE= "MIT"
 DESCRIPTION = "X Server Extension library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "xproto x11 xextensions"
+DEPENDS = "xproto libx11 xextensions"
+PROVIDES = "xext"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
diff --git a/openembedded/packages/xlibs/libxfixes_2.0.1.bb b/openembedded/packages/xlibs/libxfixes_2.0.1.bb
index 29e23e379d..710fa17454 100644
--- a/openembedded/packages/xlibs/libxfixes_2.0.1.bb
+++ b/openembedded/packages/xlibs/libxfixes_2.0.1.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "x11 fixesext"
+DEPENDS = "libx11 fixesext"
 DESCRIPTION = "X Fixes extension library."
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/libxfixes_cvs.bb b/openembedded/packages/xlibs/libxfixes_cvs.bb
index f02f9518cf..4494dc9326 100644
--- a/openembedded/packages/xlibs/libxfixes_cvs.bb
+++ b/openembedded/packages/xlibs/libxfixes_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 fixesext"
+DEPENDS = "libx11 fixesext"
 DESCRIPTION = "X Fixes extension library."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
diff --git a/openembedded/packages/xlibs/xfont/autofoo.patch b/openembedded/packages/xlibs/libxfont/autofoo.patch
index 4998625c24..4998625c24 100644
--- a/openembedded/packages/xlibs/xfont/autofoo.patch
+++ b/openembedded/packages/xlibs/libxfont/autofoo.patch
diff --git a/openembedded/packages/xlibs/xfont/scalable.patch b/openembedded/packages/xlibs/libxfont/scalable.patch
index 7f97b9a8f6..7f97b9a8f6 100644
--- a/openembedded/packages/xlibs/xfont/scalable.patch
+++ b/openembedded/packages/xlibs/libxfont/scalable.patch
diff --git a/openembedded/packages/xlibs/xfont_1.4.2.bb b/openembedded/packages/xlibs/libxfont_1.4.2.bb
index 7ef1d2b17f..0cc45397fe 100644
--- a/openembedded/packages/xlibs/xfont_1.4.2.bb
+++ b/openembedded/packages/xlibs/libxfont_1.4.2.bb
@@ -3,6 +3,7 @@ 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"
 
diff --git a/openembedded/packages/xlibs/xfont_cvs.bb b/openembedded/packages/xlibs/libxfont_cvs.bb
index 49896ecd83..bd21e0fd12 100644
--- a/openembedded/packages/xlibs/xfont_cvs.bb
+++ b/openembedded/packages/xlibs/libxfont_cvs.bb
@@ -4,6 +4,7 @@ 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 \
diff --git a/openembedded/packages/xlibs/libxft_2.1.6.bb b/openembedded/packages/xlibs/libxft_2.1.6.bb
index 12c8bdfb62..c3f1f74e40 100644
--- a/openembedded/packages/xlibs/libxft_2.1.6.bb
+++ b/openembedded/packages/xlibs/libxft_2.1.6.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
-DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
 DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 PROVIDES = "xft"
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libxft_cvs.bb b/openembedded/packages/xlibs/libxft_cvs.bb
index 01c53b47d5..6c1a5f5c32 100644
--- a/openembedded/packages/xlibs/libxft_cvs.bb
+++ b/openembedded/packages/xlibs/libxft_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "x11/libs"
-DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
 DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 PROVIDES = "xft"
 
diff --git a/openembedded/packages/xlibs/libxi_6.0.1.bb b/openembedded/packages/xlibs/libxi_6.0.1.bb
index 05ad22989f..5c44d06df3 100644
--- a/openembedded/packages/xlibs/libxi_6.0.1.bb
+++ b/openembedded/packages/xlibs/libxi_6.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "X Input Extension library"
 LICENSE = "MIT-X"
 SECTION = "x11/libs"
-DEPENDS = "xproto x11 xextensions"
+DEPENDS = "xproto libx11 xextensions"
 PR = "r1"
 
 SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
diff --git a/openembedded/packages/xlibs/xmu_cvs.bb b/openembedded/packages/xlibs/libxmu_cvs.bb
index 9420280adc..500b373c32 100644
--- a/openembedded/packages/xlibs/xmu_cvs.bb
+++ b/openembedded/packages/xlibs/libxmu_cvs.bb
@@ -2,7 +2,8 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "xt xext"
+DEPENDS = "libxt libxext"
+PROVIDES = "xmu"
 PR = "r2"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
diff --git a/openembedded/packages/xlibs/xpm/autofoo.patch b/openembedded/packages/xlibs/libxpm/autofoo.patch
index 6b2174bf02..6b2174bf02 100644
--- a/openembedded/packages/xlibs/xpm/autofoo.patch
+++ b/openembedded/packages/xlibs/libxpm/autofoo.patch
diff --git a/openembedded/packages/xlibs/xpm_3.5.1.bb b/openembedded/packages/xlibs/libxpm_3.5.1.bb
index ea863f1eb6..513261efd3 100644
--- a/openembedded/packages/xlibs/xpm_3.5.1.bb
+++ b/openembedded/packages/xlibs/libxpm_3.5.1.bb
@@ -2,7 +2,8 @@ SECTION = "x11/libs"
 LICENSE = "X-BSD"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto x11"
+DEPENDS = "xproto libx11"
+PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/xpm_cvs.bb b/openembedded/packages/xlibs/libxpm_cvs.bb
index 78e44b3f9b..1b46855735 100644
--- a/openembedded/packages/xlibs/xpm_cvs.bb
+++ b/openembedded/packages/xlibs/libxpm_cvs.bb
@@ -3,7 +3,8 @@ LICENSE = "X-BSD"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto x11"
+DEPENDS = "xproto libx11"
+PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/libxrandr_1.0.2.bb b/openembedded/packages/xlibs/libxrandr_1.0.2.bb
index ff32e0aa35..efd0505544 100644
--- a/openembedded/packages/xlibs/libxrandr_1.0.2.bb
+++ b/openembedded/packages/xlibs/libxrandr_1.0.2.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
-DEPENDS = "randrext x11 libxrender xext"
+DEPENDS = "randrext libx11 libxrender libxext"
 DESCRIPTION = "X Resize and Rotate extension library."
 PR = "r1"
 
diff --git a/openembedded/packages/xlibs/libxrender_cvs.bb b/openembedded/packages/xlibs/libxrender_cvs.bb
index 76c4af5bbc..ea6b1f4607 100644
--- a/openembedded/packages/xlibs/libxrender_cvs.bb
+++ b/openembedded/packages/xlibs/libxrender_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 SECTION = "libs"
-DEPENDS = "renderext x11"
+DEPENDS = "renderext libx11"
 DESCRIPTION = "X Render extension library."
 LICENSE = "BSD"
 
diff --git a/openembedded/packages/xlibs/xt/autofoo.patch b/openembedded/packages/xlibs/libxt/autofoo.patch
index ff6dfdbbcc..ff6dfdbbcc 100644
--- a/openembedded/packages/xlibs/xt/autofoo.patch
+++ b/openembedded/packages/xlibs/libxt/autofoo.patch
diff --git a/openembedded/packages/xlibs/xt_0.1.5.bb b/openembedded/packages/xlibs/libxt_0.1.5.bb
index 52235e2d97..00cbe9a3ad 100644
--- a/openembedded/packages/xlibs/xt_0.1.5.bb
+++ b/openembedded/packages/xlibs/libxt_0.1.5.bb
@@ -1,7 +1,8 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 libsm"
+DEPENDS = "libx11 libsm"
+PROVIDES = "xt"
 DESCRIPTION = "X Toolkit Intrinsics"
 LICENSE = "X-MIT"
 PR = "r1"
diff --git a/openembedded/packages/xlibs/libxtst_cvs.bb b/openembedded/packages/xlibs/libxtst_cvs.bb
new file mode 100644
index 0000000000..c7c24d5d74
--- /dev/null
+++ b/openembedded/packages/xlibs/libxtst_cvs.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "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
+}