summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihai Prica <mihai.prica@intel.com>2013-08-22 13:53:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 11:47:18 +0100
commit12d4ee1af749f7a421f269a5b5b10e7365f4f636 (patch)
treecb269c3dba026424de6548e270b9303dafc1e069
parentb55f92397503ab5b637e3d511f1497e6a07702b6 (diff)
downloadpoky-12d4ee1af749f7a421f269a5b5b10e7365f4f636.tar.gz
harfbuzz: upgrade to v0.9.19
Remove the disable_graphite.patch because the --without-graphite2 configure option can be used instead. Split package into harfbuzz and harfbuzz-icu. The ICU support is now built into a separate library that will be shipped in a different package. (From OE-Core rev: c93d147e0889ac91a01e3570f818624f68b3c8e8) Signed-off-by: Mihai Prica <mihai.prica@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch15
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb)18
2 files changed, 13 insertions, 20 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
deleted file mode 100644
index 49938ba1a4..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac
5--- harfbuzz-0.9.10/configure.ac 2013-01-03 08:08:51.000000000 +0200
6+++ harfbuzz-0.9.10/configure.ac 2013-01-09 08:18:04.812529418 +0200
7@@ -185,7 +185,7 @@
8
9 dnl ==========================================================================
10
11-PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false)
12+have_graphite=false
13 if $have_graphite; then
14 AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library])
15 fi
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb
index 968d8a2818..daf7273e96 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb
@@ -13,17 +13,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
13 13
14SECTION = "libs" 14SECTION = "libs"
15 15
16PR = "r0"
17
18SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ 16SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
19 file://disable_graphite.patch \
20" 17"
21 18
22SRC_URI[md5sum] = "c48827713e93539dc7285f9e86ffbdc5" 19SRC_URI[md5sum] = "9782581ee6ef972554772e84ca448131"
23SRC_URI[sha256sum] = "a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed" 20SRC_URI[sha256sum] = "d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35"
24 21
25inherit autotools pkgconfig 22inherit autotools pkgconfig
26 23
27DEPENDS = "icu glib-2.0 cairo freetype" 24DEPENDS = "icu glib-2.0 cairo freetype"
28 25
29BBCLASSEXTEND = "native" 26BBCLASSEXTEND = "native"
27
28EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --with-icu --without-graphite2"
29
30PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev"
31
32FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*"
33FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*"
34FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
35 ${libdir}/libharfbuzz-icu.so \
36 ${libdir}/pkgconfig/harfbuzz-icu.pc \
37"