From bd4c6361f33fb8b47c88240a4afaeaee216ff771 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 3 Sep 2021 09:00:17 +0100
Subject: [PATCH 1/3] Add cmake-3.21.2

---
 scripts/cmake/3.21.2/.travis.yml | 15 +++++++++
 scripts/cmake/3.21.2/script.sh   | 55 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 scripts/cmake/3.21.2/.travis.yml
 create mode 100755 scripts/cmake/3.21.2/script.sh

diff --git a/scripts/cmake/3.21.2/.travis.yml b/scripts/cmake/3.21.2/.travis.yml
new file mode 100644
index 000000000..5fd35762f
--- /dev/null
+++ b/scripts/cmake/3.21.2/.travis.yml
@@ -0,0 +1,15 @@
+language: generic
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode11.6
+    - os: linux
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'libstdc++-6-dev' ]
+
+script:
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}
diff --git a/scripts/cmake/3.21.2/script.sh b/scripts/cmake/3.21.2/script.sh
new file mode 100755
index 000000000..6871b06e3
--- /dev/null
+++ b/scripts/cmake/3.21.2/script.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+MASON_NAME=cmake
+MASON_VERSION=3.21.2
+MASON_LIB_FILE=bin/cmake
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/Kitware/CMake/releases/download/v${MASON_VERSION}/cmake-${MASON_VERSION}.tar.gz \
+        332c23cdda5f4acb8e1ea4bbc5bfaf599d6adc23
+
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
+}
+
+function mason_prepare_compile {
+    ${MASON_DIR}/mason install ccache 3.7.2
+    export PATH=$(${MASON_DIR}/mason prefix ccache 3.7.2)/bin:${PATH}
+}
+function mason_compile {
+    # Add optimization flags since CFLAGS overrides the default (-g -O2)
+    export CFLAGS="${CFLAGS} -O3 -DNDEBUG"
+    export CXXFLAGS="${CXXFLAGS} -O3 -DNDEBUG"
+    # TODO - use mason deps
+    ./configure --prefix=${MASON_PREFIX} \
+      --no-system-libs \
+      --parallel=${MASON_CONCURRENCY} \
+      --enable-ccache
+    make -j${MASON_CONCURRENCY} VERBOSE=1
+    make install
+    # remove non-essential things to save on package size
+    rm -f ${MASON_PREFIX}/bin/ccmake
+    rm -f ${MASON_PREFIX}/bin/cmakexbuild
+    rm -f ${MASON_PREFIX}/bin/cpack
+    rm -f ${MASON_PREFIX}/bin/ctest
+    rm -rf ${MASON_PREFIX}/share/cmake-*/Help
+    ls -lh ${MASON_PREFIX}/bin/
+}
+
+function mason_cflags {
+    :
+}
+
+function mason_ldflags {
+    :
+}
+
+function mason_clean {
+    make clean
+}
+
+mason_run "$@"

From db1cc3653742ef92f5876ebf9e5948d933858820 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 3 Sep 2021 09:14:03 +0100
Subject: [PATCH 2/3] Update sha

---
 scripts/cmake/3.21.2/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cmake/3.21.2/script.sh b/scripts/cmake/3.21.2/script.sh
index 6871b06e3..382298552 100755
--- a/scripts/cmake/3.21.2/script.sh
+++ b/scripts/cmake/3.21.2/script.sh
@@ -9,7 +9,7 @@ MASON_LIB_FILE=bin/cmake
 function mason_load_source {
     mason_download \
         https://github.com/Kitware/CMake/releases/download/v${MASON_VERSION}/cmake-${MASON_VERSION}.tar.gz \
-        332c23cdda5f4acb8e1ea4bbc5bfaf599d6adc23
+        e41de8fab437ea46c8c8668a2920a5cf53f2915d
 
     mason_extract_tar_gz
 

From a8085e4959b1c6e9e8c85a38a611b13cb4297470 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 3 Sep 2021 09:54:01 +0100
Subject: [PATCH 3/3] Update download URLs for old (< 2.7.1) FreeType versions

---
 scripts/freetype/2.5.4/script.sh | 2 +-
 scripts/freetype/2.5.5/script.sh | 2 +-
 scripts/freetype/2.6.5/script.sh | 2 +-
 scripts/freetype/2.6/script.sh   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/freetype/2.5.4/script.sh b/scripts/freetype/2.5.4/script.sh
index 0993712d9..86c2f884f 100755
--- a/scripts/freetype/2.5.4/script.sh
+++ b/scripts/freetype/2.5.4/script.sh
@@ -9,7 +9,7 @@ MASON_PKGCONFIG_FILE=lib/pkgconfig/freetype2.pc
 
 function mason_load_source {
     mason_download \
-        https://nongnu.askapache.com/freetype/freetype-${MASON_VERSION}.tar.bz2 \
+        https://nongnu.askapache.com/freetype/freetype-old/freetype-${MASON_VERSION}.tar.bz2 \
         0646f7e62a6191affe92270e2544e6011f5227e8
 
     mason_extract_tar_bz2
diff --git a/scripts/freetype/2.5.5/script.sh b/scripts/freetype/2.5.5/script.sh
index c857f30c1..339350747 100755
--- a/scripts/freetype/2.5.5/script.sh
+++ b/scripts/freetype/2.5.5/script.sh
@@ -9,7 +9,7 @@ MASON_PKGCONFIG_FILE=lib/pkgconfig/freetype2.pc
 
 function mason_load_source {
     mason_download \
-        https://nongnu.askapache.com/freetype/freetype-${MASON_VERSION}.tar.bz2 \
+        https://nongnu.askapache.com/freetype/freetype-old/freetype-${MASON_VERSION}.tar.bz2 \
         c857bfa638b9c71e48baacd1cb12be446b62c333
 
     mason_extract_tar_bz2
diff --git a/scripts/freetype/2.6.5/script.sh b/scripts/freetype/2.6.5/script.sh
index 93c1190ed..c28316095 100755
--- a/scripts/freetype/2.6.5/script.sh
+++ b/scripts/freetype/2.6.5/script.sh
@@ -9,7 +9,7 @@ MASON_PKGCONFIG_FILE=lib/pkgconfig/freetype2.pc
 
 function mason_load_source {
     mason_download \
-        https://nongnu.askapache.com/freetype/freetype-${MASON_VERSION}.tar.bz2 \
+        https://nongnu.askapache.com/freetype/freetype-old/freetype-${MASON_VERSION}.tar.bz2 \
         24dd30c95d3795cb3d82a760b9858992de262630
 
     mason_extract_tar_bz2
diff --git a/scripts/freetype/2.6/script.sh b/scripts/freetype/2.6/script.sh
index 5279faf01..222bd9901 100755
--- a/scripts/freetype/2.6/script.sh
+++ b/scripts/freetype/2.6/script.sh
@@ -9,7 +9,7 @@ MASON_PKGCONFIG_FILE=lib/pkgconfig/freetype2.pc
 
 function mason_load_source {
     mason_download \
-        https://nongnu.askapache.com/freetype/freetype-${MASON_VERSION}.tar.bz2 \
+        https://nongnu.askapache.com/freetype/freetype-old/freetype-${MASON_VERSION}.tar.bz2 \
         3cdf364b5db1c1adba670b188d76035ecba2d77c
 
     mason_extract_tar_bz2