From dcbb49f707e7ad9bf755dd3275ffc442154b8144 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Apr 2014 22:36:04 -0700 Subject: 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 --- .../imagemagick-6.8.6/remove.dist-lzip.patch | 17 --------- .../imagemagick/imagemagick/remove.dist-lzip.patch | 17 +++++++++ .../imagemagick/imagemagick_6.8.6.bb | 43 ---------------------- .../imagemagick/imagemagick_6.8.8.bb | 43 ++++++++++++++++++++++ 4 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick/remove.dist-lzip.patch delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb (limited to 'meta-oe/recipes-support/imagemagick') diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch deleted file mode 100644 index 559aa247d0..0000000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch +++ /dev/null @@ -1,17 +0,0 @@ -Our automake-1.11.2 doesn't support it yet, see: -http://lists.gnu.org/archive/html/automake/2011-12/msg00081.html - -Upstream-Status: Inappropriate [fix or upgrade oe-core automake] - -diff -uNr ImageMagick-6.7.5-6.orig/configure.ac ImageMagick-6.7.5-6/configure.ac ---- ImageMagick-6.7.5-6.orig/configure.ac 2012-02-12 18:07:28.000000000 +0100 -+++ ImageMagick-6.7.5-6/configure.ac 2012-02-15 12:55:47.668813474 +0100 -@@ -128,7 +128,7 @@ - # Ensure that make can run correctly - AM_SANITY_CHECK - --AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) -+AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) - - # Enable support for silent build rules - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick/remove.dist-lzip.patch new file mode 100644 index 0000000000..559aa247d0 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick/remove.dist-lzip.patch @@ -0,0 +1,17 @@ +Our automake-1.11.2 doesn't support it yet, see: +http://lists.gnu.org/archive/html/automake/2011-12/msg00081.html + +Upstream-Status: Inappropriate [fix or upgrade oe-core automake] + +diff -uNr ImageMagick-6.7.5-6.orig/configure.ac ImageMagick-6.7.5-6/configure.ac +--- ImageMagick-6.7.5-6.orig/configure.ac 2012-02-12 18:07:28.000000000 +0100 ++++ ImageMagick-6.7.5-6/configure.ac 2012-02-15 12:55:47.668813474 +0100 +@@ -128,7 +128,7 @@ + # Ensure that make can run correctly + AM_SANITY_CHECK + +-AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) ++AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) + + # Enable support for silent build rules + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb deleted file mode 100644 index 9ff03c3c14..0000000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "ImageMagick is an image convertion tools" -SECTION = "console/utils" -LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f" -# 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" - -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" - -S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" - -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" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper" - -FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ - ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ - ${libdir}/ImageMagick-${PV}/modules-Q16/filters \ - ${libdir}/ImageMagick-${PV}/modules-Q16/coders \ - ${libdir}/ImageMagick-${PV}/config-Q16 \ - ${datadir}/ImageMagick-6 " - -FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" - -BBCLASSEXTEND = "native" - -LEAD_SONAME = "libMagickCore.so.*" - -do_configure_prepend() { - export ac_cv_sys_file_offset_bits=yes -} diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb new file mode 100644 index 0000000000..e261eb8b70 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb @@ -0,0 +1,43 @@ +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. +DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype" + +PATCHSET = "10" +SRC_URI = "http://www.imagemagick.org/download/legacy/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ + file://remove.dist-lzip.patch \ +" +SRC_URI[md5sum] = "a3a0fa301965d6fde68fccd066f62b0b" +SRC_URI[sha256sum] = "8c0982b2bc0c1cea8ac9627b4e1e5d37f8171ef8282ee09aef32529cf68e1820" + +S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" + +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= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper" + +FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ + ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ + ${libdir}/ImageMagick-${PV}/modules-Q16/filters \ + ${libdir}/ImageMagick-${PV}/modules-Q16/coders \ + ${libdir}/ImageMagick-${PV}/config-Q16 \ + ${datadir}/ImageMagick-6 " + +FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" + +FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" + +BBCLASSEXTEND = "native" + +LEAD_SONAME = "libMagickCore.so.*" + +do_configure_prepend() { + export ac_cv_sys_file_offset_bits=yes +} -- cgit 1.2.3-korg