summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/harfbuzz
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-23 22:20:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-25 16:00:10 +0100
commita96f16835c571c0d9008bcfcc593c7814ed66eaf (patch)
tree024e1e7a22570a09932f9f89fe051ef2cd22bbe0 /meta/recipes-graphics/harfbuzz
parent121b620c0cfb63476ae821792fe5b3585285538e (diff)
downloadpoky-a96f16835c571c0d9008bcfcc593c7814ed66eaf.tar.gz
harfbuzz: convert to meson, enable gobject introspection
The latter is needed for pango update. (From OE-Core rev: ee9f4567563a61e9f614e9405cf5480411890719) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/harfbuzz')
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch27
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch28
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_2.7.1.bb24
3 files changed, 71 insertions, 8 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch
new file mode 100644
index 0000000000..d00656fc88
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch
@@ -0,0 +1,27 @@
1From df5848f423ec0f4b3e519900014349a0c00b1969 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 17 Aug 2020 16:36:03 +0200
4Subject: [PATCH] Do not disable introspection in cross builds.
5
6Yocto can and does support introspection cross builds, through
7running target binaries under qemu emulation.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 src/meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/meson.build b/src/meson.build
16index 1865633..5e1787c 100644
17--- a/src/meson.build
18+++ b/src/meson.build
19@@ -634,7 +634,7 @@ if have_gobject
20 gir = find_program('g-ir-scanner', required: get_option('introspection'))
21 build_gir = gir.found()
22
23- build_gir = build_gir and not meson.is_cross_build()
24+ build_gir = build_gir
25 if not build_gir and get_option('introspection').enabled()
26 error('Introspection support is requested but it isn\'t available in cross builds')
27 endif
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch
new file mode 100644
index 0000000000..4ba4f8b28e
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch
@@ -0,0 +1,28 @@
1From f316b794265f28e89821dfab0772caac1bb6b056 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 18 Aug 2020 10:31:47 +0000
4Subject: [PATCH] src/hb-gobject-enums.cc.tmpl: write out only the filename,
5 not the full path
6
7This is beneficial for reproducible builds, as build paths can vary
8between builds.
9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/hb-gobject-enums.cc.tmpl | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/hb-gobject-enums.cc.tmpl b/src/hb-gobject-enums.cc.tmpl
17index 2ffd1c9..87a11dd 100644
18--- a/src/hb-gobject-enums.cc.tmpl
19+++ b/src/hb-gobject-enums.cc.tmpl
20@@ -43,7 +43,7 @@
21 /*** END file-header ***/
22
23 /*** BEGIN file-production ***/
24-/* enumerations from "@filename@" */
25+/* enumerations from "@basename@" */
26 /*** END file-production ***/
27
28 /*** BEGIN file-tail ***/
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.1.bb
index 08c8f83239..42b3af1ff0 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.1.bb
@@ -10,18 +10,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \
10UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" 10UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
11UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" 11UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
12 12
13SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz" 13SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \
14 file://0001-Do-not-disable-introspection-in-cross-builds.patch \
15 file://0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch \
16 "
14SRC_URI[sha256sum] = "e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569" 17SRC_URI[sha256sum] = "e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569"
15 18
16inherit autotools pkgconfig lib_package gtk-doc 19inherit meson pkgconfig lib_package gtk-doc gobject-introspection
20
21GIR_MESON_ENABLE_FLAG = 'enabled'
22GIR_MESON_DISABLE_FLAG = 'disabled'
23GTKDOC_MESON_ENABLE_FLAG = 'enabled'
24GTKDOC_MESON_DISABLE_FLAG = 'disabled'
17 25
18PACKAGECONFIG ??= "cairo fontconfig freetype glib icu" 26PACKAGECONFIG ??= "cairo fontconfig freetype glib icu"
19PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo" 27PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
20PACKAGECONFIG[fontconfig] = "--with-fontconfig,--without-fontconfig,fontconfig" 28PACKAGECONFIG[fontconfig] = "-Dfontconfig=enabled,-Dfontconfig=disabled,fontconfig"
21PACKAGECONFIG[freetype] = "--with-freetype,--without-freetype,freetype" 29PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype"
22PACKAGECONFIG[glib] = "--with-glib,--without-glib,glib-2.0" 30PACKAGECONFIG[glib] = "-Dglib=enabled,-Dglib=disabled,glib-2.0"
23PACKAGECONFIG[graphite] = "--with-graphite2,--without-graphite2,graphite2" 31PACKAGECONFIG[graphite] = "-Dgraphite=enabled,-Dgraphite=disabled,graphite2"
24PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" 32PACKAGECONFIG[icu] = "-Dicu=enabled,-Dicu=disabled,icu"
25 33
26PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" 34PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset"
27 35