Skip to contentSkip to conversation

imagemagick: update from 7.8.47 to 7.9.16

PATCH In review Randy MacLeod 2 participants 5 messages Jan 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 imagemagick: update from 7.8.47 to 7.9.16

Only the copyright date for the LICENSE file changed. Add PACKAGECONFIG to enable use of tcmalloc.

---
 .../{imagemagick_7.0.8.bb => imagemagick_7.0.9.bb}         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_7.0.8.bb => imagemagick_7.0.9.bb} (95%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb +4 -3
similarity index 95%
rename from meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb
index 4ee06d77f..3f7d06e26 100644
@@ -4,14 +4,14 @@ HOMEPAGE = "https://www.imagemagick.org/"
 DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
 editing raster and vector image files. It can read and write over 200 image file formats."
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=05ff94b3ff59fe6fa7489fa26e3d9142"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
 
 BASE_PV := "${PV}"
-PV .= "_47"
+PV .= "_13"
 SRC_URI = "git://github.com/ImageMagick/ImageMagick.git "
-SRCREV = "b672df7a44b0ab0219b1fa78b3673c2810ddd374"
+SRCREV = "15b935d64f613b5a0fc9d3fead5c6ec1b0e3908f"
 
 S = "${WORKDIR}/git"
 
@@ -29,6 +29,7 @@ PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
 PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
 PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
 PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
+PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
 PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
 PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
 PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
Signature · 1 line
2.22.0
#1 lore raw

PATCH 2/3 tigervnc: update from 1.9.0 to 1.10.1

Add perl runtime dependecy since the vncserver program is and always has been a perl script.

---
 .../{tigervnc_1.9.0.bb => tigervnc_1.10.1.bb}     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-graphics/tigervnc/{tigervnc_1.9.0.bb => tigervnc_1.10.1.bb} (89%)
meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb renamed from meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb +7 -8
similarity index 89%
rename from meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb
rename to meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb
index d0ee2a50e..16937792e 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tigervnc.com/"
 LICENSE = "GPLv2+"
 SECTION = "x11/utils"
 DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk"
-RDEPENDS_${PN} = "chkconfig coreutils hicolor-icon-theme"
+RDEPENDS_${PN} = "chkconfig coreutils hicolor-icon-theme perl"
 
 LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
 
@@ -15,10 +15,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
 inherit autotools cmake
 B = "${S}"
 
-SRCREV = "6f2301d08e64a965ad36b401ec8dc2b24bc47075"
+SRCREV = "4739493b635372bd40a34640a719f79fa90e4dba"
 
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \
-           file://0001-tigervnc-remove-includedir.patch \
+SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.10-branch \
            file://0002-do-not-build-tests-sub-directory.patch \
            file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
            file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
@@ -26,11 +25,11 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \
 
 # Keep sync with xorg-server in oe-core
 XORG_PN ?= "xorg-server"
-XORG_PV ?= "1.19.6"
+XORG_PV ?= "1.20.6"
 SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
 XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
-SRC_URI[xorg.md5sum] = "3e47777ff034a331aed2322b078694a8"
-SRC_URI[xorg.sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
+SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
+SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
 
 # It is the directory containing the Xorg source for the
 # machine on which you are building TigerVNC.
@@ -58,7 +57,7 @@ do_patch_xserver () {
     xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
 
     cd ${XSERVER_SOURCE_DIR}
-    xserverpatch="${S}/unix/xserver119.patch"
+    xserverpatch="${S}/unix/xserver120.patch"
     echo "Apply $xserverpatch"
     patch -p1 -b --suffix .vnc < $xserverpatch
 }
Signature · 1 line
2.22.0
#2 lore raw

PATCH 3/3 rsyslog: update from 8.1910 to 8.1911

In reply to Randy MacLeod

ptest results for qemux86-64 with kvm and a timeout of 1000 seconds to allow stress tests to complete:

Recipe           | Passed      | Failed   | Skipped
rsyslog-8.1908.0 | 379         | 4        | 2
rsyslog-8.1911.0 | 381         | 4        | 3
---
 .../rsyslog/{rsyslog_8.1910.0.bb => rsyslog_8.1911.0.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.1910.0.bb => rsyslog_8.1911.0.bb} (98%)
meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb renamed from meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb +2 -2
similarity index 98%
rename from meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
rename to meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb
index e8afae4ef..02ac03eae 100644
@@ -29,8 +29,8 @@ SRC_URI_append_libc-musl = " \
     file://0001-Include-sys-time-h.patch \
 "
 
-SRC_URI[md5sum] = "6d4d94359d083f449f089b8dbb93c423"
-SRC_URI[sha256sum] = "0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93"
+SRC_URI[md5sum] = "154e33feb587216f2955050a8301104c"
+SRC_URI[sha256sum] = "e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104"
 
 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.22.0
#3 lore raw
In reply to Randy MacLeod
Quoted 4 lines · Randy MacLeod

Only the copyright date for the LICENSE file changed. Add PACKAGECONFIG to enable use of tcmalloc.

packageconfig disables it now by default, which is fine but I would like to know what
is the defaults in general since this might be a change in behavior

Quoted 47 lines
---
 .../{imagemagick_7.0.8.bb => imagemagick_7.0.9.bb}         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_7.0.8.bb => imagemagick_7.0.9.bb} (95%)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb +4 -4
similarity index 95%
rename from meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb
index 4ee06d77f..3f7d06e26 100644
@@ -4,14 +4,14 @@ HOMEPAGE = "https://www.imagemagick.org/"
 DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
 editing raster and vector image files. It can read and write over 200 image file formats."
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=05ff94b3ff59fe6fa7489fa26e3d9142"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
 
 BASE_PV := "${PV}"
-PV .= "_47"
+PV .= "_13"
 SRC_URI = "git://github.com/ImageMagick/ImageMagick.git "
-SRCREV = "b672df7a44b0ab0219b1fa78b3673c2810ddd374"
+SRCREV = "15b935d64f613b5a0fc9d3fead5c6ec1b0e3908f"
 
 S = "${WORKDIR}/git"
 
@@ -29,6 +29,7 @@ PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
 PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
 PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
 PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
+PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
 PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
 PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
 PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
--

2.22.0

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

#4 lore raw
Quoted 8 lines · Khem Raj
Quoted 3 lines · Randy MacLeod

Only the copyright date for the LICENSE file changed. Add PACKAGECONFIG to enable use of tcmalloc.

packageconfig disables it now by default, which is fine but I would like to know what
is the defaults in general since this might be a change in behavior

Good question.

The default is the system malloc, with flags to use other

alloc systems, from configure --help:
  --with-jemalloc         enable jemalloc memory allocation library support --with-tcmalloc         enable tcmalloc memory allocation library support --with-umem             enable umem memory allocation library support

And running configure reports:

Memory allocation library:
  JEMalloc          --with-jemalloc=no        no
  TCMalloc          --with-tcmalloc=no        no
  UMem              --with-umem=no        no

so there isn't a change in the default behaviour.

../Randy

Quoted 48 lines
Quoted 48 lines
---
  .../{imagemagick_7.0.8.bb => imagemagick_7.0.9.bb}         | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)

rename meta-oe/recipes-support/imagemagick/{imagemagick_7.0.8.bb => imagemagick_7.0.9.bb} (95%)

meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb renamed from meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb +4 -4
similarity index 95%
rename from meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb
index 4ee06d77f..3f7d06e26 100644
@@ -4,14 +4,14 @@ HOMEPAGE = "https://www.imagemagick.org/"
  DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
  editing raster and vector image files. It can read and write over 200 image file formats."
  LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=05ff94b3ff59fe6fa7489fa26e3d9142"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a"
  # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
  DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
 
  BASE_PV := "${PV}"
-PV .= "_47"
+PV .= "_13"
  SRC_URI = "git://github.com/ImageMagick/ImageMagick.git "
-SRCREV = "b672df7a44b0ab0219b1fa78b3673c2810ddd374"
+SRCREV = "15b935d64f613b5a0fc9d3fead5c6ec1b0e3908f"
 
  S = "${WORKDIR}/git"
 
@@ -29,6 +29,7 @@ PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
  PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
  PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
  PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
+PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
  PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
  PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
  PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
--

2.22.0

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

Signature · 2 lines
# Randy MacLeod
# Wind River Linux