summaryrefslogtreecommitdiff
path: root/openembedded/packages
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded/packages')
-rw-r--r--openembedded/packages/cairo/cairo_1.0.0.bb2
-rw-r--r--openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb2
-rw-r--r--openembedded/packages/gtk+/gtk+_2.6.7.bb2
-rw-r--r--openembedded/packages/gtk+/gtk+_2.8.16.bb2
-rw-r--r--openembedded/packages/libfakekey/libfakekey_svn.bb2
-rw-r--r--openembedded/packages/libmatchbox/libmatchbox.inc2
-rw-r--r--openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb2
-rw-r--r--openembedded/packages/libxsettings/libxsettings_0.11.bb2
-rw-r--r--openembedded/packages/lirc/lirc_0.7.1.bb2
-rw-r--r--openembedded/packages/maemo/xpext_1.0-5.bb2
-rw-r--r--openembedded/packages/maemo/xsp_1.0.0-8.bb2
-rw-r--r--openembedded/packages/matchbox-panel/matchbox-panel.inc2
-rw-r--r--openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb2
-rw-r--r--openembedded/packages/matchbox-wm/matchbox-wm_svn.bb2
-rw-r--r--openembedded/packages/pango/pango_1.10.0.bb2
-rw-r--r--openembedded/packages/pango/pango_1.12.0.bb2
-rw-r--r--openembedded/packages/pango/pango_1.9.1.bb2
-rw-r--r--openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb2
-rw-r--r--openembedded/packages/startup-notification/startup-notification_0.8.bb2
-rw-r--r--openembedded/packages/x11/x11-native_6.2.1.bb5
-rw-r--r--openembedded/packages/xauth/xauth_cvs.bb2
-rw-r--r--openembedded/packages/xcalibrate/xcalibrate_cvs.bb2
-rw-r--r--openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb2
-rw-r--r--openembedded/packages/xhost/xhost_20040413.bb2
-rw-r--r--openembedded/packages/xlibs/diet-x11_6.2.1.bb (renamed from openembedded/packages/x11/diet-x11_6.2.1.bb)4
-rw-r--r--openembedded/packages/xlibs/libice/autofoo.patch (renamed from openembedded/packages/xlibs/ice/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libice_6.3.3.bb (renamed from openembedded/packages/xlibs/ice_6.3.3.bb)3
-rw-r--r--openembedded/packages/xlibs/libsm_6.0.3.bb4
-rw-r--r--openembedded/packages/xlibs/libx11-native_6.2.1.bb6
-rw-r--r--openembedded/packages/xlibs/libx11/autofoo.patch (renamed from openembedded/packages/x11/files/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch (renamed from openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch)0
-rw-r--r--openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch (renamed from openembedded/packages/x11/files/fix-utf8-wrong-define.patch)0
-rw-r--r--openembedded/packages/xlibs/libx11_6.2.1.bb (renamed from openembedded/packages/x11/x11_6.2.1.bb)6
-rw-r--r--openembedded/packages/xlibs/libxau-native_0.1.1.bb (renamed from openembedded/packages/xlibs/xau-native_cvs.bb)3
-rw-r--r--openembedded/packages/xlibs/libxau-native_cvs.bb (renamed from openembedded/packages/xlibs/xau-native_0.1.1.bb)3
-rw-r--r--openembedded/packages/xlibs/libxau/autofoo.patch (renamed from openembedded/packages/xlibs/xau/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxau_0.1.1.bb (renamed from openembedded/packages/xlibs/xau_0.1.1.bb)1
-rw-r--r--openembedded/packages/xlibs/libxau_cvs.bb (renamed from openembedded/packages/xlibs/xau_cvs.bb)1
-rw-r--r--openembedded/packages/xlibs/libxcomposite-1.0.1/autofoo.patch (renamed from openembedded/packages/xlibs/xcomposite-1.0.1/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxcomposite_1.0.1.bb (renamed from openembedded/packages/xlibs/xcomposite_1.0.1.bb)9
-rw-r--r--openembedded/packages/xlibs/libxcomposite_cvs.bb (renamed from openembedded/packages/xlibs/xcomposite_cvs.bb)3
-rw-r--r--openembedded/packages/xlibs/libxdamage-1.0.1/autofoo.patch (renamed from openembedded/packages/xlibs/xdamage-1.0.1/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxdamage/m4.patch (renamed from openembedded/packages/xlibs/xdamage/m4.patch)0
-rw-r--r--openembedded/packages/xlibs/libxdamage_1.0.1.bb (renamed from openembedded/packages/xlibs/xdamage_1.0.1.bb)3
-rw-r--r--openembedded/packages/xlibs/libxdamage_cvs.bb (renamed from openembedded/packages/xlibs/xdamage_cvs.bb)3
-rw-r--r--openembedded/packages/xlibs/libxdmcp-native_0.1.3.bb2
-rw-r--r--openembedded/packages/xlibs/libxext-native_cvs.bb (renamed from openembedded/packages/xlibs/xext-native_cvs.bb)6
-rw-r--r--openembedded/packages/xlibs/libxext/autofoo.patch (renamed from openembedded/packages/xlibs/xext/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxext_cvs.bb (renamed from openembedded/packages/xlibs/xext_cvs.bb)3
-rw-r--r--openembedded/packages/xlibs/libxfixes_2.0.1.bb2
-rw-r--r--openembedded/packages/xlibs/libxfixes_cvs.bb2
-rw-r--r--openembedded/packages/xlibs/libxfont/autofoo.patch (renamed from openembedded/packages/xlibs/xfont/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxfont/scalable.patch (renamed from openembedded/packages/xlibs/xfont/scalable.patch)0
-rw-r--r--openembedded/packages/xlibs/libxfont_1.4.2.bb (renamed from openembedded/packages/xlibs/xfont_1.4.2.bb)1
-rw-r--r--openembedded/packages/xlibs/libxfont_cvs.bb (renamed from openembedded/packages/xlibs/xfont_cvs.bb)1
-rw-r--r--openembedded/packages/xlibs/libxft_2.1.6.bb2
-rw-r--r--openembedded/packages/xlibs/libxft_cvs.bb2
-rw-r--r--openembedded/packages/xlibs/libxi_6.0.1.bb2
-rw-r--r--openembedded/packages/xlibs/libxmu_cvs.bb (renamed from openembedded/packages/xlibs/xmu_cvs.bb)3
-rw-r--r--openembedded/packages/xlibs/libxpm/autofoo.patch (renamed from openembedded/packages/xlibs/xpm/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxpm_3.5.1.bb (renamed from openembedded/packages/xlibs/xpm_3.5.1.bb)3
-rw-r--r--openembedded/packages/xlibs/libxpm_cvs.bb (renamed from openembedded/packages/xlibs/xpm_cvs.bb)3
-rw-r--r--openembedded/packages/xlibs/libxrandr_1.0.2.bb2
-rw-r--r--openembedded/packages/xlibs/libxrender_cvs.bb2
-rw-r--r--openembedded/packages/xlibs/libxt/autofoo.patch (renamed from openembedded/packages/xlibs/xt/autofoo.patch)0
-rw-r--r--openembedded/packages/xlibs/libxt_0.1.5.bb (renamed from openembedded/packages/xlibs/xt_0.1.5.bb)3
-rw-r--r--openembedded/packages/xlibs/libxtst_cvs.bb (renamed from openembedded/packages/xtst/xtst_cvs.bb)3
-rw-r--r--openembedded/packages/xmodmap/xmodmap_cvs.bb2
-rw-r--r--openembedded/packages/xrandr/xrandr_cvs.bb2
-rw-r--r--openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb2
-rw-r--r--openembedded/packages/xserver/xserver-kdrive_20050207.bb2
-rw-r--r--openembedded/packages/xserver/xserver-kdrive_20050624.bb2
-rw-r--r--openembedded/packages/xserver/xserver-kdrive_cvs.bb2
-rw-r--r--openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb2
-rw-r--r--openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb2
-rw-r--r--openembedded/packages/xserver/xserver-xorg_cvs.bb2
-rw-r--r--openembedded/packages/xtscal/xtscal_0.6.3.bb2
77 files changed, 86 insertions, 76 deletions
diff --git a/openembedded/packages/cairo/cairo_1.0.0.bb b/openembedded/packages/cairo/cairo_1.0.0.bb
index 84cb58117..10603e3f2 100644
--- a/openembedded/packages/cairo/cairo_1.0.0.bb
+++ b/openembedded/packages/cairo/cairo_1.0.0.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11 libpng fontconfig libxrender"
+DEPENDS = "libx11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r1"
diff --git a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index fbebed2e4..e2065b3fa 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
PR = "r1"
S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/"
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb
index 260a03684..b27607231 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb
@@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
PR = "r4"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/openembedded/packages/gtk+/gtk+_2.8.16.bb b/openembedded/packages/gtk+/gtk+_2.8.16.bb
index 875efa8d3..acd3be5f2 100644
--- a/openembedded/packages/gtk+/gtk+_2.8.16.bb
+++ b/openembedded/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
PR = "r2"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
diff --git a/openembedded/packages/libfakekey/libfakekey_svn.bb b/openembedded/packages/libfakekey/libfakekey_svn.bb
index 7cdd55746..eec4d6506 100644
--- a/openembedded/packages/libfakekey/libfakekey_svn.bb
+++ b/openembedded/packages/libfakekey/libfakekey_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox keyboard"
LICENSE = "GPL"
-DEPENDS = "xtst"
+DEPENDS = "libxtst"
SECTION = "x11/wm"
PR="r1"
PV = "0.0+svn${SRCDATE}"
diff --git a/openembedded/packages/libmatchbox/libmatchbox.inc b/openembedded/packages/libmatchbox/libmatchbox.inc
index e8700cb7b..974014f27 100644
--- a/openembedded/packages/libmatchbox/libmatchbox.inc
+++ b/openembedded/packages/libmatchbox/libmatchbox.inc
@@ -1,7 +1,7 @@
SECTION = "x11/libs"
DESCRIPTION = "Matchbox window manager core library"
LICENSE = "GPL"
-DEPENDS = "x11 xext expat libxft jpeg libpng zlib libxsettings-client"
+DEPENDS = "libx11 libxext expat libxft jpeg libpng zlib libxsettings-client"
PR="r2"
inherit autotools pkgconfig
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
index 1ccb6e4eb..7e1b4df2c 100644
--- a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings x11"
+DEPENDS = "libxsettings libx11"
PR = "r1"
inherit autotools pkgconfig gpe
diff --git a/openembedded/packages/libxsettings/libxsettings_0.11.bb b/openembedded/packages/libxsettings/libxsettings_0.11.bb
index 6ff786e3b..caf2bc67a 100644
--- a/openembedded/packages/libxsettings/libxsettings_0.11.bb
+++ b/openembedded/packages/libxsettings/libxsettings_0.11.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
inherit gpe
diff --git a/openembedded/packages/lirc/lirc_0.7.1.bb b/openembedded/packages/lirc/lirc_0.7.1.bb
index c3eaa3aa8..cd65dceda 100644
--- a/openembedded/packages/lirc/lirc_0.7.1.bb
+++ b/openembedded/packages/lirc/lirc_0.7.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-DEPENDS = "virtual/kernel x11 xau libsm ice"
+DEPENDS = "virtual/kernel libx11 libxau libsm libice"
PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
diff --git a/openembedded/packages/maemo/xpext_1.0-5.bb b/openembedded/packages/maemo/xpext_1.0-5.bb
index cd5aec2d1..75b7903e8 100644
--- a/openembedded/packages/maemo/xpext_1.0-5.bb
+++ b/openembedded/packages/maemo/xpext_1.0-5.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext"
+DEPENDS = "libx11 xextensions libxext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
file://auxdir.patch;patch=1;pnum=0"
diff --git a/openembedded/packages/maemo/xsp_1.0.0-8.bb b/openembedded/packages/maemo/xsp_1.0.0-8.bb
index 0c4a4c62f..068193c6a 100644
--- a/openembedded/packages/maemo/xsp_1.0.0-8.bb
+++ b/openembedded/packages/maemo/xsp_1.0.0-8.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext xpext"
+DEPENDS = "libx11 xextensions libxext xpext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
S = "${WORKDIR}/Xsp"
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel.inc b/openembedded/packages/matchbox-panel/matchbox-panel.inc
index 7ae9342b4..d5d355161 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel.inc
+++ b/openembedded/packages/matchbox-panel/matchbox-panel.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
SECTION = "x11/wm"
inherit autotools pkgconfig gettext
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index 69bddc354..c158f590c 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR="r0"
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
index c9e7ada22..ad37976dd 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext libxrender startup-notification expat matchbox-common gconf"
+DEPENDS = "libmatchbox libx11 libxext libxrender startup-notification expat matchbox-common gconf"
RDEPENDS = "matchbox-common"
PV = "0.9.5+svn${SRCDATE}"
PR = "r4"
diff --git a/openembedded/packages/pango/pango_1.10.0.bb b/openembedded/packages/pango/pango_1.10.0.bb
index dda4df2fd..869b146d5 100644
--- a/openembedded/packages/pango/pango_1.10.0.bb
+++ b/openembedded/packages/pango/pango_1.10.0.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/openembedded/packages/pango/pango_1.12.0.bb b/openembedded/packages/pango/pango_1.12.0.bb
index 4b6459e03..e06e659b7 100644
--- a/openembedded/packages/pango/pango_1.12.0.bb
+++ b/openembedded/packages/pango/pango_1.12.0.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/openembedded/packages/pango/pango_1.9.1.bb b/openembedded/packages/pango/pango_1.9.1.bb
index e66b65f36..db01079fe 100644
--- a/openembedded/packages/pango/pango_1.9.1.bb
+++ b/openembedded/packages/pango/pango_1.9.1.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 2f3f56c2c..b224bb0c9 100644
--- a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/openembedded/packages/startup-notification/startup-notification_0.8.bb b/openembedded/packages/startup-notification/startup-notification_0.8.bb
index a505a5396..3db849d2c 100644
--- a/openembedded/packages/startup-notification/startup-notification_0.8.bb
+++ b/openembedded/packages/startup-notification/startup-notification_0.8.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
PR = "r1"
inherit autotools pkgconfig
diff --git a/openembedded/packages/x11/x11-native_6.2.1.bb b/openembedded/packages/x11/x11-native_6.2.1.bb
deleted file mode 100644
index cb44531b8..000000000
--- a/openembedded/packages/x11/x11-native_6.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "x11/base"
-include x11_${PV}.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
diff --git a/openembedded/packages/xauth/xauth_cvs.bb b/openembedded/packages/xauth/xauth_cvs.bb
index 1243fce1d..54700574b 100644
--- a/openembedded/packages/xauth/xauth_cvs.bb
+++ b/openembedded/packages/xauth/xauth_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "x11 xau xmu xext"
+DEPENDS = "libx11 libxau libxmu libxext"
DESCRIPTION = "X authority file utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
index e254348e4..ab2b07607 100644
--- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "BSD-X"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 xcalibrateext xext"
+DEPENDS = "libx11 xcalibrateext libxext"
DESCRIPTION = "XCalibrate client-side library"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
diff --git a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
index bd1047c63..eb63ae7f4 100644
--- a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "x11 xext xtst"
+DEPENDS = "libx11 libxext libxtst"
DESCRIPTION = "X display information utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
diff --git a/openembedded/packages/xhost/xhost_20040413.bb b/openembedded/packages/xhost/xhost_20040413.bb
index b3ca3c939..4d36e62be 100644
--- a/openembedded/packages/xhost/xhost_20040413.bb
+++ b/openembedded/packages/xhost/xhost_20040413.bb
@@ -1,7 +1,7 @@
FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
LICENSE = "MIT"
PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "x11 xext xmu"
+DEPENDS = "libx11 libxext libxmu"
DESCRIPTION = "server access control program for X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/openembedded/packages/x11/diet-x11_6.2.1.bb b/openembedded/packages/xlibs/diet-x11_6.2.1.bb
index 1313bd08d..284fcc21c 100644
--- a/openembedded/packages/x11/diet-x11_6.2.1.bb
+++ b/openembedded/packages/xlibs/diet-x11_6.2.1.bb
@@ -1,8 +1,10 @@
SECTION = "x11/base"
-include x11_${PV}.bb
+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 8ab0585fb..8ab0585fb 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 7722bc4ae..131114533 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 6a85eaf6c..08f959704 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 000000000..9513c4237
--- /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/x11/files/autofoo.patch b/openembedded/packages/xlibs/libx11/autofoo.patch
index 8bdba0976..8bdba0976 100644
--- a/openembedded/packages/x11/files/autofoo.patch
+++ b/openembedded/packages/xlibs/libx11/autofoo.patch
diff --git a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
index f43d38065..f43d38065 100644
--- a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch
+++ b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
diff --git a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch
index dca88fba9..dca88fba9 100644
--- a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch
+++ b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch
diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/xlibs/libx11_6.2.1.bb
index 121c1ddd9..901746baf 100644
--- a/openembedded/packages/x11/x11_6.2.1.bb
+++ b/openembedded/packages/xlibs/libx11_6.2.1.bb
@@ -2,12 +2,12 @@ SECTION = "x11/libs"
LICENSE = "XFree86"
PRIORITY = "optional"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xextensions xau xtrans xdmcp"
+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"
-PROVIDES = "x11"
-PR = "r3"
+PR = "r4"
SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
file://errordb-keysymdb-path-fix.patch;patch=1 \
diff --git a/openembedded/packages/xlibs/xau-native_cvs.bb b/openembedded/packages/xlibs/libxau-native_0.1.1.bb
index ac8b19c74..ecb71ce3d 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 e4d62da92..cd070033c 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 1e42eb974..1e42eb974 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 3c8b4a030..dc1a28171 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 a0e2bd312..518744816 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 072cf2521..072cf2521 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 1e8d96ce2..e2ca3bbc7 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 c2ec718cd..1d8b69c8c 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 1e3ec45d4..1e3ec45d4 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 393f3d13d..393f3d13d 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 5b6c30137..040e86344 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 d7d9e33f8..ba8a68033 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 90f5a33f2..8d7162b35 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 b6e0673bb..9294b080b 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 c00688452..c00688452 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 4ea506126..0ef675ca7 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 29e23e379..710fa1745 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 f02f9518c..4494dc932 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 4998625c2..4998625c2 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 7f97b9a8f..7f97b9a8f 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 7ef1d2b17..0cc45397f 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 49896ecd8..bd21e0fd1 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 12c8bdfb6..c3f1f74e4 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 01c53b47d..6c1a5f5c3 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 05ad22989..5c44d06df 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 9420280ad..500b373c3 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 6b2174bf0..6b2174bf0 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 ea863f1eb..513261efd 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 78e44b3f9..1b4685573 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 ff32e0aa3..efd050554 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 76c4af5bb..ea6b1f460 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 ff6dfdbbc..ff6dfdbbc 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 52235e2d9..00cbe9a3a 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/xtst/xtst_cvs.bb b/openembedded/packages/xlibs/libxtst_cvs.bb
index 1662d3983..c7c24d5d7 100644
--- a/openembedded/packages/xtst/xtst_cvs.bb
+++ b/openembedded/packages/xlibs/libxtst_cvs.bb
@@ -2,7 +2,8 @@ LICENSE = "GPL"
PV = "0.0+cvs${SRCDATE}"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 recordext xext"
+DEPENDS = "libx11 recordext libxext"
+PROVIDES = "xtst"
DESCRIPTION = "X Test Extension: client side library"
PR = "r3"
diff --git a/openembedded/packages/xmodmap/xmodmap_cvs.bb b/openembedded/packages/xmodmap/xmodmap_cvs.bb
index 958263955..773466e6b 100644
--- a/openembedded/packages/xmodmap/xmodmap_cvs.bb
+++ b/openembedded/packages/xmodmap/xmodmap_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
PR = "r1"
-DEPENDS = "x11"
+DEPENDS = "libx11"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
file://autofoo.patch;patch=1"
diff --git a/openembedded/packages/xrandr/xrandr_cvs.bb b/openembedded/packages/xrandr/xrandr_cvs.bb
index 1e6609384..0ab7c745f 100644
--- a/openembedded/packages/xrandr/xrandr_cvs.bb
+++ b/openembedded/packages/xrandr/xrandr_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE= "BSD-X"
-DEPENDS = "libxrandr x11 xext"
+DEPENDS = "libxrandr libx11 libxext"
DESCRIPTION = "X Resize and Rotate extension command."
SECTION = "x11/base"
diff --git a/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb
index fac7718a1..682490b3a 100644
--- a/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/openembedded/packages/xserver/xserver-kdrive-omap_6.6.3.bb
@@ -1,5 +1,5 @@
LICENSE = "MIT"
-DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
index 9567863aa..2b007d480 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
@@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
DEFAULT_PREFERENCE = "1"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions-1.0.1 xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
index fcabbd4d2..c2e44f783 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}"
FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/openembedded/packages/xserver/xserver-kdrive_cvs.bb b/openembedded/packages/xserver/xserver-kdrive_cvs.bb
index dd93ed541..f034fbfd7 100644
--- a/openembedded/packages/xserver/xserver-kdrive_cvs.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
index c5b05cd2f..37546fe1e 100644
--- a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
PR = "r2"
-DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
file://imake-staging.patch;patch=1 \
diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
index 2a0519fd7..e60f62ef5 100644
--- a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
PR = "r0"
-DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
file://imake-staging.patch;patch=1 \
diff --git a/openembedded/packages/xserver/xserver-xorg_cvs.bb b/openembedded/packages/xserver/xserver-xorg_cvs.bb
index 9c64fb837..e410581e1 100644
--- a/openembedded/packages/xserver/xserver-xorg_cvs.bb
+++ b/openembedded/packages/xserver/xserver-xorg_cvs.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/xserver"
PR = "r3"
PV = "6.8.1+cvs${SRCDATE}"
-DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
+DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
file://imake-staging.patch;patch=1 \
diff --git a/openembedded/packages/xtscal/xtscal_0.6.3.bb b/openembedded/packages/xtscal/xtscal_0.6.3.bb
index a2a770f4f..70666f1fb 100644
--- a/openembedded/packages/xtscal/xtscal_0.6.3.bb
+++ b/openembedded/packages/xtscal/xtscal_0.6.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
-DEPENDS = "x11 libxft libxrandr xcalibrate"
+DEPENDS = "libx11 libxft libxrandr xcalibrate"
PR = "r1"