diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-03-31 09:07:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-03-31 09:07:54 +0000 |
| commit | 7444b6120542910bb80aa23d5711083b90a544a9 (patch) | |
| tree | 946da983ad94556af1711d1cc96f6cd8bd69fd91 | |
| parent | d11b35a2177e820860f1ac8eee16d854b6a96713 (diff) | |
next round of patches courtesy Philip Blundell
BKrev: 406a8a6aqJa40d9Q6CVpDRIg6XvTBQ
| -rw-r--r-- | gpe/gpe-image.oe | 4 | ||||
| -rw-r--r-- | recordext/recordext-cvs.oe | 0 | ||||
| -rw-r--r-- | xft/xft-cvs.oe | 11 | ||||
| -rw-r--r-- | xserver/xserver-cvs.oe | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/gpe/gpe-image.oe b/gpe/gpe-image.oe index e924fb6e74..a4200767f4 100644 --- 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/recordext/recordext-cvs.oe diff --git a/xft/xft-cvs.oe b/xft/xft-cvs.oe index 66e1d59484..3d9e5ecff2 100644 --- 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 20f7850e14..40de2be420 100644 --- 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" |