From bfc582181fe076e057a9655ee202bc54ab9e921d Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Wed, 22 Jun 2022 18:05:10 -0400
Subject: [PATCH 1/7] ENH: Re-factor manylinux scripts introducing
 MANYLINUX_VERSION and IMAGE_TAG

---
 scripts/dockcross-manylinux-build-module-wheels.sh | 5 ++++-
 scripts/dockcross-manylinux-build-wheels.sh        | 5 ++++-
 scripts/internal/manylinux-build-common.sh         | 4 +++-
 scripts/internal/manylinux-build-module-wheels.sh  | 6 +++---
 scripts/internal/manylinux-build-wheels.sh         | 6 +++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/scripts/dockcross-manylinux-build-module-wheels.sh b/scripts/dockcross-manylinux-build-module-wheels.sh
index 047814a4..7b56297e 100755
--- a/scripts/dockcross-manylinux-build-module-wheels.sh
+++ b/scripts/dockcross-manylinux-build-module-wheels.sh
@@ -17,8 +17,11 @@
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 #
 
+MANYLINUX_VERSION=2014
+IMAGE_TAG=20211011-a315bdc
+
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux2014-x64:20211011-a315bdc > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)
diff --git a/scripts/dockcross-manylinux-build-wheels.sh b/scripts/dockcross-manylinux-build-wheels.sh
index af91914f..fcc7ed67 100755
--- a/scripts/dockcross-manylinux-build-wheels.sh
+++ b/scripts/dockcross-manylinux-build-wheels.sh
@@ -7,8 +7,11 @@
 #
 #   scripts/dockcross-manylinux-build-wheels.sh cp39
 
+MANYLINUX_VERSION=2014
+IMAGE_TAG=20211011-a315bdc
+
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux2014-x64:20211011-a315bdc > /tmp/dockcross-manylinux-x64
+docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)
diff --git a/scripts/internal/manylinux-build-common.sh b/scripts/internal/manylinux-build-common.sh
index 342f52d8..0866e583 100644
--- a/scripts/internal/manylinux-build-common.sh
+++ b/scripts/internal/manylinux-build-common.sh
@@ -84,4 +84,6 @@ if ! type ninja > /dev/null 2>&1; then
   popd
 fi
 
-echo "Building wheels for $ARCH"
+MANYLINUX_VERSION=2014
+
+echo "Building wheels for $ARCH using manylinux${MANYLINUX_VERSION}"
diff --git a/scripts/internal/manylinux-build-module-wheels.sh b/scripts/internal/manylinux-build-module-wheels.sh
index 1af3fe85..7635f7f5 100755
--- a/scripts/internal/manylinux-build-module-wheels.sh
+++ b/scripts/internal/manylinux-build-module-wheels.sh
@@ -78,8 +78,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
     version=$(basename $(dirname ${PYBIN}))
     # Remove "m" -- not present in Python 3.8 and later
     version=${version:0:9}
-    itk_build_dir=/work/$(basename /ITKPythonPackage/ITK-${version}*-manylinux2014_${ARCH})
-    ln -fs /ITKPythonPackage/ITK-${version}*-manylinux2014_${ARCH} $itk_build_dir
+    itk_build_dir=/work/$(basename /ITKPythonPackage/ITK-${version}*-manylinux${MANYLINUX_VERSION}_${ARCH})
+    ln -fs /ITKPythonPackage/ITK-${version}*-manylinux${MANYLINUX_VERSION}_${ARCH} $itk_build_dir
     if [[ ! -d ${itk_build_dir} ]]; then
       echo 'ITK build tree not available!' 1>&2
       exit 1
@@ -117,6 +117,6 @@ if test "${ARCH}" == "x64"; then
 fi
 if compgen -G "dist/itk*-linux*.whl" > /dev/null; then
   for itk_wheel in dist/itk*-linux*.whl; do
-    mv ${itk_wheel} ${itk_wheel/linux/manylinux2014}
+    mv ${itk_wheel} ${itk_wheel/linux/manylinux${MANYLINUX_VERSION}}
   done
 fi
diff --git a/scripts/internal/manylinux-build-wheels.sh b/scripts/internal/manylinux-build-wheels.sh
index 0bda3d71..08e9f664 100755
--- a/scripts/internal/manylinux-build-wheels.sh
+++ b/scripts/internal/manylinux-build-wheels.sh
@@ -56,7 +56,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
     build_type="Release"
     compile_flags="-O3 -DNDEBUG"
     source_path=/work/ITK-source/ITK
