From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 13 Oct 2016 01:13:55 +0000 (-0300)
Subject: poppler: add explicit libglib2 support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d0a731d8f3e0314e579523fdcb9812ea737bd7e;p=buildroot.git

poppler: add explicit libglib2 support

Evince needs poppler-glib support (when poppler is enabled, for PDF
reading support), so add explicit handling to the package.
And poppler-glib requires cairo output, hence the conditional on both
libglib2 and cairo to enable it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 4632d8dd0c..172c428c63 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -28,6 +28,13 @@ else
 POPPLER_CONF_OPTS += --enable-cms=none
 endif
 
+ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy)
+POPPLER_CONF_OPTS += --enable-poppler-glib
+POPPLER_DEPENDENCIES += libglib2
+else
+POPPLER_CONF_OPTS += --disable-poppler-glib
+endif
+
 ifeq ($(BR2_PACKAGE_TIFF),y)
 POPPLER_CONF_OPTS += --enable-libtiff
 # Help poppler to find libtiff in static linking scenarios