From b0dfddd1c3b04b5d5d40563d5b0c6945976279cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= <frederic.devernay@m4x.org>
Date: Fri, 10 Apr 2020 21:07:42 -0700
Subject: [PATCH] update linux sdk

---
 tools/jenkins/include/scripts/pkg/automake.sh  |  2 +-
 tools/jenkins/include/scripts/pkg/cairo.sh     |  1 +
 tools/jenkins/include/scripts/pkg/gnutls.sh    | 18 ++++++++++--------
 .../include/scripts/pkg/imagemagick6.sh        |  6 ++++--
 .../include/scripts/pkg/imagemagick7.sh        |  6 ++++--
 tools/jenkins/include/scripts/pkg/libcroco.sh  |  4 +++-
 tools/jenkins/include/scripts/pkg/meson.sh     |  2 +-
 .../jenkins/include/scripts/pkg/openimageio.sh |  2 +-
 .../include/scripts/pkg/openssl-installer.sh   |  2 +-
 tools/jenkins/include/scripts/pkg/perl.sh      |  2 +-
 .../include/scripts/pkg/poppler-glib.sh        |  2 +-
 tools/jenkins/include/scripts/pkg/psycopg2.sh  |  2 +-
 tools/jenkins/include/scripts/pkg/ruby.sh      |  2 +-
 tools/jenkins/include/scripts/pkg/xz.sh        |  2 +-
 14 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/tools/jenkins/include/scripts/pkg/automake.sh b/tools/jenkins/include/scripts/pkg/automake.sh
index b5f19876bf..c09740f693 100644
--- a/tools/jenkins/include/scripts/pkg/automake.sh
+++ b/tools/jenkins/include/scripts/pkg/automake.sh
@@ -2,7 +2,7 @@
 
 # Install automake
 # see http://www.linuxfromscratch.org/lfs/view/development/chapter06/automake.html
-AUTOMAKE_VERSION=1.16.1
+AUTOMAKE_VERSION=1.16.2
 AUTOMAKE_TAR="automake-${AUTOMAKE_VERSION}.tar.xz"
 AUTOMAKE_SITE="https://ftp.gnu.org/gnu/automake"
 if download_step; then
diff --git a/tools/jenkins/include/scripts/pkg/cairo.sh b/tools/jenkins/include/scripts/pkg/cairo.sh
index 94111e5642..29dd91c679 100644
--- a/tools/jenkins/include/scripts/pkg/cairo.sh
+++ b/tools/jenkins/include/scripts/pkg/cairo.sh
@@ -23,6 +23,7 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/cairo.pc" ]
     start_build
     untar "$SRC_PATH/$CAIRO_TAR"
     pushd "cairo-${CAIRO_VERSION}"
+    autoreconf -fi
     env CFLAGS="$BF" CXXFLAGS="$BF" CPPFLAGS="-I${SDK_HOME}/include/pixman-1" LDFLAGS="-L${SDK_HOME}/lib -lpixman-1" ./configure --prefix="$SDK_HOME" --libdir="$SDK_HOME/lib" --enable-shared --enable-static --enable-tee --disable-dependency-tracking
     make -j${MKJOBS}
     make install
diff --git a/tools/jenkins/include/scripts/pkg/gnutls.sh b/tools/jenkins/include/scripts/pkg/gnutls.sh
index 762327dc78..2da9798eb5 100644
--- a/tools/jenkins/include/scripts/pkg/gnutls.sh
+++ b/tools/jenkins/include/scripts/pkg/gnutls.sh
@@ -2,15 +2,17 @@
 
 # Install gnutls (for ffmpeg)
 # see http://www.linuxfromscratch.org/blfs/view/cvs/postlfs/gnutls.html
