diff options
author | Ross Burton <ross.burton@intel.com> | 2013-11-11 17:25:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-12 16:00:26 +0000 |
commit | feba094ec3b02a0a0589d509b1d621f4dbf98ebe (patch) | |
tree | 7869b2935124bf08bf9ada388192e5f97c4874ff | |
parent | 65ca5cb1640901211746e812d9fbbe3daafb33b7 (diff) | |
download | poky-feba094ec3b02a0a0589d509b1d621f4dbf98ebe.tar.gz |
freetype: upgrade to 2.5.0.1
Add disabled-by-default PACKAGECONFIG for pixmap glyphs (floating dependency on
libpng).
(From OE-Core rev: 7cbf6060ac14b0f4d2f038f821ca980be0d46cb0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.5.0.1.bb (renamed from meta/recipes-graphics/freetype/freetype_2.4.12.bb) | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.12.bb b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb index 701c629ddc..0b69af9a49 100644 --- a/meta/recipes-graphics/freetype/freetype_2.4.12.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb | |||
@@ -13,12 +13,11 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 | |||
13 | 13 | ||
14 | SECTION = "libs" | 14 | SECTION = "libs" |
15 | 15 | ||
16 | |||
17 | SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ | 16 | SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ |
18 | " | 17 | " |
19 | 18 | ||
20 | SRC_URI[md5sum] = "3463102764315eb86c0d3c2e1f3ffb7d" | 19 | SRC_URI[md5sum] = "c72e9010b1d986d556fc0b2b5fcbf31a" |
21 | SRC_URI[sha256sum] = "a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381" | 20 | SRC_URI[sha256sum] = "57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5" |
22 | 21 | ||
23 | S = "${WORKDIR}/freetype-${PV}" | 22 | S = "${WORKDIR}/freetype-${PV}" |
24 | 23 | ||
@@ -29,6 +28,9 @@ EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" | |||
29 | EXTRA_OEMAKE_class-native = "" | 28 | EXTRA_OEMAKE_class-native = "" |
30 | EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'" | 29 | EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'" |
31 | 30 | ||
31 | PACKAGECONFIG ??= "" | ||
32 | PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" | ||
33 | |||
32 | do_configure() { | 34 | do_configure() { |
33 | cd builds/unix | 35 | cd builds/unix |
34 | libtoolize --force --copy | 36 | libtoolize --force --copy |