summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
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:26:02 +0100
commitc93d147e0889ac91a01e3570f818624f68b3c8e8 (patch)
tree1e1bfe9755ed76c3f6ff61f41c76ea4581a6b37f /meta/recipes-graphics
parent3b4f5c4153c0af0e5205d9c30e4b7265c36079d3 (diff)
downloadopenembedded-core-c93d147e0889ac91a01e3570f818624f68b3c8e8.tar.gz
openembedded-core-c93d147e0889ac91a01e3570f818624f68b3c8e8.tar.bz2
openembedded-core-c93d147e0889ac91a01e3570f818624f68b3c8e8.zip
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. Signed-off-by: Mihai Prica <mihai.prica@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics')
-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 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac
---- harfbuzz-0.9.10/configure.ac 2013-01-03 08:08:51.000000000 +0200
-+++ harfbuzz-0.9.10/configure.ac 2013-01-09 08:18:04.812529418 +0200
-@@ -185,7 +185,7 @@
-
- dnl ==========================================================================
-
--PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false)
-+have_graphite=false
- if $have_graphite; then
- AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library])
- 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 \
SECTION = "libs"
-PR = "r0"
-
SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
- file://disable_graphite.patch \
"
-SRC_URI[md5sum] = "c48827713e93539dc7285f9e86ffbdc5"
-SRC_URI[sha256sum] = "a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed"
+SRC_URI[md5sum] = "9782581ee6ef972554772e84ca448131"
+SRC_URI[sha256sum] = "d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35"
inherit autotools pkgconfig
DEPENDS = "icu glib-2.0 cairo freetype"
BBCLASSEXTEND = "native"
+
+EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --with-icu --without-graphite2"
+
+PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev"
+
+FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*"
+FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*"
+FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
+ ${libdir}/libharfbuzz-icu.so \
+ ${libdir}/pkgconfig/harfbuzz-icu.pc \
+"