summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-04 17:01:21 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-15 15:00:01 +0200
commit42384af9a97cd3975c2f5630d2488677d654d1ac (patch)
treee110690bf5a59c114567f6998e723f86dc6a2909
parent8b22d8a754dae37812679e9354c88bf642e1abef (diff)
downloadmeta-openembedded-42384af9a97cd3975c2f5630d2488677d654d1ac.tar.gz
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@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.22.4.bb7
1 files changed, 6 insertions, 1 deletions
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 9fd16b537..48fa4384f 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 = " \
8SRC_URI[md5sum] = "49d55921ce795778c7231fe9f2fe923b" 8SRC_URI[md5sum] = "49d55921ce795778c7231fe9f2fe923b"
9SRC_URI[sha256sum] = "4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b" 9SRC_URI[sha256sum] = "4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b"
10 10
11DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms" 11DEPENDS = "fontconfig zlib gtk+ cairo lcms"
12 12
13inherit autotools pkgconfig gtk-doc 13inherit autotools pkgconfig gtk-doc
14 14
15PACKAGECONFIG ??= "jpeg png tiff"
16PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg"
17PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
18PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff"
19
15EXTRA_OECONF = "\ 20EXTRA_OECONF = "\
16 --enable-xpdf-headers \ 21 --enable-xpdf-headers \
17 --disable-gtk-test \ 22 --disable-gtk-test \