diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
| commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
| tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /freetype | |
| parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) | |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'freetype')
| -rw-r--r-- | freetype/freetype-native_2.1.7.oe | 2 | ||||
| -rw-r--r-- | freetype/freetype_2.1.7.oe | 2 | ||||
| -rw-r--r-- | freetype/freetype_2.1.8.oe | 34 |
3 files changed, 36 insertions, 2 deletions
diff --git a/freetype/freetype-native_2.1.7.oe b/freetype/freetype-native_2.1.7.oe index c617a979c2..b8f268a4fd 100644 --- a/freetype/freetype-native_2.1.7.oe +++ b/freetype/freetype-native_2.1.7.oe @@ -1,7 +1,7 @@ DESCRIPTION = "Freetype font rendering library" SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" inherit autotools pkgconfig native DEPENDS = "patcher-native" diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe index 9bc538ede9..246e9c5e7a 100644 --- a/freetype/freetype_2.1.7.oe +++ b/freetype/freetype_2.1.7.oe @@ -2,7 +2,7 @@ DESCRIPTION = "Freetype font rendering library" DEPENDS = "virtual/libc" SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += " ${bindir}" diff --git a/freetype/freetype_2.1.8.oe b/freetype/freetype_2.1.8.oe index e69de29bb2..246e9c5e7a 100644 --- a/freetype/freetype_2.1.8.oe +++ b/freetype/freetype_2.1.8.oe @@ -0,0 +1,34 @@ +DESCRIPTION = "Freetype font rendering library" +DEPENDS = "virtual/libc" + +SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ + file://configure.patch;patch=1" + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += " ${bindir}" + +inherit autotools pkgconfig + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" + +do_configure () { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_stage () { + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} + + cp -a ${S}/include/*.h ${STAGING_INCDIR} + install -d ${STAGING_INCDIR}/freetype2 + cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/ + + sed -e 's,${prefix},${STAGING_LIBDIR}/..,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config + chmod u+x ${STAGING_BINDIR}/freetype-config +} + |