Skip to contentSkip to conversation

imagemagick: upgrade from 6.9.2 to 7.0.2

PATCH In review Randy MacLeod 2 participants 4 messages Aug 8, 2016 – Aug 20, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 imagemagick: upgrade from 6.9.2 to 7.0.2

The copyright end year update made the LICENSE file checksum change. That line is in the middle of the file so the license checksum has been updated rather than specifying two ranges of lines.

---
 .../imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb} (94%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +4 -4
similarity index 94%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index a9f0134..a5a239c 100644
@@ -1,18 +1,18 @@
 SUMMARY = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=22d47a47bf252ca3ed7f71273b53612e"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
 # Important note: tarballs for all patchsets within a version are deleted when
 # a new pachset is created. To avoid multiple patches for each patchset, try to
 # update to the last pachset of a version
-PATCHSET = "0"
+PATCHSET = "7"
 SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \
 "
-SRC_URI[md5sum] = "99471c8c3f38c9264faf5c4ca7a31287"
-SRC_URI[sha256sum] = "07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e"
+SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9"
+SRC_URI[sha256sum] = "1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 31 lines · Randy MacLeod

The copyright end year update made the LICENSE file checksum change. That line is in the middle of the file so the license checksum has been updated rather than specifying two ranges of lines.

---
 .../imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb} (94%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +1 -2
similarity index 94%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index a9f0134..a5a239c 100644
@@ -1,18 +1,18 @@
 SUMMARY = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=22d47a47bf252ca3ed7f71273b53612e"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
 # Important note: tarballs for all patchsets within a version are deleted when
 # a new pachset is created. To avoid multiple patches for each patchset, try to
 # update to the last pachset of a version
-PATCHSET = "0"

meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb line 18

Quoted 10 lines
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +3 -2
+PATCHSET = "7"
 SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \
 "
-SRC_URI[md5sum] = "99471c8c3f38c9264faf5c4ca7a31287"
-SRC_URI[sha256sum] = "07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e"
+SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9"
+SRC_URI[sha256sum] = "1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 

This builds for all qemu targets and basic functionality is okay:

root@qemu0:~# convert logo: logo.gif
root@qemu0:~# identify logo.gif
logo.gif GIF 640x480 640x480+0+0 8-bit sRGB 256c 28.6KB 0.020u 0:00.020
root@qemu0:~# arch
aarch64
root@qemu0:~# identify -list format | wc -l
252

but there's a problem with a missing configure.xml file:

root@qemu0:~# identify -list configure

Path: [built-in]

Name Value
-------------------------------------------------------------------------------
FEATURES
NAME ImageMagick
QuantumDepth 16
identify: UnableToOpenConfigureFile `configure.xml' @ warning/configure.c/GetConfigureOptions/715.

That's probably not critical and I'll work on it tomorrow. Merge if you like or wait for a fix.

Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, Canada, K2K 2W5
#2 lore raw
In reply to Randy MacLeod
Quoted 3 lines · Randy MacLeod

The copyright end year update made the LICENSE file checksum change. That line is in the middle of the file so the license checksum has been updated rather than specifying two ranges of lines.

You forgot to update FILES variable, I did that in master-next, but next time please test your changes for QA issues before sending them.

WARNING: imagemagick-7.0.2-r0 do_package: QA Issue: imagemagick: Files/directories were installed but not shipped in any package:
/usr/lib/ImageMagick-7.0.2
/usr/lib/ImageMagick-7.0.2/config-Q16HDRI
/usr/lib/ImageMagick-7.0.2/config-Q16HDRI/configure.xml
/usr/share/ImageMagick-7
/usr/share/ImageMagick-7/english.xml
/usr/share/ImageMagick-7/francais.xml
/usr/share/ImageMagick-7/locale.xml

Quoted 45 lines
---
 .../imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb} (94%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +4 -4
similarity index 94%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index a9f0134..a5a239c 100644
@@ -1,18 +1,18 @@
 SUMMARY = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=22d47a47bf252ca3ed7f71273b53612e"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
 # Important note: tarballs for all patchsets within a version are deleted when
 # a new pachset is created. To avoid multiple patches for each patchset, try to
 # update to the last pachset of a version
-PATCHSET = "0"
+PATCHSET = "7"
 SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \
 "
-SRC_URI[md5sum] = "99471c8c3f38c9264faf5c4ca7a31287"
-SRC_URI[sha256sum] = "07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e"
+SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9"
+SRC_URI[sha256sum] = "1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 
Signature · 7 lines
2.7.4

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

The copyright end year update made the LICENSE file checksum change. That line is in the middle of the file so the license checksum has been updated rather than specifying two ranges of lines.

You forgot to update FILES variable, I did that in master-next, but next time please test your changes for QA issues before sending them.

Will do.

I'll likely add ptest support as well at some point...

../Randy

Quoted 58 lines

WARNING: imagemagick-7.0.2-r0 do_package: QA Issue: imagemagick: Files/directories were installed but not shipped in any package:
/usr/lib/ImageMagick-7.0.2
/usr/lib/ImageMagick-7.0.2/config-Q16HDRI
/usr/lib/ImageMagick-7.0.2/config-Q16HDRI/configure.xml
/usr/share/ImageMagick-7
/usr/share/ImageMagick-7/english.xml
/usr/share/ImageMagick-7/francais.xml
/usr/share/ImageMagick-7/locale.xml

Quoted 45 lines
---
 .../imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb} (94%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +4 -5
similarity index 94%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index a9f0134..a5a239c 100644
@@ -1,18 +1,18 @@
 SUMMARY = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=22d47a47bf252ca3ed7f71273b53612e"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
 # Important note: tarballs for all patchsets within a version are deleted when
 # a new pachset is created. To avoid multiple patches for each patchset, try to
 # update to the last pachset of a version
-PATCHSET = "0"
+PATCHSET = "7"
 SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \
 "
-SRC_URI[md5sum] = "99471c8c3f38c9264faf5c4ca7a31287"
-SRC_URI[sha256sum] = "07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e"
+SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9"
+SRC_URI[sha256sum] = "1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 
--

2.7.4

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, Canada, K2K 2W5