From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency
Date: Thu, 1 Oct 2020 22:26:25 +0200 [thread overview]
Message-ID: <20201001202626.1354496-2-fontaine.fabrice@gmail.com> (raw)
In-Reply-To: <20201001202626.1354496-1-fontaine.fabrice@gmail.com>
harfbuzz is an optional dependency (enabled by default) since version
2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=86026a47b345a8c254dd5e6be77bf116737cdafb
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/freetype/freetype.mk | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 428531ed08..b0aba78c51 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -15,7 +15,11 @@ FREETYPE_DEPENDENCIES = host-pkgconf
FREETYPE_CONFIG_SCRIPTS = freetype-config
HOST_FREETYPE_DEPENDENCIES = host-pkgconf
-HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png
+HOST_FREETYPE_CONF_OPTS = \
+ --without-bzip2 \
+ --without-harfbuzz \
+ --without-png \
+ --without-zlib
# since 2.9.1 needed for freetype-config install
FREETYPE_CONF_OPTS += --enable-freetype-config
@@ -35,6 +39,13 @@ else
FREETYPE_CONF_OPTS += --without-bzip2
endif
+ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
+FREETYPE_DEPENDENCIES += harfbuzz
+FREETYPE_CONF_OPTS += --with-harbuzz
+else
+FREETYPE_CONF_OPTS += --without-harfbuzz
+endif
+
ifeq ($(BR2_PACKAGE_LIBPNG),y)
FREETYPE_DEPENDENCIES += libpng
FREETYPE_CONF_OPTS += --with-png
--
2.28.0
next prev parent reply other threads:[~2020-10-01 20:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 20:26 [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Fabrice Fontaine
2020-10-01 20:26 ` Fabrice Fontaine [this message]
2020-10-03 6:50 ` [Buildroot] [PATCH 2/3] package/freetype: add harfbuzz optional dependency Peter Korsgaard
2020-10-01 20:26 ` [Buildroot] [PATCH 3/3] package/freetype: add brotli " Fabrice Fontaine
2020-10-03 6:49 ` Peter Korsgaard
2020-10-01 20:58 ` [Buildroot] [PATCH 1/3] package/freetype: drop libpng workaround Yann E. MORIN
2020-10-03 6:49 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201001202626.1354496-2-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox