From ad1e179aedffb5191192a0bd609f428c2696d797 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 11 Oct 2022 15:58:12 +0800 Subject: harfbuzz: upgrade 5.1.0 -> 5.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0001-fix-signedness-of-char-in-tests.patch removed since it's included in new version. Changelog: =========== Don’t add glyphs from dropped MATH or COLR tables to the subset glyphs. Map rlig to appropriate AAT feature selectors. Update USE data files to latest version. Check CBDT extents first before outline tables, to help with fonts that also include an empty glyf table. More work towards variable font instancing in the subsetter. Subsetter repacker improvements. New API: +hb_ot_layout_lookup_get_optical_bound() +hb_face_builder_sort_tables() (From OE-Core rev: 1f8b032924af08ead969c2baaf26a66bc2f134b7) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-fix-signedness-of-char-in-tests.patch | 27 ------------- meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb | 47 ---------------------- meta/recipes-graphics/harfbuzz/harfbuzz_5.3.0.bb | 45 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_5.3.0.bb (limited to 'meta') diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch deleted file mode 100644 index 029ca2bfff..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1bd3884bc0544ffbb6545ed2391f0932bb8d7d91 Mon Sep 17 00:00:00 2001 -From: psykose -Date: Mon, 1 Aug 2022 07:45:25 +0000 -Subject: [PATCH] fix signedness of char in tests - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - src/test-repacker.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test-repacker.cc b/src/test-repacker.cc -index 053c0c6..1b7e1f0 100644 ---- a/src/test-repacker.cc -+++ b/src/test-repacker.cc -@@ -112,9 +112,9 @@ static void start_lookup (int8_t type, - hb_serialize_context_t* c) - { - char lookup[] = { -- 0, type, // type -+ 0, (char)type, // type - 0, 0, // flag -- 0, num_subtables, // num subtables -+ 0, (char)num_subtables, // num subtables - }; - - start_object (lookup, 6, c); diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb deleted file mode 100644 index 4905e8e2ad..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb +++ /dev/null @@ -1,47 +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=6ee0f16281694fb6aa689cca1e0fb3da \ - file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ - " - -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-fix-signedness-of-char-in-tests.patch \ - " -SRC_URI[sha256sum] = "2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05" - -inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_ENABLE_FLAG = 'enabled' -GTKDOC_MESON_DISABLE_FLAG = 'disabled' - -PACKAGECONFIG ??= "cairo freetype glib icu" -PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" -PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype" -PACKAGECONFIG[glib] = "-Dglib=enabled,-Dglib=disabled,glib-2.0" -PACKAGECONFIG[graphite] = "-Dgraphite=enabled,-Dgraphite=disabled,graphite2" -PACKAGECONFIG[icu] = "-Dicu=enabled,-Dicu=disabled,icu" - -PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" - -LEAD_SONAME = "libharfbuzz.so" - -do_install:append() { - # If no tools are installed due to PACKAGECONFIG then this directory is - #still installed, so remove it to stop packaging wanings. - rmdir --ignore-fail-on-non-empty ${D}${bindir} -} - -FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" -FILES:${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ - ${libdir}/libharfbuzz-icu.so \ - ${libdir}/pkgconfig/harfbuzz-icu.pc \ -" -FILES:${PN}-subset = "${libdir}/libharfbuzz-subset.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_5.3.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_5.3.0.bb new file mode 100644 index 0000000000..1c21610fb5 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_5.3.0.bb @@ -0,0 +1,45 @@ +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=6ee0f16281694fb6aa689cca1e0fb3da \ + file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ + " + +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "a05e19e3f52da24ed071522f0fddf872157d7d25e869cfd156cd6f1e81c42152" + +inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' + +PACKAGECONFIG ??= "cairo freetype glib icu" +PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" +PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype" +PACKAGECONFIG[glib] = "-Dglib=enabled,-Dglib=disabled,glib-2.0" +PACKAGECONFIG[graphite] = "-Dgraphite=enabled,-Dgraphite=disabled,graphite2" +PACKAGECONFIG[icu] = "-Dicu=enabled,-Dicu=disabled,icu" + +PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" + +LEAD_SONAME = "libharfbuzz.so" + +do_install:append() { + # If no tools are installed due to PACKAGECONFIG then this directory is + #still installed, so remove it to stop packaging wanings. + rmdir --ignore-fail-on-non-empty ${D}${bindir} +} + +FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" +FILES:${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ + ${libdir}/libharfbuzz-icu.so \ + ${libdir}/pkgconfig/harfbuzz-icu.pc \ +" +FILES:${PN}-subset = "${libdir}/libharfbuzz-subset.so.*" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf