[PATCH] imagemagick: upgrade from 6.9.2 to 7.0.2

[PATCH] imagemagick: upgrade from 6.9.2 to 7.0.2

[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.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 .../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%)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
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
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
@@ -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

Re: [PATCH] imagemagick: upgrade from 6.9.2 to 7.0.2

[Randy MacLeod]

On 2016-08-08 05:41 PM, Randy MacLeod wrote:
> 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.
>
> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> ---
>  .../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%)
>
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
> 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
> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
> @@ -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}"
>
>

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.

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

Re: [PATCH] imagemagick: upgrade from 6.9.2 to 7.0.2

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3101 bytes --]

On Mon, Aug 08, 2016 at 05:41:34PM -0400, Randy MacLeod wrote:
> 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

> 
> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> ---
>  .../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%)
> 
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
> 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
> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
> @@ -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
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH] imagemagick: upgrade from 6.9.2 to 7.0.2

[Randy MacLeod]

On 2016-08-15 06:28 AM, Martin Jansa wrote:
> On Mon, Aug 08, 2016 at 05:41:34PM -0400, Randy MacLeod wrote:
>> 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


>
> 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
>
>>
>> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
>> ---
>>  .../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%)
>>
>> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
>> 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
>> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
>> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
>> @@ -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
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>


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