apply further xlibs rename patch from Glenn McGrath

BKrev: 40d42dae_vTGL8UzyNmhy-rt1MiA8Q

26 files changed, 122 insertions, 16 deletions

diff --git a/gkrellm/gkrellm_2.2.1.oe b/gkrellm/gkrellm_2.2.1.oe
index e69de29bb2..f83cb9db7c 100644
--- a/gkrellm/gkrellm_2.2.1.oe
+++ b/gkrellm/gkrellm_2.2.1.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "gtk+ glib-2.0 libsm ice"
+
+SRC_URI = "http://web.wt.net/~billw/gkrellm/gkrellm-${PV}.tar.bz2"
+S = "${WORKDIR}/gkrellm-${PV}"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE = "'glib12=0'"
+export LINK_FLAGS = "${LDFLAGS}"
+export SMC_LIBS = "-lSM -lICE"
+export STRIP = ""
+
+do_install () {
+	oe_runmake 'INSTALLDIR=${D}/${bindir}' \
+		   'SINSTALLDIR=${D}/${bindir}' \
+		   'MANDIR=${D}/${mandir}/man1' \
+		   'SMANDIR=${D}/${mandir}/man1' \
+		   'INCLUDEDIR=${D}/${includedir}' \
+		   'PKGCONFIGDIR=${D}/${libdir}/pkgconfig' \
+		   'LOCALEDIR=${D}/${datadir}/locale' \
+		   install
+}
diff --git a/libmatchbox/libmatchbox_1.1.oe b/libmatchbox/libmatchbox_1.1.oe
index 975c5a1b2e..e0ed8d947f 100644
--- a/libmatchbox/libmatchbox_1.1.oe
+++ b/libmatchbox/libmatchbox_1.1.oe
@@ -1,9 +1,8 @@
 DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
-DEPENDS = "x11 xext xft pango jpeg libpng zlib"
+DEPENDS = "x11 xext libxft pango jpeg libpng zlib"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2"
-S = "${WORKDIR}/libmatchbox-${PV}"
 
 inherit autotools  pkgconfig
 
diff --git a/libmatchbox/libmatchbox_1.2.oe b/libmatchbox/libmatchbox_1.2.oe
index 9472917871..64cd3b9be0 100644
--- a/libmatchbox/libmatchbox_1.2.oe
+++ b/libmatchbox/libmatchbox_1.2.oe
@@ -1,7 +1,7 @@
 PR = "r1"
 DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
-DEPENDS = "x11 xext xft pango jpeg libpng zlib libxsettings-client"
+DEPENDS = "x11 xext libxft pango jpeg libpng zlib libxsettings-client"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2"
 S = "${WORKDIR}/libmatchbox-${PV}"
diff --git a/sm/sm_cvs.oe b/libsm/libsm_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/sm/sm_cvs.oe
+++ b/libsm/libsm_cvs.oe
diff --git a/xcursor/xcursor_cvs.oe b/libxcursor/libxcursor_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/xcursor/xcursor_cvs.oe
+++ b/libxcursor/libxcursor_cvs.oe
diff --git a/xfixes/xfixes_cvs.oe b/libxfixes/libxfixes_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/xfixes/xfixes_cvs.oe
+++ b/libxfixes/libxfixes_cvs.oe
diff --git a/xft/xft_cvs.oe b/libxft/libxft_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/xft/xft_cvs.oe
+++ b/libxft/libxft_cvs.oe
diff --git a/libxrandr/libxrandr_1.0.2.oe b/libxrandr/libxrandr_1.0.2.oe
index e69de29bb2..2bd8756d29 100644
--- a/libxrandr/libxrandr_1.0.2.oe
+++ b/libxrandr/libxrandr_1.0.2.oe
@@ -0,0 +1,16 @@
+SECTION = "libs"
+DEPENDS = "randrext x11 libxrender xext"
+DESCRIPTION = "X Resize and Rotate extension library."
+
+SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2"
+S = "${WORKDIR}/libXrandr-${PV}"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/libxrandr/libxrandr_cvs.oe b/libxrandr/libxrandr_cvs.oe
index fafd95cc30..a603ad4733 100644
--- a/libxrandr/libxrandr_cvs.oe
+++ b/libxrandr/libxrandr_cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "randr x11 render xrender xext"
+DEPENDS = "randrext x11 libxrender xext"
 DESCRIPTION = "X Resize and Rotate extension library."
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrandr"
diff --git a/matchbox-wm/matchbox-wm_0.8.1.oe b/matchbox-wm/matchbox-wm_0.8.1.oe
index ebcfd5adf3..69722b9947 100644
--- a/matchbox-wm/matchbox-wm_0.8.1.oe
+++ b/matchbox-wm/matchbox-wm_0.8.1.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage libxrender startup-notification expat gconf"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
diff --git a/matchbox-wm/matchbox-wm_0.8.2.oe b/matchbox-wm/matchbox-wm_0.8.2.oe
index 0d215903e2..b71cd287c2 100644
--- a/matchbox-wm/matchbox-wm_0.8.2.oe
+++ b/matchbox-wm/matchbox-wm_0.8.2.oe
@@ -1,7 +1,7 @@
 PR = "r1"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage libxrender startup-notification expat gconf"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
 	file://net-showing-desktop.patch;patch=1"
