Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/21 08:42:47+02:00 uni-frankfurt.de!mickey
remove xft (dup. of libxft although it seems improperly named to me) and let libxft provide xft

BKrev: 40fe2009arlglsWMydBnH_C-y0XBuw

diff --git a/libxft/libxft_2.1.6.oe b/libxft/libxft_2.1.6.oe
index e69de29..632b0a6 100644 (file)
--- a/libxft/libxft_2.1.6.oe
+++ b/libxft/libxft_2.1.6.oe
@@ -0,0 +1,29 @@
+SECTION = "libs"
+DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+
+SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2"
+S = "${WORKDIR}/libXft-${PV}"
+
+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 
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR} \
+              mandir=${STAGING_DATADIR}/man
+}
+
+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/libxft/libxft_cvs.oe b/libxft/libxft_cvs.oe
index e69de29..3415c60 100644 (file)
--- a/libxft/libxft_cvs.oe
+++ b/libxft/libxft_cvs.oe
@@ -0,0 +1,30 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+
+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 
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR} \
+              mandir=${STAGING_DATADIR}/man
+}
+
+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/xft/xft_cvs.oe b/xft/xft_cvs.oe
deleted file mode 100644 (file)
index 5ac2843..0000000
--- a/xft/xft_cvs.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "fontconfig freetype libxrender"
-DESCRIPTION = "X freetype libary (used by the X server)."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xft"
-S = "${WORKDIR}/Xft"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
-              bindir=${STAGING_BINDIR} \
-              includedir=${STAGING_INCDIR} \
-              libdir=${STAGING_LIBDIR} \
-              datadir=${STAGING_DATADIR} \
-              mandir=${STAGING_DATADIR}/man
-}