diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2017-08-24 23:16:57 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:32 +0200 |
| commit | 0d71705498e559c8fa45d41ffc4e0c7d2eed2db0 (patch) | |
| tree | dc614f91b2d7076a166a416525905f7031ba0af5 | |
| parent | 90e08ddc2b1e3b7af0c871fb012aab8a89eee826 (diff) | |
| download | meta-openembedded-contrib-0d71705498e559c8fa45d41ffc4e0c7d2eed2db0.tar.gz | |
imagemagick: 7.0.5 -> 7.0.6_9
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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick_7.0.6.bb (renamed from meta-oe/recipes-support/imagemagick/imagemagick_7.0.5.bb) | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.6.bb index b8ee6e7be2..09b5fd295d 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.5.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.6.bb @@ -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" |