From patchwork Tue Feb 21 05:38:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-oe] imagemagick: Upgrade recipes from 6.4.4 -> 6.7.5 Date: Tue, 21 Feb 2012 05:38:28 -0000 From: Khem Raj X-Patchwork-Id: 21475 Message-Id: <1329802708-23942-1-git-send-email-raj.khem@gmail.com> To: openembedded-devel@lists.openembedded.org 6.4.4 does not compile with latest zlib Signed-off-by: Khem Raj --- .../PerlMagic_MakePatch.patch | 0 .../imagemagick/imagemagick-6.7.5/no-lzip.patch | 19 +++++++++++++++++++ .../{imagemagick_6.4.4.bb => imagemagick_6.7.5.bb} | 15 ++++++++------- 3 files changed, 27 insertions(+), 7 deletions(-) rename meta-oe/recipes-support/imagemagick/{imagemagick-6.4.4 => imagemagick-6.7.5}/PerlMagic_MakePatch.patch (100%) create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/no-lzip.patch rename meta-oe/recipes-support/imagemagick/{imagemagick_6.4.4.bb => imagemagick_6.7.5.bb} (72%) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch similarity index 100% rename from meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch rename to meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/no-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/no-lzip.patch new file mode 100644 index 0000000..38b48e1 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/no-lzip.patch @@ -0,0 +1,19 @@ +dist-lzip is not supported by OE autotools + +Signed-off-by: Khem Raj + +Upstream-Status: Inappropriate [OE-specific] + +Index: ImageMagick-6.7.5-6/configure.ac +=================================================================== +--- ImageMagick-6.7.5-6.orig/configure.ac 2012-02-20 21:19:53.965635662 -0800 ++++ ImageMagick-6.7.5-6/configure.ac 2012-02-20 21:20:31.429637625 -0800 +@@ -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.4.4.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb similarity index 72% rename from meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb rename to meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb index d5f95c9..0c24a62 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb @@ -1,20 +1,21 @@ -DESCRIPTION = "ImageMagick is an image convertion tools" +DESCRIPTION = "ImageMagick is collection of image manipulation tools" SECTION = "console/utils" LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e1ebcc1358b9f81eba64255fc5da6892" +LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b" # 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" -PR = "r10" +PR = "r0" -PATCHSET = "1" +PATCHSET = "6" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ file://PerlMagic_MakePatch.patch \ + file://no-lzip.patch \ " -SRC_URI[md5sum] = "882ff241f6ad39655541d5055596f93b" -SRC_URI[sha256sum] = "5a5b2779707bfd9816cf17d8f53d242c05005092da192a898ac10961b3b19dda" +SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" +SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" -S = "${WORKDIR}/ImageMagick-${PV}" +S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" inherit autotools binconfig pkgconfig