-    build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux2014_${ARCH}
+    build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux${MANYLINUX_VERSION}_${ARCH}
     SETUP_PY_CONFIGURE="${script_dir}/../setup_py_configure.py"
     SKBUILD_CMAKE_INSTALL_PREFIX=$(${Python3_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
 
@@ -167,9 +167,9 @@ done
 
 if test "${ARCH}" == "x64"; then
   sudo /opt/python/cp39-cp39/bin/pip3 install auditwheel wheel
-  # This step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
+  # This step will fixup the wheel switching from 'linux' to 'manylinux<version>' tag
   for whl in dist/itk_*linux_$(uname -p).whl; do
-      /opt/python/cp39-cp39/bin/auditwheel repair --plat manylinux2014_x86_64 ${whl} -w /work/dist/
+      /opt/python/cp39-cp39/bin/auditwheel repair --plat manylinux${MANYLINUX_VERSION}_x86_64 ${whl} -w /work/dist/
       rm ${whl}
   done
 else

From 274f73e923ad474e27909754a17b90874d1fdf56 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Wed, 22 Jun 2022 18:09:49 -0400
Subject: [PATCH 2/7] ENH: Update manylinux scripts to use version 2_24

---
 scripts/dockcross-manylinux-build-module-wheels.sh | 4 ++--
 scripts/dockcross-manylinux-build-wheels.sh        | 4 ++--
 scripts/internal/manylinux-build-common.sh         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/dockcross-manylinux-build-module-wheels.sh b/scripts/dockcross-manylinux-build-module-wheels.sh
index 7b56297e..0f7ab05d 100755
--- a/scripts/dockcross-manylinux-build-module-wheels.sh
+++ b/scripts/dockcross-manylinux-build-module-wheels.sh
@@ -17,8 +17,8 @@
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 #
 
-MANYLINUX_VERSION=2014
-IMAGE_TAG=20211011-a315bdc
+MANYLINUX_VERSION=_2_24
+IMAGE_TAG=20220622-343dde5
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
diff --git a/scripts/dockcross-manylinux-build-wheels.sh b/scripts/dockcross-manylinux-build-wheels.sh
index fcc7ed67..9ab321e3 100755
--- a/scripts/dockcross-manylinux-build-wheels.sh
+++ b/scripts/dockcross-manylinux-build-wheels.sh
@@ -7,8 +7,8 @@
 #
 #   scripts/dockcross-manylinux-build-wheels.sh cp39
 
-MANYLINUX_VERSION=2014
-IMAGE_TAG=20211011-a315bdc
+MANYLINUX_VERSION=_2_24
+IMAGE_TAG=20220622-343dde5
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
diff --git a/scripts/internal/manylinux-build-common.sh b/scripts/internal/manylinux-build-common.sh
index 0866e583..3d21ab71 100644
--- a/scripts/internal/manylinux-build-common.sh
+++ b/scripts/internal/manylinux-build-common.sh
@@ -84,6 +84,6 @@ if ! type ninja > /dev/null 2>&1; then
   popd
 fi
 
-MANYLINUX_VERSION=2014
+MANYLINUX_VERSION=_2_24
 
 echo "Building wheels for $ARCH using manylinux${MANYLINUX_VERSION}"

From 4961880f4ab119cedd85e6073e1057c3d08868da Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Wed, 22 Jun 2022 18:25:57 -0400
Subject: [PATCH 3/7] COMP: Fix manylinux scripts using  portable "uname -m"
 command

The use of "uname -p" returns "unknown" when used within the 2_24 image.
---
 scripts/internal/manylinux-build-common.sh        | 8 ++++----
 scripts/internal/manylinux-build-module-wheels.sh | 4 ++--
 scripts/internal/manylinux-build-wheels.sh        | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/internal/manylinux-build-common.sh b/scripts/internal/manylinux-build-common.sh
index 3d21ab71..e29b72b5 100644
--- a/scripts/internal/manylinux-build-common.sh
+++ b/scripts/internal/manylinux-build-common.sh
@@ -28,7 +28,7 @@ else
 fi
 
 # i686 or x86_64 ?
-case $(uname -p) in
+case $(uname -m) in
     i686)
         ARCH=x86
         ;;
@@ -39,13 +39,13 @@ case $(uname -p) in
         ARCH=aarch64
         ;;
     *)
-        die "Unknown architecture $(uname -p)"
+        die "Unknown architecture $(uname -m)"
         ;;
 esac
 
 # Install prerequirements
 export PATH=/work/tools/doxygen-1.8.11/bin:$PATH
-case $(uname -p) in
+case $(uname -m) in
     i686)
         ARCH=x86
         ;;
@@ -69,7 +69,7 @@ case $(uname -p) in
         fi
         ;;
     *)
