summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-23 10:54:25 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:01 +0000
commit07a3c710b26764591845e4d44692fd89d743be65 (patch)
treeb68fea53b1c01136cd27b36a1f898fa0026bbffd
parent73cc8b8726cbf7a69c777d4b24b051805ce92e3b (diff)
downloadpoky-07a3c710b26764591845e4d44692fd89d743be65.tar.gz
harfbuzz: add explicit dependency on fontconfig
The fontconfig dependency was previously met indirectly (via cairo). (From OE-Core rev: 0b8f54373698f4ae51f42c417f2cae566a3e9ed0) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_1.2.1.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.1.bb
index f88e634080..fead2d3794 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
8 file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ 8 file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \
9" 9"
10 10
11DEPENDS = "glib-2.0 cairo freetype" 11DEPENDS = "glib-2.0 cairo fontconfig freetype"
12 12
13SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" 13SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
14 14
@@ -20,7 +20,13 @@ inherit autotools pkgconfig lib_package
20PACKAGECONFIG ??= "icu" 20PACKAGECONFIG ??= "icu"
21PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" 21PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu"
22 22
23EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2" 23EXTRA_OECONF = " \
24 --with-cairo \
25 --with-fontconfig \
26 --with-freetype \
27 --with-glib \
28 --without-graphite2 \
29"
24 30
25PACKAGES =+ "${PN}-icu ${PN}-icu-dev" 31PACKAGES =+ "${PN}-icu ${PN}-icu-dev"
26 32