summaryrefslogtreecommitdiff
path: root/package/cairo
diff options
context:
space:
mode:
authorJérôme Pouiller <jezz@sysmic.org>2014-09-12 17:50:10 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-09-13 09:22:27 +0200
commitdaf4820c8527c54dfbc44d4982ad04dff9650e04 (patch)
tree4963818626c78a835ce3f8682181a46dba62f218 /package/cairo
parentefba6339b5211c1e2c1a3888509e6f020f385c76 (diff)
directfb: allow SVG support
DirectFB SVG support rely on Cairo and Cairo depends on DirectFB. Since Cairo DirectFB backend is marked as experimental, this patch choose to disable this backend when DirectFB SVG support is enable. In add, this patch may solve some tricky situations between DirectFB and Cairo (see http://sysmic.org/~jezz/results/c2f11fc0) and improve build reproducibility. [Peter: propagate atomics dependency, needs libsvg-cairo, add cairo includes] Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/cairo')
-rw-r--r--package/cairo/cairo.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index a4c71b681..bcc0c262f 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -48,7 +48,10 @@ CAIRO_CONF_OPT = \
CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman
-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on
+# DirectFB. Break circular dependency by disabling DirectFB support in Cairo
+# (which is experimental)
+ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx)
CAIRO_CONF_OPT += --enable-directfb
CAIRO_DEPENDENCIES += directfb
else