-        die "Unknown architecture $(uname -p)"
+        die "Unknown architecture $(uname -m)"
         ;;
 esac
 if ! type ninja > /dev/null 2>&1; then
diff --git a/scripts/internal/manylinux-build-module-wheels.sh b/scripts/internal/manylinux-build-module-wheels.sh
index 7635f7f5..7a317925 100755
--- a/scripts/internal/manylinux-build-module-wheels.sh
+++ b/scripts/internal/manylinux-build-module-wheels.sh
@@ -95,7 +95,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
       -DITK_USE_SYSTEM_SWIG:BOOL=ON \
       -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
       -DSWIG_EXECUTABLE:FILEPATH=${itk_build_dir}/Wrapping/Generators/SwigInterface/swig/bin/swig \
-      -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
+      -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
       -DBUILD_TESTING:BOOL=OFF \
       -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
       -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
@@ -108,7 +108,7 @@ if test "${ARCH}" == "x64"; then
   # Make sure auditwheel is installed for this python exe before importing
   # it in auditwheel_whitelist_monkeypatch.py
   sudo ${Python3_EXECUTABLE} -m pip install auditwheel
-  for whl in dist/*linux_$(uname -p).whl; do
+  for whl in dist/*linux_$(uname -m).whl; do
     # Repair wheel using monkey patch to exclude shared libraries provided in whitelist
     ${Python3_EXECUTABLE} "${script_dir}/auditwheel_whitelist_monkeypatch.py" \
       repair ${whl} -w /work/dist/ --whitelist "${EXCLUDE_LIBS}"
diff --git a/scripts/internal/manylinux-build-wheels.sh b/scripts/internal/manylinux-build-wheels.sh
index 08e9f664..c1ab4b65 100755
--- a/scripts/internal/manylinux-build-wheels.sh
+++ b/scripts/internal/manylinux-build-wheels.sh
@@ -81,7 +81,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
             -DITK_WRAP_double:BOOL=ON \
             -DITK_WRAP_complex_double:BOOL=ON \
             -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
-            -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
+            -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
             -DCMAKE_CXX_FLAGS:STRING="$compile_flags" \
             -DCMAKE_C_FLAGS:STRING="$compile_flags" \
             -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
@@ -110,7 +110,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
           -DBUILD_TESTING:BOOL=OFF \
           -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
           -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
-          -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
+          -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
           -DCMAKE_CXX_FLAGS:STRING="$compile_flags" \
           -DCMAKE_C_FLAGS:STRING="$compile_flags" \
           -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
@@ -168,12 +168,12 @@ done
 if test "${ARCH}" == "x64"; then
   sudo /opt/python/cp39-cp39/bin/pip3 install auditwheel wheel
   # This step will fixup the wheel switching from 'linux' to 'manylinux<version>' tag
-  for whl in dist/itk_*linux_$(uname -p).whl; do
+  for whl in dist/itk_*linux_$(uname -m).whl; do
       /opt/python/cp39-cp39/bin/auditwheel repair --plat manylinux${MANYLINUX_VERSION}_x86_64 ${whl} -w /work/dist/
       rm ${whl}
   done
 else
-  for whl in dist/itk_*$(uname -p).whl; do
+  for whl in dist/itk_*$(uname -m).whl; do
       auditwheel repair ${whl} -w /work/dist/
       rm ${whl}
   done

From 3ff4f6fd324f5c6635b58f6b66f36cbcc00536ca Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Wed, 22 Jun 2022 19:00:10 -0400
Subject: [PATCH 4/7] COMP: Fix TBB configuration always using "lib" directory

---
 CMakeLists.txt                                    | 9 +++------
 scripts/internal/manylinux-build-module-wheels.sh | 2 +-
 scripts/internal/manylinux-build-wheels.sh        | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad06f92a..f56192b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,14 +16,10 @@ message(STATUS "SuperBuild - ITKPythonPackage_WHEEL_NAME:${ITKPythonPackage_WHEE
 
 option(ITKPythonPackage_USE_TBB "Build and use oneTBB in the ITK python package" ON)
 
-set(libpath "lib")
-if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-  set(libpath "lib64")
-endif()
 if(ITK_SOURCE_DIR)
-  set(TBB_DIR "${ITK_SOURCE_DIR}/../oneTBB-prefix/${libpath}/cmake/TBB")
+  set(TBB_DIR "${ITK_SOURCE_DIR}/../oneTBB-prefix/lib/cmake/TBB")
 else()
-  set(TBB_DIR "${CMAKE_BINARY_DIR}/../oneTBB-prefix/${libpath}/cmake/TBB")
+  set(TBB_DIR "${CMAKE_BINARY_DIR}/../oneTBB-prefix/lib/cmake/TBB")
 endif()
 set(tbb_args )
 if(ITKPythonPackage_USE_TBB)
@@ -116,6 +112,7 @@ if(ITKPythonPackage_SUPERBUILD)
         -DTBB_TEST:BOOL=OFF
         -DCMAKE_BUILD_TYPE:STRING=Release
         -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/../oneTBB-prefix
+        -DCMAKE_INSTALL_LIBDIR:STRING=lib # Skip default initialization by GNUInstallDirs CMake module
         ${ep_common_cmake_cache_args}
         -DCMAKE_BUILD_TYPE:STRING=Release
       BUILD_BYPRODUCTS "${TBB_DIR}/TBBConfig.cmake"
diff --git a/scripts/internal/manylinux-build-module-wheels.sh b/scripts/internal/manylinux-build-module-wheels.sh
index 7a317925..231cb197 100755
--- a/scripts/internal/manylinux-build-module-wheels.sh
+++ b/scripts/internal/manylinux-build-module-wheels.sh
@@ -61,7 +61,7 @@ source "${script_dir}/manylinux-build-common.sh"
 
 # Set up library paths in container so that shared libraries can be added to wheels
 sudo ldconfig
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/work/oneTBB-prefix/lib64:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/work/oneTBB-prefix/lib:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64
 
 # Compile wheels re-using standalone project and archive cache
 for PYBIN in "${PYBINARIES[@]}"; do
diff --git a/scripts/internal/manylinux-build-wheels.sh b/scripts/internal/manylinux-build-wheels.sh
index c1ab4b65..10c73915 100755
--- a/scripts/internal/manylinux-build-wheels.sh
+++ b/scripts/internal/manylinux-build-wheels.sh
@@ -34,10 +34,10 @@ pushd /work/ITK-source > /dev/null 2>&1
   cmake -DITKPythonPackage_BUILD_PYTHON:PATH=0 -G Ninja ../
   ninja
 popd > /dev/null 2>&1
-tbb_dir=/work/oneTBB-prefix/lib64/cmake/TBB
+tbb_dir=/work/oneTBB-prefix/lib/cmake/TBB
 # So auditwheel can find the libs
 sudo ldconfig
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/work/oneTBB-prefix/lib64:/usr/lib:/usr/lib64
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/work/oneTBB-prefix/lib:/usr/lib:/usr/lib64
 
 SINGLE_WHEEL=0
 

From bbd9c9b1364a9fc09e95d93f86ab3f971e2ae0b8 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Wed, 22 Jun 2022 23:41:42 -0400
Subject: [PATCH 5/7] WIP: Update version of test purpose **do not merge**

---
 CMakeLists.txt | 6 +++---
 itkVersion.py  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f56192b4..41ee98ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,10 +87,10 @@ if(ITKPythonPackage_SUPERBUILD)
   #-----------------------------------------------------------------------------
   include(ExternalProject)
 
-  set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
+  set(ITK_REPOSITORY "https://github.com/jcfr/ITK.git")
 
-  # ITK nightly-master 2022-06-16
-  set(ITK_GIT_TAG "8b2a3d3fb3")
+  # ITK update-from-manylinux2014-to-manylinux_2_24 2022-06-22
+  set(ITK_GIT_TAG "8ca6e8dc15")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
diff --git a/itkVersion.py b/itkVersion.py
index 93015995..a5d5d421 100644
--- a/itkVersion.py
+++ b/itkVersion.py
@@ -1,4 +1,4 @@
-VERSION = '5.3rc03.dev20220616+486.g8b2a3d3fb3'
+VERSION = '5.3rc03.dev20220622+489.g8ca6e8dc15'
 
 def get_versions():
     """Returns versions for the ITK Python package.

From e0ee330c57f80c64b95873f5c5542856b699f546 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Tue, 5 Jul 2022 18:01:17 -0400
Subject: [PATCH 6/7] ENH: Set ITK repository back to InsightSoftwareConsortium

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41ee98ec..03cf921e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,10 +87,10 @@ if(ITKPythonPackage_SUPERBUILD)
   #-----------------------------------------------------------------------------
   include(ExternalProject)
 
-  set(ITK_REPOSITORY "https://github.com/jcfr/ITK.git")
+  set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
-  # ITK update-from-manylinux2014-to-manylinux_2_24 2022-06-22
-  set(ITK_GIT_TAG "8ca6e8dc15")
+  # ITK nightly-master 2022-07-05
+  set(ITK_GIT_TAG "c44a7731f22bd5d241ac8f9369018671800f5cd9")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused

From 722b8b1760f46ca5ceb762a6ecb08449b81b04e2 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Tue, 5 Jul 2022 19:13:21 -0400
Subject: [PATCH 7/7] ENH: Update manylinux image to
 dockcross/manylinux_2_28-x64:20220705-b1eb184

---
 .../dockcross-manylinux-build-module-wheels.sh   |  4 ++--
 scripts/dockcross-manylinux-build-wheels.sh      |  4 ++--
 scripts/internal/manylinux-build-common.sh       | 16 ++++++----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/scripts/dockcross-manylinux-build-module-wheels.sh b/scripts/dockcross-manylinux-build-module-wheels.sh
index 0f7ab05d..b815e1de 100755
--- a/scripts/dockcross-manylinux-build-module-wheels.sh
+++ b/scripts/dockcross-manylinux-build-module-wheels.sh
@@ -17,8 +17,8 @@
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 #
 
-MANYLINUX_VERSION=_2_24
-IMAGE_TAG=20220622-343dde5
+MANYLINUX_VERSION=_2_28
+IMAGE_TAG=20220705-b1eb184
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
diff --git a/scripts/dockcross-manylinux-build-wheels.sh b/scripts/dockcross-manylinux-build-wheels.sh
index 9ab321e3..5e08311d 100755
--- a/scripts/dockcross-manylinux-build-wheels.sh
+++ b/scripts/dockcross-manylinux-build-wheels.sh
@@ -7,8 +7,8 @@
 #
 #   scripts/dockcross-manylinux-build-wheels.sh cp39
 
-MANYLINUX_VERSION=_2_24
-IMAGE_TAG=20220622-343dde5
+MANYLINUX_VERSION=_2_28
+IMAGE_TAG=20220705-b1eb184
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
diff --git a/scripts/internal/manylinux-build-common.sh b/scripts/internal/manylinux-build-common.sh
index e29b72b5..e6d29575 100644
--- a/scripts/internal/manylinux-build-common.sh
+++ b/scripts/internal/manylinux-build-common.sh
@@ -4,10 +4,6 @@
 set -e -x
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)
-# Workaround broken FindPython3 in CMake 3.17
-if test -e /usr/share/cmake-3.17/Modules/FindPython/Support.cmake; then
-  sudo cp ${script_dir}/Support.cmake /usr/share/cmake-3.17/Modules/FindPython/
-fi
 
 # Versions can be restricted by passing them in as arguments to the script
 # For example,
@@ -44,7 +40,7 @@ case $(uname -m) in
 esac
 
 # Install prerequirements
-export PATH=/work/tools/doxygen-1.8.11/bin:$PATH
+export PATH=/work/tools/doxygen-1.8.16/bin:$PATH
 case $(uname -m) in
     i686)
         ARCH=x86
@@ -53,8 +49,8 @@ case $(uname -m) in
         if ! type doxygen > /dev/null 2>&1; then
           mkdir -p /work/tools
             pushd /work/tools > /dev/null 2>&1
-            curl https://data.kitware.com/api/v1/file/5c0aa4b18d777f2179dd0a71/download -o doxygen-1.8.11.linux.bin.tar.gz
-            tar -xvzf doxygen-1.8.11.linux.bin.tar.gz
+            curl https://data.kitware.com/api/v1/file/62c4d615bddec9d0c46cb705/download -o doxygen-1.8.16.linux.bin.tar.gz
+            tar -xvzf doxygen-1.8.16.linux.bin.tar.gz
           popd > /dev/null 2>&1
         fi
         ;;
@@ -63,8 +59,8 @@ case $(uname -m) in
         if ! type doxygen > /dev/null 2>&1; then
           mkdir -p /work/tools
             pushd /work/tools > /dev/null 2>&1
-            curl https://data.kitware.com/api/v1/file/6086e4b02fa25629b93ac66e/download -o doxygen-1.8.11.linux.aarch64.bin.tar.gz
-            tar -xvzf doxygen-1.8.11.linux.aarch64.bin.tar.gz
+            curl https://data.kitware.com/api/v1/file/62c4ed58bddec9d0c46f1388/download -o doxygen-1.8.16.linux.aarch64.bin.tar.gz
+            tar -xvzf doxygen-1.8.16.linux.aarch64.bin.tar.gz
           popd > /dev/null 2>&1
         fi
         ;;
@@ -84,6 +80,6 @@ if ! type ninja > /dev/null 2>&1; then
   popd
 fi
 
-MANYLINUX_VERSION=_2_24
+MANYLINUX_VERSION=_2_28
 
 echo "Building wheels for $ARCH using manylinux${MANYLINUX_VERSION}"