diff --git a/matchbox-wm/matchbox-wm_0.8.oe b/matchbox-wm/matchbox-wm_0.8.oe
index c1f6a31434..414d6a9cbd 100644
--- a/matchbox-wm/matchbox-wm_0.8.oe
+++ b/matchbox-wm/matchbox-wm_0.8.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage libxrender gconf"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender gconf"
 RDEPENDS = "libmatchbox"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe
index f6733eac7f..58e2be0e3c 100644
--- a/pango/pango_1.2.5.oe
+++ b/pango/pango_1.2.5.oe
@@ -1,4 +1,4 @@
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 xft xt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt"
 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/pango/pango_1.4.0.oe b/pango/pango_1.4.0.oe
index b2643d7680..a4ee82bac2 100644
--- a/pango/pango_1.4.0.oe
+++ b/pango/pango_1.4.0.oe
@@ -1,5 +1,5 @@
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 xft xt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt"
 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/qt/qt-x11-free_3.3.1.oe b/qt/qt-x11-free_3.3.1.oe
index f92de2a043..19413e52e3 100644
--- a/qt/qt-x11-free_3.3.1.oe
+++ b/qt/qt-x11-free_3.3.1.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Qt is a versatile class library for graphical applications." 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.1.tar.bz2"
-DEPENDS = "moc-native x11 xft libpng zlib jpeg sm xinerama xcursor"
+DEPENDS = "moc-native x11 libxft libpng zlib jpeg libsm xinerama libxcursor"
 
 do_configure () {
 	echo "yes" | ./configure -prefix ${prefix} -ipv6 -system-zlib -system-libpng -system-libjpeg
diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe
index 0147072a33..9449a58138 100644
--- a/rosetta/rosetta_cvs.oe
+++ b/rosetta/rosetta_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-DEPENDS = "gtk+ libgpewidget x11 libxrandr xft xinerama xtst xext xau"
+DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xinerama xtst xext xau"
 DESCRIPTION = "Multistroke / full word handwriting recognition for X"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=rosetta \
diff --git a/rxvt-unicode/rxvt-unicode_2.2.oe b/rxvt-unicode/rxvt-unicode_2.2.oe
index d267659740..889fd7a314 100644
--- a/rxvt-unicode/rxvt-unicode_2.2.oe
+++ b/rxvt-unicode/rxvt-unicode_2.2.oe
@@ -1,4 +1,4 @@
-DEPENDS = "x11 xft"
+DEPENDS = "x11 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/rxvt/rxvt_2.7.9.oe b/rxvt/rxvt_2.7.9.oe
index 80df3ed8c6..2860607615 100644
--- a/rxvt/rxvt_2.7.9.oe
+++ b/rxvt/rxvt_2.7.9.oe
@@ -1,5 +1,5 @@
 PR = "r1"
-DEPENDS = "x11 xft"
+DEPENDS = "x11 libxft"
 DESCRIPTION = "Well known terminal emulator"
 
 SRC_URI = "pserver://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/rxvt \
diff --git a/xawtv/xawtv_3.93.oe b/xawtv/xawtv_3.93.oe
index 8e537cb403..dca163126e 100644
--- a/xawtv/xawtv_3.93.oe
+++ b/xawtv/xawtv_3.93.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \
 driver or video4linux.  It also contains various command-line utilities for \
 grabbing images and AVI movies, tuning in TV stations, etc."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "xaw xmu xt xpm xext x11 ncurses xft fs jpeg"
+DEPENDS = "xaw xmu xt xpm xext x11 ncurses libxft fs jpeg"
 
 SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \
 	   file://make.patch;patch=1"
diff --git a/xcomposite/xcomposite_cvs.oe b/xcomposite/xcomposite_cvs.oe
index e69de29bb2..9f648c2987 100644
--- a/xcomposite/xcomposite_cvs.oe
+++ b/xcomposite/xcomposite_cvs.oe
@@ -0,0 +1,17 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+DEPENDS = "x11 compositeext xextensions libxfixes"
+DESCRIPTION = "X Composite extension library."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite"
+S = "${WORKDIR}/Xcomposite"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/xdamage/xdamage_cvs.oe b/xdamage/xdamage_cvs.oe
index e69de29bb2..fc64c570a8 100644
--- a/xdamage/xdamage_cvs.oe
+++ b/xdamage/xdamage_cvs.oe
@@ -0,0 +1,18 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+DEPENDS = "x11 damageext libxfixes xproto"
+DESCRIPTION = "X Damage extension library."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \
+	   file://m4.patch;patch=1"
+S = "${WORKDIR}/Xdamage"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/xkbd/xkbd_0.8.12.oe b/xkbd/xkbd_0.8.12.oe
index e46724a451..9c375c5a41 100644
--- a/xkbd/xkbd_0.8.12.oe
+++ b/xkbd/xkbd_0.8.12.oe
@@ -4,6 +4,6 @@ SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}.tar.gz \
 
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11"
-DEPENDS = "xpm xtst xft"
+DEPENDS = "xpm xtst libxft"
 
 inherit autotools
