diff options
Diffstat (limited to 'meta-oe/recipes-support/imagemagick')
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch (renamed from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb (renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb) | 15 |
3 files changed, 6 insertions, 20 deletions
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.8.6/remove.dist-lzip.patch index 559aa247d0..559aa247d0 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch +++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb index 2f0fad5ea5..1af1f0b3e3 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb @@ -1,19 +1,16 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b" +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" -PR = "r5" - -PATCHSET = "6" +PATCHSET = "8" 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" +SRC_URI[md5sum] = "ea66fbb6fc1354312bc4971c0a0cfb3c" +SRC_URI[sha256sum] = "eb33e0ba6aeb542b7127ee1c2f62961236428b233e9911aa86e1b66b3342ea1d" S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" @@ -27,8 +24,8 @@ 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}" + ${libdir}/ImageMagick-${PV}/config-Q16 \ + ${datadir}/ImageMagick-6 " FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" |