[oe-commits] Ross Burton : poppler: use PACKAGECONFIG to control graphics formats supported

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 42384af9a97cd3975c2f5630d2488677d654d1ac
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=42384af9a97cd3975c2f5630d2488677d654d1ac

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri Jul  4 17:01:21 2014 +0100

poppler: use PACKAGECONFIG to control graphics formats supported

Add explicit PACKAGECONFIG statements for JPEG, PNG and TIFF.  libpng wasn't
previously a direct build dependency but is pulled in via GTK+.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/poppler/poppler_0.22.4.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/poppler/poppler_0.22.4.bb b/meta-oe/recipes-support/poppler/poppler_0.22.4.bb
index 9fd16b5..48fa438 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.22.4.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.22.4.bb
@@ -8,10 +8,15 @@ SRC_URI = " \
 SRC_URI[md5sum] = "49d55921ce795778c7231fe9f2fe923b"
 SRC_URI[sha256sum] = "4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b"
 
-DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms"
+DEPENDS = "fontconfig zlib gtk+ cairo lcms"
 
 inherit autotools pkgconfig gtk-doc
 
+PACKAGECONFIG ??= "jpeg png tiff"
+PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg"
+PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
+PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff"
+
 EXTRA_OECONF = "\
     --enable-xpdf-headers \
     --disable-gtk-test \