imagemagick: Update to 6.8.8

Add ImageMagick to known licenses
The license checksum is changed due to year change in license text
-Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
+Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.

Add suffix .im6 to binaries, this avoids conflicts with other packages
e.g. lmbench provides stream utility and imagemagick does too so when
both packages are being part of image we have conflicts. This resolves
it by renaming stream to stream.im6 to make it distinct

Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick/remove.dist-lzip.patch
index 559aa247d..559aa247d 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
+++ b/meta-oe/recipes-support/imagemagick/imagemagick/remove.dist-lzip.patch
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
index 9ff03c3c1..e261eb8b7 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
@@ -1,7 +1,7 @@
 SUMMARY = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f"
+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.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
 
@@ -9,8 +9,8 @@ PATCHSET = "10"
 SRC_URI = "http://www.imagemagick.org/download/legacy/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
            file://remove.dist-lzip.patch \
 "
-SRC_URI[md5sum] = "9034ab5bf6d63fe72230779f1f590691"
-SRC_URI[sha256sum] = "95b487bb0e4ebf97dd06b6d61f421a05e2666f253ae06352cb3262b34603b2a3"
+SRC_URI[md5sum] = "a3a0fa301965d6fde68fccd066f62b0b"
+SRC_URI[sha256sum] = "8c0982b2bc0c1cea8ac9627b4e1e5d37f8171ef8282ee09aef32529cf68e1820"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 
@@ -18,7 +18,7 @@ inherit autotools binconfig pkgconfig
 
 # xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2
 # if someone needs xml support then fix it first
-EXTRA_OECONF = "--program-prefix= --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
+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"