-GNUTLS_VERSION=3.6.8
-#GNUTLS_VERSION=3.6.12
-# 3.6.9 and later fail on CentOS6 (probably needs an updated binutils/gas) with:
-#  CCAS     elf/sha512-ssse3-x86_64.lo
-#elf/sha1-ssse3-x86_64.s: Assembler messages:
-#elf/sha1-ssse3-x86_64.s:3825: Error: no such instruction: `vinserti128 $1,(%r13),%ymm0,%ymm0'
-#...
-
+GNUTLS_VERSION=3.6.13
 GNUTLS_VERSION_MICRO= #.1
+if [ "${CENTOS}" = 6 ] && [ -z "${DTS}" ]; then
+    GNUTLS_VERSION=3.6.8
+    GNUTLS_VERSION_MICRO=
+    # 3.6.9 and later fail on CentOS6 (probably needs an updated binutils/gas) with:
+    #  CCAS     elf/sha512-ssse3-x86_64.lo
+    #elf/sha1-ssse3-x86_64.s: Assembler messages:
+    #elf/sha1-ssse3-x86_64.s:3825: Error: no such instruction: `vinserti128 $1,(%r13),%ymm0,%ymm0'
+    #...
+fi
 GNUTLS_VERSION_SHORT=${GNUTLS_VERSION%.*}
 GNUTLS_TAR="gnutls-${GNUTLS_VERSION}${GNUTLS_VERSION_MICRO}.tar.xz"
 GNUTLS_SITE="ftp://ftp.gnupg.org/gcrypt/gnutls/v${GNUTLS_VERSION_SHORT}"
diff --git a/tools/jenkins/include/scripts/pkg/imagemagick6.sh b/tools/jenkins/include/scripts/pkg/imagemagick6.sh
index a53f8b53fc..9422defe1b 100644
--- a/tools/jenkins/include/scripts/pkg/imagemagick6.sh
+++ b/tools/jenkins/include/scripts/pkg/imagemagick6.sh
@@ -2,8 +2,10 @@
 
 # Install ImageMagick6
 # see http://www.linuxfromscratch.org/blfs/view/cvs/general/imagemagick6.html
-MAGICK_VERSION=6.9.10-78 # latest is 6.9.11-0, but 6.9.10-79 and later fail to compile on CentOS6 with "undefined reference to `aligned_alloc'"
-#MAGICK_VERSION=6.9.11-0
+MAGICK_VERSION=6.9.11-6
+if [ "${CENTOS}" = 6 ] && [ -z "${DTS}" ]; then
+    MAGICK_VERSION=6.9.10-78 # 6.9.10-79 and later fail to compile on CentOS6 with "undefined reference to `aligned_alloc'"
+fi
 MAGICK_VERSION_SHORT=${MAGICK_VERSION%-*}
 #MAGICK_TAR="ImageMagick6-${MAGICK_VERSION}.tar.gz"
 #MAGICK_SITE="https://gitlab.com/ImageMagick/ImageMagick6/-/archive/${MAGICK_VERSION}"
diff --git a/tools/jenkins/include/scripts/pkg/imagemagick7.sh b/tools/jenkins/include/scripts/pkg/imagemagick7.sh
index 30d5a4ca63..c7ddf07f74 100644
--- a/tools/jenkins/include/scripts/pkg/imagemagick7.sh
+++ b/tools/jenkins/include/scripts/pkg/imagemagick7.sh
@@ -2,8 +2,10 @@
 
 # install ImageMagick7
 # see http://www.linuxfromscratch.org/blfs/view/cvs/general/imagemagick.html
-MAGICK7_VERSION=7.0.9-8 # latest is 7.0.9-23, but 7.0.9-9 (probably) and later fail to compile on CentOS6 with "undefined reference to `aligned_alloc'"
-#MAGICK7_VERSION=7.0.9-23
+MAGICK7_VERSION=7.0.10-6
+if [ "${CENTOS}" = 6 ] && [ -z "${DTS}" ]; then
+    MAGICK7_VERSION=7.0.9-8 # 7.0.9-9 (probably) and later fail to compile on CentOS6 with "undefined reference to `aligned_alloc'"
+fi
 MAGICK7_VERSION_SHORT=${MAGICK7_VERSION%-*}
 MAGICK7_TAR="ImageMagick-${MAGICK7_VERSION}.tar.gz"
 #MAGICK7_SITE="https://gitlab.com/ImageMagick/ImageMagick/-/archive/${MAGICK7_VERSION}"
