From 45b8741f7b138d039e0b1107ba1f1d41f61b5f26 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 9 Aug 2005 23:08:49 +0000
Subject: Third (and hopefully last) EFL revamp before I hand over
maintainership to Justin Patrin. We now have a efl.bbclass that contains
common code for the various libraries. This makes it possible to have very
clean and concise bb's.
---
packages/freetype/freetype-native_2.1.7.bb | 24 ------------------------
packages/freetype/freetype-native_2.1.8.bb | 25 +++++++++++--------------
packages/freetype/freetype_2.1.7.bb | 30 ------------------------------
packages/freetype/freetype_2.1.8.bb | 14 +++++++-------
4 files changed, 18 insertions(+), 75 deletions(-)
delete mode 100644 packages/freetype/freetype-native_2.1.7.bb
delete mode 100644 packages/freetype/freetype_2.1.7.bb
(limited to 'packages/freetype')
diff --git a/packages/freetype/freetype-native_2.1.7.bb b/packages/freetype/freetype-native_2.1.7.bb
deleted file mode 100644
index 673cdb0d02..0000000000
--- a/packages/freetype/freetype-native_2.1.7.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "base"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://configure.patch;patch=1"
-
-inherit autotools pkgconfig native binconfig
-DEPENDS = ""
-FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
-S = "${WORKDIR}/freetype-${PV}"
-PACKAGES = ""
-
-do_configure () {
- (cd builds/unix && gnu-configize) || die "failure running gnu-configize"
- oe_runconf
-}
-
-do_stage () {
- autotools_stage_includes
- oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb
index ba8b59fe4d..64fac71cbe 100644
--- a/packages/freetype/freetype-native_2.1.8.bb
+++ b/packages/freetype/freetype-native_2.1.8.bb
@@ -1,24 +1,21 @@
-SECTION = "libs"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://${FILESDIR}/configure.patch;patch=1"
-
-inherit autotools pkgconfig native binconfig
+include freetype_${PV}.bb
+inherit native
DEPENDS = ""
FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
-S = "${WORKDIR}/freetype-${PV}"
-PACKAGES = ""
-do_configure () {
+EXTRA_OEMAKE=
+
+do_configure() {
(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
oe_runconf
}
-do_stage () {
+do_stage() {
autotools_stage_includes
oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
}
+
+do_install() {
+ :
+}
+
diff --git a/packages/freetype/freetype_2.1.7.bb b/packages/freetype/freetype_2.1.7.bb
deleted file mode 100644
index 751a4ae51c..0000000000
--- a/packages/freetype/freetype_2.1.7.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "libs"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetpye-${PV}.tar.bz2 \
- file://configure.patch;patch=1"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}"
-
-inherit autotools binconfig 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 () {
- autotools_stage_includes
- oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 49f71551dd..5e9db480ea 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -1,21 +1,18 @@
+DESCRIPTION = "Freetype font rendering library"
SECTION = "libs"
LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
file://configure.patch;patch=1"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}"
+S = "${WORKDIR}/freetype-${PV}"
inherit autotools pkgconfig binconfig
LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-do_configure () {
+do_configure() {
cd builds/unix
gnu-configize
aclocal -I .
@@ -24,7 +21,10 @@ do_configure () {
oe_runconf
}
-do_stage () {
+do_stage() {
autotools_stage_includes
oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
--
cgit v1.2.3