diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-05-24 22:21:11 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 10:35:14 +0200 |
commit | 4eeacd92e18b30f3ea662367662b39cd7af32ba9 (patch) | |
tree | a68896bfb4a79f78982999ee80e90c718dca5264 /meta-oe/recipes-support/poppler | |
parent | 81dab589bd0364955cee6ce9660af0097a1874d0 (diff) | |
download | meta-openembedded-4eeacd92e18b30f3ea662367662b39cd7af32ba9.tar.gz |
poppler: update 0.33.0 to and enhance packageconfigs
qt5 packageconfig fixes:
| WARNING: QA Issue: poppler rdepends on qtbase, but it isn't a build dependency? [build-deps]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-support/poppler')
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.33.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.26.5.bb) | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler_0.26.5.bb b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb index d11963961..6e8446b87 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.26.5.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb | |||
@@ -5,17 +5,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | |||
5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
6 | http://poppler.freedesktop.org/${BP}.tar.xz \ | 6 | http://poppler.freedesktop.org/${BP}.tar.xz \ |
7 | " | 7 | " |
8 | SRC_URI[md5sum] = "786c943eee550e3a977c181e7778b1c8" | 8 | SRC_URI[md5sum] = "69927d1614d6704021c0b0dd0ee6a852" |
9 | SRC_URI[sha256sum] = "de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee" | 9 | SRC_URI[sha256sum] = "a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6" |
10 | 10 | ||
11 | DEPENDS = "fontconfig zlib cairo lcms" | 11 | DEPENDS = "fontconfig zlib cairo lcms" |
12 | 12 | ||
13 | inherit autotools pkgconfig gtk-doc | 13 | inherit autotools pkgconfig gtk-doc |
14 | 14 | ||
15 | PACKAGECONFIG ??= "jpeg png tiff" | 15 | PACKAGECONFIG ??= "jpeg openjpeg png tiff ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" |
16 | PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg" | 16 | PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg" |
17 | PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" | 17 | PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" |
18 | PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" | 18 | PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" |
19 | PACKAGECONFIG[curl] = "--enable-libcurl,--disable-libcurl,curl" | ||
20 | PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg,openjpeg" | ||
21 | PACKAGECONFIG[qt5] = "--enable-poppler-qt5,--disable-poppler-qt5,qtbase" | ||
19 | 22 | ||
20 | EXTRA_OECONF = "\ | 23 | EXTRA_OECONF = "\ |
21 | --enable-xpdf-headers \ | 24 | --enable-xpdf-headers \ |