Patchwork [2/3] poppler: use PACKAGECONFIG to control graphics formats supported

login
register
mail settings
Submitter Ross Burton
Date July 4, 2014, 4:01 p.m.
Message ID <1404489682-30529-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/75041/
State Accepted, archived
Headers show

Comments

Ross Burton - July 4, 2014, 4:01 p.m.
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@intel.com>
---
 meta-oe/recipes-support/poppler/poppler_0.22.4.bb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

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 bdd4144..a192882 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 \