diff --git a/tools/jenkins/include/scripts/pkg/libcroco.sh b/tools/jenkins/include/scripts/pkg/libcroco.sh
index c34e809f85..00604cf3f6 100644
--- a/tools/jenkins/include/scripts/pkg/libcroco.sh
+++ b/tools/jenkins/include/scripts/pkg/libcroco.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # Install libcroco (requires glib and libxml2)
-# see http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html
+# see https://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
+# https://web.archive.org/web/20190719030924/http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html
+# http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html
 LIBCROCO_VERSION=0.6.13
 LIBCROCO_VERSION_SHORT=${LIBCROCO_VERSION%.*}
 LIBCROCO_TAR="libcroco-${LIBCROCO_VERSION}.tar.xz"
diff --git a/tools/jenkins/include/scripts/pkg/meson.sh b/tools/jenkins/include/scripts/pkg/meson.sh
index ac42e6ded4..12ec91762e 100644
--- a/tools/jenkins/include/scripts/pkg/meson.sh
+++ b/tools/jenkins/include/scripts/pkg/meson.sh
@@ -2,7 +2,7 @@
 
 # Install meson
 # see http://www.linuxfromscratch.org/lfs/view/development/chapter06/meson.html
-MESON_VERSION=0.53.2
+MESON_VERSION=0.54.0
 if build_step && { force_build || { [ ! -x "$SDK_HOME/bin/meson" ] || [ $("$SDK_HOME/bin/meson" --version) != ${MESON_VERSION} ];  }; }; then
     start_build
     ${SDK_HOME}/bin/pip${PY3_VERSION_SHORT} install --no-binary meson meson=="${MESON_VERSION}"
diff --git a/tools/jenkins/include/scripts/pkg/openimageio.sh b/tools/jenkins/include/scripts/pkg/openimageio.sh
index aa8eab0450..cac018fbbe 100644
--- a/tools/jenkins/include/scripts/pkg/openimageio.sh
+++ b/tools/jenkins/include/scripts/pkg/openimageio.sh
@@ -2,7 +2,7 @@
 
 # Install oiio
 # see https://github.com/OpenImageIO/oiio/releases
-OIIO_VERSION=2.1.12.0
+OIIO_VERSION=2.1.13.0
 OIIO_VERSION_SHORT=${OIIO_VERSION%.*}
 OIIO_TAR="oiio-Release-${OIIO_VERSION}.tar.gz"
 if download_step; then
diff --git a/tools/jenkins/include/scripts/pkg/openssl-installer.sh b/tools/jenkins/include/scripts/pkg/openssl-installer.sh
index d31e1dc3b0..7e3cc72773 100644
--- a/tools/jenkins/include/scripts/pkg/openssl-installer.sh
+++ b/tools/jenkins/include/scripts/pkg/openssl-installer.sh
@@ -2,7 +2,7 @@
 
 # Install openssl for installer
 # see http://www.linuxfromscratch.org/lfs/view/development/chapter06/openssl.html
-OPENSSL_VERSION=1.1.1d
+OPENSSL_VERSION=1.1.1f
 # see https://web.archive.org/web/20181008083143/http://www.linuxfromscratch.org/blfs/view/svn/postlfs/openssl10.html
 #OPENSSL_VERSION=1.0.2t
 OPENSSL_TAR="openssl-${OPENSSL_VERSION}.tar.gz" # always a new version around the corner
diff --git a/tools/jenkins/include/scripts/pkg/perl.sh b/tools/jenkins/include/scripts/pkg/perl.sh
index 7e8ea65900..f1addceace 100644
--- a/tools/jenkins/include/scripts/pkg/perl.sh
+++ b/tools/jenkins/include/scripts/pkg/perl.sh
@@ -2,7 +2,7 @@
 
 # Install perl (required to install XML:Parser perl module used by intltool)
 # see http://www.linuxfromscratch.org/lfs/view/development/chapter06/perl.html
