From 57428a8f146841755d3b9eaef1382f60813e5a3a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 4 Sep 2019 18:10:49 +0100 Subject: 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. (From OE-Core rev: 6e097c853f17ec76b61440bb868371ddf6a8e977) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb | 39 ------------------------ meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb | 39 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb deleted file mode 100644 index a90ff52255..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Text shaping library" -DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" -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" - -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" - -inherit autotools pkgconfig lib_package gtk-doc - -PACKAGECONFIG ??= "icu" -PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" - -EXTRA_OECONF = " \ - --with-cairo \ - --with-fontconfig \ - --with-freetype \ - --with-glib \ - --without-graphite2 \ -" - -PACKAGES =+ "${PN}-icu ${PN}-icu-dev" - -LEAD_SONAME = "libharfbuzz.so" - -FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" -FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ - ${libdir}/libharfbuzz-icu.so \ - ${libdir}/pkgconfig/harfbuzz-icu.pc \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb new file mode 100644 index 0000000000..b0f565b9b0 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Text shaping library" +DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" +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;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] = "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 \ +" + +PACKAGES =+ "${PN}-icu ${PN}-icu-dev" + +LEAD_SONAME = "libharfbuzz.so" + +FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" +FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ + ${libdir}/libharfbuzz-icu.so \ + ${libdir}/pkgconfig/harfbuzz-icu.pc \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg