diff options
author | Ross Burton <ross.burton@intel.com> | 2014-07-04 17:01:21 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-15 15:00:01 +0200 |
commit | 42384af9a97cd3975c2f5630d2488677d654d1ac (patch) | |
tree | e110690bf5a59c114567f6998e723f86dc6a2909 | |
parent | 8b22d8a754dae37812679e9354c88bf642e1abef (diff) | |
download | meta-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.bb | 7 |
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 = " \ | |||
8 | SRC_URI[md5sum] = "49d55921ce795778c7231fe9f2fe923b" | 8 | SRC_URI[md5sum] = "49d55921ce795778c7231fe9f2fe923b" |
9 | SRC_URI[sha256sum] = "4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b" | 9 | SRC_URI[sha256sum] = "4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b" |
10 | 10 | ||
11 | DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms" | 11 | DEPENDS = "fontconfig zlib gtk+ cairo lcms" |
12 | 12 | ||
13 | inherit autotools pkgconfig gtk-doc | 13 | inherit autotools pkgconfig gtk-doc |
14 | 14 | ||
15 | PACKAGECONFIG ??= "jpeg png tiff" | ||
16 | PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg" | ||
17 | PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" | ||
18 | PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" | ||
19 | |||
15 | EXTRA_OECONF = "\ | 20 | EXTRA_OECONF = "\ |
16 | --enable-xpdf-headers \ | 21 | --enable-xpdf-headers \ |
17 | --disable-gtk-test \ | 22 | --disable-gtk-test \ |