next round of patches courtesy Philip Blundell

BKrev: 406a8a6aqJa40d9Q6CVpDRIg6XvTBQ

diff --git a/gpe/gpe-image.oe b/gpe/gpe-image.oe
index e924fb6..a420076 100644 (file)
--- a/gpe/gpe-image.oe
+++ b/gpe/gpe-image.oe
@@ -2,7 +2,7 @@ DEPENDS = 'glibc base-files base-passwd-3.5.7 \
           busybox dropbear hotplug ifupdown ipkg initscripts strace \
           netbase tslib module-init-tools resolvconf sysvinit tinylogin \
           diet-x11-cvs xserver matchbox-wm matchbox-desktop matchbox-panel \
-          meta-gpe prelink'
+          meta-gpe prelink ttf-bitstream-vera'
 
 export IPKG_INSTALL = 'base-files base-passwd \
                      busybox dropbear \
@@ -10,6 +10,6 @@ export IPKG_INSTALL = 'base-files base-passwd \
                      initscripts kernel-modules \
                      netbase resolvconf \
                      tslib libgcc1 sysvinit tinylogin xserver-kdrive-fbdev \
-                     gpe-task-base'
+                     gpe-task-base prelink ttf-bitstream-vera pango-module-basic-xft'
 
 inherit image_ipk

diff --git a/recordext/recordext-cvs.oe b/recordext/recordext-cvs.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xft/xft-cvs.oe b/xft/xft-cvs.oe
index 66e1d59..3d9e5ec 100644 (file)
--- a/xft/xft-cvs.oe
+++ b/xft/xft-cvs.oe
@@ -7,6 +7,11 @@ DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xft"
 S = "${WORKDIR}/Xft"
 
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+               ${libdir}/*.a ${libdir}/pkgconfig \
+               ${datadir}/aclocal ${bindir} ${sbindir}
+
 inherit autotools pkgconfig libtool
 
 do_stage() {
@@ -17,3 +22,9 @@ do_stage() {
               datadir=/share
               prefix=
 }
+
+python do_package() {
+        if oe.data.getVar('DEBIAN_NAMES', d, 1):
+            oe.data.setVar('PKG_${PN}', 'libxft2', d)
+        oe.build.exec_func('package_do_package', d)
+}

diff --git a/xserver/xserver-cvs.oe b/xserver/xserver-cvs.oe
index 20f7850..40de2be 100644 (file)
--- a/xserver/xserver-cvs.oe
+++ b/xserver/xserver-cvs.oe
@@ -1,5 +1,4 @@
 PV = "0.0cvs${CVSDATE}"
-RDEPENDS = "libc6"
 DEPENDS = "virtual/libc tslib xproto xdmcp xextensions xtrans xau x11 xext randr render xrender xrandr fixesext damageext xfont resourceext compositeext"
 PROVIDES = "xserver"
 PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-ati ${PN}-doc ${PN}-dev ${PN}-locale"