From: Chris Larson <clarson@kergoth.com>
Date: Fri, 13 Aug 2004 00:38:06 +0000 (+0000)
Subject: Merge handhelds.org:/home/kergoth/code/packages.modified
X-Git-Tag: Release-2010-05/1~17685
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9bd0f745555d7e810276a019a9bb51d887a2b2f;p=openembedded.git

Merge handhelds.org:/home/kergoth/code/packages.modified
into handhelds.org:/home/kergoth/code/packages

2004/08/12 19:30:14-05:00 handhelds.org!kergoth
FILESPATH set updates in the libc initial passes.

2004/08/12 19:04:35-05:00 handhelds.org!kergoth
Add items to DEPENDS for cairo and libsvg, and add an xsvg build thats disabled until we add xcursor.

BKrev: 411c0d6eEU7oPEPIt2OnuiPKMACUlA
---

diff --git a/cairo/cairo_cvs.oe b/cairo/cairo_cvs.oe
index e69de29bb2..304d9d7d66 100644
--- a/cairo/cairo_cvs.oe
+++ b/cairo/cairo_cvs.oe
@@ -0,0 +1,16 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+# DEPENDS = "x11 libpixman libpng fontconfig xcb glitz"
+DEPENDS = "x11 libpixman libpng fontconfig"
+DESCRIPTION = "Cairo graphics library"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
+S = "${WORKDIR}/cairo"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/cairo/libsvg_cvs.oe b/cairo/libsvg_cvs.oe
index e69de29bb2..b29b2fb0f4 100644
--- a/cairo/libsvg_cvs.oe
+++ b/cairo/libsvg_cvs.oe
@@ -0,0 +1,15 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "libxml2 jpeg"
+DESCRIPTION = "SVG parser library"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg"
+S = "${WORKDIR}/libsvg"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/cairo/xsvg_cvs.oe b/cairo/xsvg_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/glibc/glibc-initial_2.3.2+cvs20040726.oe b/glibc/glibc-initial_2.3.2+cvs20040726.oe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/glibc/glibc-initial_2.3.2.oe b/glibc/glibc-initial_2.3.2.oe
index 7508ad0fad..e3b0c4e3c2 100644
--- a/glibc/glibc-initial_2.3.2.oe
+++ b/glibc/glibc-initial_2.3.2.oe
@@ -2,7 +2,7 @@ include glibc_${PV}.oe
 
 DEPENDS = "patcher-native linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '%s/glibc-%s' % (os.path.dirname(oe.data.getVar('FILE', d, 1)), oe.data.getVar('PV', d, 1)) ], d)}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
 
diff --git a/glibc/glibc-initial_cvs.oe b/glibc/glibc-initial_cvs.oe
index 6ca2af6ce4..18e27dfbdf 100644
--- a/glibc/glibc-initial_cvs.oe
+++ b/glibc/glibc-initial_cvs.oe
@@ -2,7 +2,7 @@ include glibc_${PV}.oe
 
 DEPENDS = "patcher-native linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '%s/glibc-cvs' % os.path.dirname(oe.data.getVar('FILE', d, 1)) ], d)}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
 
diff --git a/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe b/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe
index 8ff9aecbe3..3cf18a0a87 100644
--- a/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe
+++ b/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe
@@ -1,6 +1,6 @@
 include uclibc-snapshot_cvs.oe
 
-FILESPATH = "${@base_set_filespath([ '%s/uclibc-snapshot' % os.path.dirname(oe.data.getVar('FILE', d, 1)) ], d)}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-snapshot', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 DEPENDS = "patcher-native linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
diff --git a/uclibc/uclibc-initial_0.9.26.oe b/uclibc/uclibc-initial_0.9.26.oe
index f7f1292486..a527178d26 100644
--- a/uclibc/uclibc-initial_0.9.26.oe
+++ b/uclibc/uclibc-initial_0.9.26.oe
@@ -1,6 +1,6 @@
 include uclibc_${PV}.oe
 
-FILESPATH = "${@base_set_filespath([ '%s/uclibc-%s' % (os.path.dirname(oe.data.getVar('FILE', d, 1)), oe.data.getVar('PV', d, 1)) ], d)}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 DEPENDS = "patcher-native linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"