From ad01763ddfc28cec4a7abeb666877d6d9a1ef20e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 25 Aug 2013 06:46:46 +0000 Subject: ImageMagick: update to upstream version 6.8.6-8 - License changed by additional copyright year only. - Patch PerlMagic_MakePatch.patch part of upstream now Signed-off-by: Marko Lindqvist Signed-off-by: Martin Jansa --- .../imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 ------ .../imagemagick-6.7.5/remove.dist-lzip.patch | 17 --------- .../imagemagick-6.8.6/remove.dist-lzip.patch | 17 +++++++++ .../imagemagick/imagemagick_6.7.5.bb | 43 ---------------------- .../imagemagick/imagemagick_6.8.6.bb | 40 ++++++++++++++++++++ 5 files changed, 57 insertions(+), 71 deletions(-) delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb (limited to 'meta-oe/recipes-support/imagemagick') diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch deleted file mode 100644 index f8ad0afc5f..0000000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200 -+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200 -@@ -87,6 +87,8 @@ - - # Use same compiler as ImageMagick - 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', -+ 'AR' => '@AR@', -+ 'LD' => '@PERLMAINCC@', - - # Set Perl installation prefix to ImageMagick installation prefix - # 'PREFIX' => '@prefix@', diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch deleted file mode 100644 index 559aa247d0..0000000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/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-6.8.6/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch new file mode 100644 index 0000000000..559aa247d0 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/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.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb deleted file mode 100644 index 2f0fad5ea5..0000000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "ImageMagick is an image convertion tools" -SECTION = "console/utils" -LICENSE = "ImageMagick" -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 fftw" - -PR = "r5" - -PATCHSET = "6" -SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ - file://PerlMagic_MakePatch.patch \ - file://remove.dist-lzip.patch \ -" -SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" -SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" - -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-freetype --without-perl --disable-openmp --without-xml --disable-opencl" - -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/ \ - ${datadir}/ImageMagick-${PV}" - -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.6.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb new file mode 100644 index 0000000000..1af1f0b3e3 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "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" + +PATCHSET = "8" +SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ + file://remove.dist-lzip.patch \ +" +SRC_URI[md5sum] = "ea66fbb6fc1354312bc4971c0a0cfb3c" +SRC_URI[sha256sum] = "eb33e0ba6aeb542b7127ee1c2f62961236428b233e9911aa86e1b66b3342ea1d" + +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-freetype --without-perl --disable-openmp --without-xml --disable-opencl" + +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