From 4eeacd92e18b30f3ea662367662b39cd7af32ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 24 May 2015 22:21:11 +0200 Subject: [PATCH] poppler: update 0.33.0 to and enhance packageconfigs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../poppler/{poppler_0.26.5.bb => poppler_0.33.0.bb} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/poppler/{poppler_0.26.5.bb => poppler_0.33.0.bb} (69%) diff --git a/meta-oe/recipes-support/poppler/poppler_0.26.5.bb b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb similarity index 69% rename from meta-oe/recipes-support/poppler/poppler_0.26.5.bb rename to meta-oe/recipes-support/poppler/poppler_0.33.0.bb index d11963961c..6e8446b872 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" SRC_URI = " \ http://poppler.freedesktop.org/${BP}.tar.xz \ " -SRC_URI[md5sum] = "786c943eee550e3a977c181e7778b1c8" -SRC_URI[sha256sum] = "de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee" +SRC_URI[md5sum] = "69927d1614d6704021c0b0dd0ee6a852" +SRC_URI[sha256sum] = "a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6" DEPENDS = "fontconfig zlib cairo lcms" inherit autotools pkgconfig gtk-doc -PACKAGECONFIG ??= "jpeg png tiff" +PACKAGECONFIG ??= "jpeg openjpeg png tiff ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg" PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" +PACKAGECONFIG[curl] = "--enable-libcurl,--disable-libcurl,curl" +PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg,openjpeg" +PACKAGECONFIG[qt5] = "--enable-poppler-qt5,--disable-poppler-qt5,qtbase" EXTRA_OECONF = "\ --enable-xpdf-headers \