Skip to contentSkip to conversation

imagemagick: 7.0.5 -> 7.0.6_9

PATCH In review [email protected] 2 participants 3 messages Aug 24, 2017 – Aug 29, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 imagemagick: 7.0.5 -> 7.0.6_9

From: Kai Kang <[email protected]>

Upgrade imagemagick from 7.0.5 patchset 6 to 7.0.9 patchset 9.

* update SRC_URI. Replace tarball with git repo that it only keeps latest tarball on www.imagemagick.org

---
 .../{imagemagick_7.0.5.bb => imagemagick_7.0.6.bb} | 26 ++++++++--------------
 1 file changed, 9 insertions(+), 17 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_7.0.5.bb => imagemagick_7.0.6.bb} (78%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.6.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_7.0.5.bb +9 -17
similarity index 78%
rename from meta-oe/recipes-support/imagemagick/imagemagick_7.0.5.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.6.bb
index b8ee6e7be..09b5fd295 100644
@@ -5,16 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dad5a98f173fd3fa6958a1a58c6131c1"
 # 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 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 = "6"
-SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \
-"
-SRC_URI[md5sum] = "dfaa2bd61f65d67ea8d5307ed6cd197f"
-SRC_URI[sha256sum] = "f60c3e3466ccbf9a0e643284ffec3467363edf9611f16a98387f927a974b49ab"
+BASE_PV := "${PV}"
+PV .= "_9"
+SRC_URI = "git://github.com/ImageMagick/ImageMagick.git "
+SRCREV = "1fd8b52ac62d3a0bb47a407f0d7e3a41df5b91d6"
 
-S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-alternatives
 
@@ -33,16 +29,12 @@ PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
 PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
 PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
 
-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-7 "
+FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \
+                ${datadir}/ImageMagick-7"
 
-FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a"
+FILES_${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a"
 
-FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
+FILES_${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*"
 
 BBCLASSEXTEND = "native"
 
Signature · 1 line
2.14.1
#1 lore raw
Quoted 6 lines · On 2017-08-24 11:16 AM, [email protected] wrote:

From: Kai Kang <[email protected]>

Upgrade imagemagick from 7.0.5 patchset 6 to 7.0.9 patchset 9.

* update SRC_URI. Replace tarball with git repo that it only keeps latest tarball on www.imagemagick.org

This avoids the imagemagick disappearing tarball problem but the impact is ~350 MB for the git repo rather than 8 MB for the tarball.

Any objections to using the gentoo distfiles site:
http://distfiles.gentoo.org/distfiles/

Kai, If not please send a revised upgrade to 7.0.6 using that URL.

../Randy

Signature · 2 lines
# Randy MacLeod.  WR Linux
# Wind River an Intel Company
author
#2 lore raw
Quoted 12 lines · Randy MacLeod
Quoted 6 lines · On 2017-08-24 11:16 AM, [email protected] wrote:

From: Kai Kang <[email protected]>

Upgrade imagemagick from 7.0.5 patchset 6 to 7.0.9 patchset 9.

* update SRC_URI. Replace tarball with git repo that it only keeps latest tarball on www.imagemagick.org

This avoids the imagemagick disappearing tarball problem but the impact is ~350 MB for the git repo rather than 8 MB for the tarball.

Quoted 5 lines

Any objections to using the gentoo distfiles site:
http://distfiles.gentoo.org/distfiles/

Kai, If not please send a revised upgrade to 7.0.6 using that URL.

OK. I'll be waiting for 2 more days.

--Kai

Quoted 6 lines

../Randy

Signature · 2 lines
Regards,
Neil | Kai Kang