diff --git a/xt/xt_cvs.oe b/xt/xt_cvs.oe
index e69de29bb2..60f711c8ec 100644
--- a/xt/xt_cvs.oe
+++ b/xt/xt_cvs.oe
@@ -0,0 +1,15 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 libsm"
+DESCRIPTION = "X Toolkit Intrinsics"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt"
+S = "${WORKDIR}/Xt"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/xtscal/xtscal_0.4.oe b/xtscal/xtscal_0.4.oe
index 99e521d912..3852a6669f 100644
--- a/xtscal/xtscal_0.4.oe
+++ b/xtscal/xtscal_0.4.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Touchscreen calibration utility"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
-DEPENDS = "x11 xft libxrandr"
+DEPENDS = "x11 libxft libxrandr"
 
 SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2"
 
diff --git a/xtscal/xtscal_0.5.1.oe b/xtscal/xtscal_0.5.1.oe
index e69de29bb2..21d6eeb440 100644
--- a/xtscal/xtscal_0.5.1.oe
+++ b/xtscal/xtscal_0.5.1.oe
@@ -0,0 +1,8 @@
+DESCRIPTION = "Touchscreen calibration utility"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+DEPENDS = "x11 libxft libxrandr xcalibrate"
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/xtscal/xtscal_0.5.oe b/xtscal/xtscal_0.5.oe
index e69de29bb2..21d6eeb440 100644
--- a/xtscal/xtscal_0.5.oe
+++ b/xtscal/xtscal_0.5.oe
@@ -0,0 +1,8 @@
+DESCRIPTION = "Touchscreen calibration utility"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+DEPENDS = "x11 libxft libxrandr xcalibrate"
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2"
+
+inherit autotools