Skip to contentSkip to conversation

ImageMagick: update to upstream version 6.8.6-8

PATCH Superseded Marko Lindqvist 2 participants 6 messages Aug 16, 2013 – Aug 23, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Marko Lindqvist

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch |   11 -----------
 .../remove.dist-lzip.patch                                  |    0
 .../{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb}          |   11 ++++-------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
 rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.6}/remove.dist-lzip.patch (100%)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} (83%)
meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch deleted +0 -11
deleted file mode 100644
index f8ad0af..0000000
@@ -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@',
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 -0
similarity index 100%
rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +4 -7
similarity index 83%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
index 2f0fad5..4b55ae8 100644
@@ -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}"
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 2 lines · Marko Lindqvist

- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now

Looks good now, do you still need freetype support?
http://patchwork.openembedded.org/patch/51217/

It would be better implemented as PACKAGECONFIG but I'm OK with it.

Quoted 69 lines
Signed-off-by Marko Lindqvist <[email protected]>
---
 .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch |   11 -----------
 .../remove.dist-lzip.patch                                  |    0
 .../{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb}          |   11 ++++-------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
 rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.6}/remove.dist-lzip.patch (100%)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} (83%)
meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch deleted +0 -11
deleted file mode 100644
index f8ad0af..0000000
@@ -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@',
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 -0
similarity index 100%
rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +4 -7
similarity index 83%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
index 2f0fad5..4b55ae8 100644
@@ -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}"
Signature · 6 lines
1.7.10.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw
Quoted 6 lines · Martin Jansa
Quoted 2 lines · Marko Lindqvist

- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now

Looks good now, do you still need freetype support?
http://patchwork.openembedded.org/patch/51217/

Oh, I had completely forgotten I had submitted similar patch already!
Yes, I'm going to need freetype delegate in ImageMagick assuming I get the freeciv mapimg feature otherwise to work.

- ML

#3 lore raw
In reply to Marko Lindqvist
Quoted 2 lines · Marko Lindqvist

- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now

Same issue as with 6.8.5
http://lists.openembedded.org/pipermail/openembedded-devel/2013-June/091027.html

imagemagick-6.8.6: imagemagick: Files/directories were installed but not shipped
/usr/lib/ImageMagick-6.8.6 /usr/lib/ImageMagick-6.8.6/config-Q16 /usr/lib/ImageMagick-6.8.6/config-Q16/configure.xml /usr/share/ImageMagick-6 /usr/share/ImageMagick-6/english.xml /usr/share/ImageMagick-6/francais.xml /usr/share/ImageMagick-6/locale.xml

Quoted 70 lines
Signed-off-by Marko Lindqvist <[email protected]>
---
 .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch |   11 -----------
 .../remove.dist-lzip.patch                                  |    0
 .../{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb}          |   11 ++++-------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
 rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.6}/remove.dist-lzip.patch (100%)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} (83%)
meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch deleted +0 -11
deleted file mode 100644
index f8ad0af..0000000
@@ -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@',
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 -0
similarity index 100%
rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +4 -7
similarity index 83%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
index 2f0fad5..4b55ae8 100644
@@ -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}"
Signature · 6 lines
1.7.10.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#4 lore raw
Quoted 7 lines · Martin Jansa
Quoted 2 lines · Marko Lindqvist

- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now

Same issue as with 6.8.5
http://lists.openembedded.org/pipermail/openembedded-devel/2013-June/091027.html

Quoted 9 lines

imagemagick-6.8.6: imagemagick: Files/directories were installed but not shipped
/usr/lib/ImageMagick-6.8.6 /usr/lib/ImageMagick-6.8.6/config-Q16 /usr/lib/ImageMagick-6.8.6/config-Q16/configure.xml /usr/share/ImageMagick-6 /usr/share/ImageMagick-6/english.xml /usr/share/ImageMagick-6/francais.xml /usr/share/ImageMagick-6/locale.xml

I'll add note to myself to check that when I next time work with that
recipe (updating it to then latest imageMagick). I'm currently giving that general line of development a break and ended explicitly disabling freeciv mapimg feature instead (of making it to work).

- ML

#5 lore raw
Quoted 18 lines · Marko Lindqvist
Quoted 7 lines · Martin Jansa
Quoted 2 lines · Marko Lindqvist

- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now

Same issue as with 6.8.5
http://lists.openembedded.org/pipermail/openembedded-devel/2013-June/091027.html

Quoted 9 lines

imagemagick-6.8.6: imagemagick: Files/directories were installed but not shipped
/usr/lib/ImageMagick-6.8.6 /usr/lib/ImageMagick-6.8.6/config-Q16 /usr/lib/ImageMagick-6.8.6/config-Q16/configure.xml /usr/share/ImageMagick-6 /usr/share/ImageMagick-6/english.xml /usr/share/ImageMagick-6/francais.xml /usr/share/ImageMagick-6/locale.xml

Quoted 4 lines

I'll add note to myself to check that when I next time work with that
recipe (updating it to then latest imageMagick). I'm currently giving that general line of development a break and ended explicitly disabling freeciv mapimg feature instead (of making it to work).

If you just update FILES_* variables to package it somewhere I'll take this imagemagick upgrade and the freetype delegate one.

Thanks

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]