Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Perez de Castro <aperez@igalia.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/3] package/webkitgtk: propagate microblaze dependency
Date: Sat, 16 Feb 2019 15:45:30 +0200	[thread overview]
Message-ID: <20190216134530.14717-4-aperez@igalia.com> (raw)
In-Reply-To: <20190216134530.14717-1-aperez@igalia.com>

The woff2 package is disabled for Microblaze, therefore disable
the support for WOFF2 web fonts in webkitgtk and make it optional.
Note that the support for other web fonts formats (OTF, TTF, WOFF1)
will still work normally and only WOFF2 gets disabled.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/webkitgtk/Config.in    |  2 +-
 package/webkitgtk/webkitgtk.mk | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index 8714677b6a..2f466a37d4 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -59,7 +59,7 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_WEBP
 	select BR2_PACKAGE_WEBP_DEMUX
-	select BR2_PACKAGE_WOFF2
+	select BR2_PACKAGE_WOFF2 if !BR2_microblaze # woff2 -> brotli
 	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index c17bbc8028..54159d7f47 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
 	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
-	libtasn1 libxml2 libxslt sqlite webp woff2
+	libtasn1 libxml2 libxslt sqlite webp
 WEBKITGTK_CONF_OPTS = \
 	-DENABLE_API_TESTS=OFF \
 	-DENABLE_GEOLOCATION=OFF \
@@ -24,8 +24,7 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_SPELLCHECK=ON \
 	-DPORT=GTK \
 	-DUSE_LIBNOTIFY=OFF \
-	-DUSE_LIBHYPHEN=OFF \
-	-DUSE_WOFF2=ON
+	-DUSE_LIBHYPHEN=OFF
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
 WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
@@ -98,4 +97,11 @@ else
 WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_WOFF2),y)
+WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=ON
+WEBKITGTK_DEPENDENCIES += woff2
+else
+WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=OFF
+endif
+
 $(eval $(cmake-package))
-- 
2.20.1

  parent reply	other threads:[~2019-02-16 13:45 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-16 13:45 [Buildroot] [PATCH 0/3] Disable brotli for Microblaze and propagate dependecies Adrian Perez de Castro
2019-02-16 13:45 ` [Buildroot] [PATCH 1/3] package/brotli: disable for microblaze Adrian Perez de Castro
2019-02-16 13:45 ` [Buildroot] [PATCH 2/3] package/woff2: propagate microblaze dependecy Adrian Perez de Castro
2019-02-16 13:45 ` Adrian Perez de Castro [this message]
2019-02-19 22:25   ` [Buildroot] [PATCH 3/3] package/webkitgtk: propagate microblaze dependency Arnout Vandecappelle
2019-02-22  9:50     ` Adrian Perez de Castro

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=20190216134530.14717-4-aperez@igalia.com \
    --to=aperez@igalia.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