diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-graphics/harfbuzz | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/harfbuzz')
| -rw-r--r-- | poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb (renamed from poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb) | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb index b904d9353..4b292d8ea 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "81dbce82d6471ec2b2a627ce02d03e5d" -SRC_URI[sha256sum] = "a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9" +SRC_URI[md5sum] = "531de9df7c8a5405dd9c6a873fcee8c2" +SRC_URI[sha256sum] = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468" inherit autotools pkgconfig lib_package gtk-doc @@ -27,12 +27,6 @@ EXTRA_OECONF = " \ --without-graphite2 \ " -do_configure_prepend() { - # This is ancient and can get used instead of the patched one we ship, - # so delete it. In 1.8.9 this should be removed upstream. - rm -f ${S}/m4/pkg.m4 -} - PACKAGES =+ "${PN}-icu ${PN}-icu-dev" LEAD_SONAME = "libharfbuzz.so" @@ -43,4 +37,4 @@ FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ ${libdir}/pkgconfig/harfbuzz-icu.pc \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" |