-PERL_VERSION=5.30.1
+PERL_VERSION=5.30.2
 PERL_TAR="perl-${PERL_VERSION}.tar.gz"
 PERL_SITE="http://www.cpan.org/src/5.0"
 if download_step; then
diff --git a/tools/jenkins/include/scripts/pkg/poppler-glib.sh b/tools/jenkins/include/scripts/pkg/poppler-glib.sh
index c540642116..f7b6a6ce76 100644
--- a/tools/jenkins/include/scripts/pkg/poppler-glib.sh
+++ b/tools/jenkins/include/scripts/pkg/poppler-glib.sh
@@ -2,7 +2,7 @@
 
 # Install poppler-glib (without curl, nss3, qt4, qt5)
 # see http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html
-POPPLER_VERSION=0.86.1
+POPPLER_VERSION=0.87.0
 POPPLER_TAR="poppler-${POPPLER_VERSION}.tar.xz"
 POPPLER_SITE="https://poppler.freedesktop.org"
 if download_step; then
diff --git a/tools/jenkins/include/scripts/pkg/psycopg2.sh b/tools/jenkins/include/scripts/pkg/psycopg2.sh
index 50cb3cb318..53cc0f265d 100644
--- a/tools/jenkins/include/scripts/pkg/psycopg2.sh
+++ b/tools/jenkins/include/scripts/pkg/psycopg2.sh
@@ -2,7 +2,7 @@
 
 # install psycopg2 (PostgreSQL connector)
 # see https://pypi.python.org/pypi/psycopg2
-PSYCOPG2_VERSION=2.8.4
+PSYCOPG2_VERSION=2.8.5
 if build_step && { force_build || { [ ! -d "$SDK_HOME/lib/python${PY2_VERSION_SHORT}/site-packages/psycopg2" ] || [ $("$SDK_HOME/bin/python${PY2_VERSION_SHORT}" -c "import psycopg2; print(psycopg2.__version__.split(' ', 1)[0])") != ${PSYCOPG2_VERSION} ]; }; }; then
     start_build
     ${SDK_HOME}/bin/pip${PY2_VERSION_SHORT} install --no-binary psycopg2 psycopg2=="${PSYCOPG2_VERSION}"
diff --git a/tools/jenkins/include/scripts/pkg/ruby.sh b/tools/jenkins/include/scripts/pkg/ruby.sh
index 3288ff1cbc..a25c84a85b 100644
--- a/tools/jenkins/include/scripts/pkg/ruby.sh
+++ b/tools/jenkins/include/scripts/pkg/ruby.sh
@@ -2,7 +2,7 @@
 
 # Install ruby (necessary for qtwebkit)
 # see http://www.linuxfromscratch.org/blfs/view/cvs/general/ruby.html
-RUBY_VERSION=2.7.0
+RUBY_VERSION=2.7.1
 RUBY_VERSION_SHORT=${RUBY_VERSION%.*}
 RUBY_VERSION_PKG=${RUBY_VERSION_SHORT}.0
 RUBY_TAR="ruby-${RUBY_VERSION}.tar.xz"
diff --git a/tools/jenkins/include/scripts/pkg/xz.sh b/tools/jenkins/include/scripts/pkg/xz.sh
index ce4d986505..1d144a8cbb 100644
--- a/tools/jenkins/include/scripts/pkg/xz.sh
+++ b/tools/jenkins/include/scripts/pkg/xz.sh
@@ -2,7 +2,7 @@
 
 # Install xz (required to uncompress source tarballs)
 # see http://www.linuxfromscratch.org/lfs/view/development/chapter06/xz.html
-XZ_VERSION=5.2.4
+XZ_VERSION=5.2.5
 XZ_TAR="xz-${XZ_VERSION}.tar.bz2"
 XZ_SITE="https://tukaani.org/xz"
 if download_step; then