aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/imagemagick
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2014-07-20 12:16:26 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-22 00:02:00 +0200
commitd53f24ccd3122bd1a421d56ca3af4fb7fe195849 (patch)
tree6114ba4eeaf3d70a245f0a77d8df4fd12575fef0 /meta-oe/recipes-support/imagemagick
parentfe86f89510f8023fed99bfc02880d4f1a863d3fc (diff)
downloadmeta-openembedded-contrib-d53f24ccd3122bd1a421d56ca3af4fb7fe195849.tar.gz
meta-openembedded-contrib-d53f24ccd3122bd1a421d56ca3af4fb7fe195849.tar.bz2
meta-openembedded-contrib-d53f24ccd3122bd1a421d56ca3af4fb7fe195849.zip
imagemagick: add some PACKAGECONFIG, fix unrecognized --without-jp2 option
* Add PACKAGECONFIG for lzma, pango, webp, wmf Signed-off-by: Tim Orling <TicoTimo@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/imagemagick')
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
index e261eb8b70..31207daa64 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
@@ -2,7 +2,7 @@ SUMMARY = "ImageMagick is an image convertion tools"
SECTION = "console/utils"
LICENSE = "ImageMagick"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
-# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
+# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
PATCHSET = "10"
@@ -21,7 +21,11 @@ inherit autotools binconfig pkgconfig
EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
PACKAGECONFIG ??= ""
-PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper"
+PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
+PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
+PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
+PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
+PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \