aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-05-25 21:59:43 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 10:35:16 +0200
commitbb09fdb283a913dc641247a8d25bad261d3fc71e (patch)
tree91adfff2b15b5ab2d5d48fc0125c0bf639621a9c
parent5e52355e35e16b0953ac97d19af68a4b003845b9 (diff)
downloadmeta-openembedded-contrib-bb09fdb283a913dc641247a8d25bad261d3fc71e.tar.gz
imagemagick: update to 6.9.1.3 / add packageconfig for openjpeg
* openjpeg is new and auto detected by configure * choose tar.xz for download as the size is ~1/5 less * checked LICENSE: only one year was changed 2014->2015 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_6.9.1.bb (renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb)11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.9.1.bb
index accbbed846..e54135b326 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.9.1.bb
@@ -1,15 +1,15 @@
SUMMARY = "ImageMagick is an image convertion tools"
SECTION = "console/utils"
LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514"
# 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 virtual/fftw freetype"
-PATCHSET = "10"
-SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
+PATCHSET = "3"
+SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \
"
-SRC_URI[md5sum] = "c4f70046420db9b22d9dfd1c3d179b55"
-SRC_URI[sha256sum] = "4e702c1c3b4632fde2a93af33dcd3d013a9ebfa598060aca11f06d80676ecbf4"
+SRC_URI[md5sum] = "1171a6837defe10be288ab44869cc3a0"
+SRC_URI[sha256sum] = "5fd180603e60c624c05c644a8340f4f4e92c19dc3c41d374d38f76c69cd48ba3"
S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
@@ -23,6 +23,7 @@ CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes"
PACKAGECONFIG ??= ""
PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
+PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"