From 4eeacd92e18b30f3ea662367662b39cd7af32ba9 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 24 May 2015 22:21:11 +0200 Subject: 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 --- meta-oe/recipes-support/poppler/poppler_0.26.5.bb | 39 --------------------- meta-oe/recipes-support/poppler/poppler_0.33.0.bb | 42 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.26.5.bb create mode 100644 meta-oe/recipes-support/poppler/poppler_0.33.0.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/poppler/poppler_0.26.5.bb b/meta-oe/recipes-support/poppler/poppler_0.26.5.bb deleted file mode 100644 index d11963961c..0000000000 --- a/meta-oe/recipes-support/poppler/poppler_0.26.5.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = " \ - http://poppler.freedesktop.org/${BP}.tar.xz \ -" -SRC_URI[md5sum] = "786c943eee550e3a977c181e7778b1c8" -SRC_URI[sha256sum] = "de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee" - -DEPENDS = "fontconfig zlib 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 \ - --disable-poppler-qt4 \ - --enable-zlib \ -" - -# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: - return "--enable-fixedpoint" - return "" - -EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_${PN} = "poppler-data" diff --git a/meta-oe/recipes-support/poppler/poppler_0.33.0.bb b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb new file mode 100644 index 0000000000..6e8446b872 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = " \ + http://poppler.freedesktop.org/${BP}.tar.xz \ +" +SRC_URI[md5sum] = "69927d1614d6704021c0b0dd0ee6a852" +SRC_URI[sha256sum] = "a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6" + +DEPENDS = "fontconfig zlib cairo lcms" + +inherit autotools pkgconfig gtk-doc + +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 \ + --disable-gtk-test \ + --disable-poppler-qt4 \ + --enable-zlib \ +" + +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +def get_poppler_fpu_setting(bb, d): + if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: + return "--enable-fixedpoint" + return "" + +EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_${PN} = "poppler-data" -- cgit 1.2.3-korg