harfbuzz: upgrade to 2.6.1

Add a (disabled) PACKAGECONFIG for Graphite2.

Update the license checksum for hb-ucd.cc, which for some reason was
checksumming the entire file and not just the license header.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb
similarity index 76%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb
index a90ff522554c6e79294e312099830d18ff75df09..b0f565b9b077e6724aa74c8ce7a54354fad273fe 100644 (file)
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb
@@ -5,25 +5,25 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
 SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e11f5c3149cdec4bb309babb020b32b9 \
-                    file://src/hb-ucd.cc;md5=343f1797944de49ab2b5f5cf3126d3f2"
+                    file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc"
 
 DEPENDS = "glib-2.0 cairo fontconfig freetype"
 
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.xz"
-SRC_URI[md5sum] = "29a310e74a90b4e4f6d62f3e74a571e5"
-SRC_URI[sha256sum] = "fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c"
+SRC_URI[md5sum] = "89b758a2eb14d56a94406cf914b62388"
+SRC_URI[sha256sum] = "c651fb3faaa338aeb280726837c2384064cdc17ef40539228d88a1260960844f"
 
 inherit autotools pkgconfig lib_package gtk-doc
 
 PACKAGECONFIG ??= "icu"
 PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu"
+PACKAGECONFIG[graphite] = "--with-graphite2,--without-graphite2,graphite2"
 
 EXTRA_OECONF = " \
     --with-cairo \
     --with-fontconfig \
     --with-freetype \
     --with-glib \
-    --without-graphite2 \
 "
 
 PACKAGES =+ "${PN}-icu ${PN}-icu-dev"