From 1987bc5e23ff30cbd3e2aebd7fab6e44dbc35094 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 6 Nov 2023 16:51:03 -0800
Subject: [PATCH 01/22] Wheels: ADIOS2 v2.9.2

Build wheels with ADIOS2 v2.9.2, which fixes c-blosc2 issues with
null-blocks.
---
 library_builders.bat | 10 ++++------
 library_builders.sh  |  7 +++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index 6becb312ea..f636e7b42f 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -17,13 +17,11 @@ exit /b 0
 
 :build_adios2
   if exist adios2-stamp exit /b 0
-  ::curl -sLo adios2-2.9.1.zip ^
-  ::  https://github.com/ornladios/ADIOS2/archive/v2.9.1.zip
-  curl -sLo adios2-2.9.1.zip ^
-    https://github.com/ax3l/ADIOS2/archive/refs/heads/release-2.9.1-bp-wheels.zip
-  powershell Expand-Archive adios2-2.9.1.zip -DestinationPath dep-adios2
+  curl -sLo adios2-2.9.2.zip ^
+    https://github.com/ornladios/ADIOS2/archive/v2.9.2.zip
+  powershell Expand-Archive adios2-2.9.2.zip -DestinationPath dep-adios2
 
-  cmake -S dep-adios2/ADIOS2-release-2.9.1-bp-wheels -B build-adios2 ^
+  cmake -S dep-adios2/ADIOS2-2.9.2 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DBUILD_SHARED_LIBS=OFF     ^
     -DBUILD_TESTING=OFF         ^
diff --git a/library_builders.sh b/library_builders.sh
index 1326c4e989..1e7ac882cb 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -103,10 +103,8 @@ function build_adios1 {
 function build_adios2 {
     if [ -e adios2-stamp ]; then return; fi
 
-    #curl -sLo adios2-2.9.1.tar.gz \
-    #    https://github.com/ornladios/ADIOS2/archive/v2.9.1.tar.gz
-    curl -sLo adios2-2.9.1.tar.gz \
-        https://github.com/ax3l/ADIOS2/archive/refs/heads/release-2.9.1-bp-wheels.tar.gz
+    curl -sLo adios2-2.9.2.tar.gz \
+        https://github.com/ornladios/ADIOS2/archive/v2.9.2.tar.gz
     file adios2*.tar.gz
     tar -xzf adios2*.tar.gz
     rm adios2*.tar.gz
@@ -129,6 +127,7 @@ function build_adios2 {
         -DADIOS2_USE_MHS=OFF                      \
         -DADIOS2_USE_MPI=OFF                      \
         -DADIOS2_USE_PNG=OFF                      \
+        -DADIOS2_USE_Sodium=OFF                   \
         -DADIOS2_USE_SST=ON                       \
         -DADIOS2_USE_ZFP=ON                       \
         -DADIOS2_RUN_INSTALL_TEST=OFF             \

From b0c69445ed3b1cd9dd9033409d89140480ab7dba Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 6 Nov 2023 19:10:54 -0800
Subject: [PATCH 02/22] C-Blosc2 v2.11.1

---
 library_builders.bat | 15 ++++-----------
 library_builders.sh  |  7 ++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index f636e7b42f..e375d3c7c8 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -59,18 +59,11 @@ exit /b 0
 :build_blosc2
   if exist blosc2-stamp exit /b 0
 
-  curl -sLo blosc2-2.10.2.zip ^
-    https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.2.zip
-  powershell Expand-Archive blosc2-2.10.2.zip -DestinationPath dep-blosc2
+  curl -sLo blosc2-2.11.1.zip ^
+    https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.11.1.zip
+  powershell Expand-Archive blosc2-2.11.1.zip -DestinationPath dep-blosc2
 
-  :: Fix Threads search in Blosc2Config.cmake
-  :: https://github.com/Blosc/c-blosc2/pull/549
-  curl -sLo blosc2-threads.patch ^
-    https://github.com/Blosc/c-blosc2/pull/549.patch
-  python -m patch -p 1 -d dep-blosc2/c-blosc2-2.10.2 blosc2-threads.patch
-  if errorlevel 1 exit 1
-
-  cmake -S dep-blosc2/c-blosc2-2.10.2 -B build-blosc2 ^
+  cmake -S dep-blosc2/c-blosc2-2.11.1 -B build-blosc2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DBUILD_SHARED=OFF          ^
     -DBUILD_STATIC=ON           ^
diff --git a/library_builders.sh b/library_builders.sh
index 1e7ac882cb..507611f892 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -141,9 +141,6 @@ function build_adios2 {
     make -j${CPU_COUNT}
     make install
 
-    # CMake Config package of C-Blosc 2.10.1+ only
-    rm -rf ${BUILD_PREFIX}/lib*/cmake/adios2/FindBlosc2.cmake
-
     cd -
 
     rm -rf build-adios2
@@ -199,8 +196,8 @@ function build_blosc {
 function build_blosc2 {
     if [ -e blosc-stamp2 ]; then return; fi
 
-    curl -sLo blosc2-v2.10.2.tar.gz \
-        https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.2.tar.gz
+    curl -sLo blosc2-v2.11.1.tar.gz \
+        https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.11.1.tar.gz
     file blosc2*.tar.gz
     tar -xzf blosc2*.tar.gz
     rm blosc2*.tar.gz

From a9aaad91a911676cae27a84e42effa318cb51864 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Wed, 8 Nov 2023 00:48:21 -0800
Subject: [PATCH 03/22] ADIOS2: Remove installed FindBlosc2.cmake Again

---
 library_builders.bat | 5 +++++
 library_builders.sh  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/library_builders.bat b/library_builders.bat
index e375d3c7c8..091e00f606 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -49,6 +49,11 @@ exit /b 0
   cmake --build build-adios2 --target install --config Release
   if errorlevel 1 exit 1
 
+  :: CMake Config package of C-Blosc 2.10.1+ only
+  :: https://github.com/ornladios/ADIOS2/issues/3903
+  rmdir /s /q "%BUILD_PREFIX%/ADIOS2/lib/cmake/adios2/FindBlosc2.cmake"
+  if errorlevel 1 exit 1
+
   rmdir /s /q build-adios2
   if errorlevel 1 exit 1
 
diff --git a/library_builders.sh b/library_builders.sh
index 507611f892..fc971a0521 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -141,6 +141,10 @@ function build_adios2 {
     make -j${CPU_COUNT}
     make install
 
+    # CMake Config package of C-Blosc 2.10.1+ only
+    # https://github.com/ornladios/ADIOS2/issues/3903
+    rm -rf ${BUILD_PREFIX}/lib*/cmake/adios2/FindBlosc2.cmake
+
     cd -
 
     rm -rf build-adios2

From fe01198b4f799489f30d460f3e414277c4ccf382 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 9 Nov 2023 17:29:54 -0800
Subject: [PATCH 04/22] [Patch] C-Blosc2 Static

---
 library_builders.bat | 5 +++++
 library_builders.sh  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/library_builders.bat b/library_builders.bat
index 091e00f606..91345781ac 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -21,6 +21,11 @@ exit /b 0
     https://github.com/ornladios/ADIOS2/archive/v2.9.2.zip
   powershell Expand-Archive adios2-2.9.2.zip -DestinationPath dep-adios2
 
+  :: Patch Static Blosc2
+  curl -sLo find-blosc2.patch ^
+      https://github.com/ornladios/ADIOS2/commit/8333d5e6ff4665d12cbbd5bae5150bfff5be2daa.patch
+  python3 -m patch -p 1 -d ADIOS2-* find-blosc2.patch
+
   cmake -S dep-adios2/ADIOS2-2.9.2 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DBUILD_SHARED_LIBS=OFF     ^
diff --git a/library_builders.sh b/library_builders.sh
index fc971a0521..c10451e08b 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -109,6 +109,11 @@ function build_adios2 {
     tar -xzf adios2*.tar.gz
     rm adios2*.tar.gz
 
+    # Patch Static Blosc2
+    curl -sLo find-blosc2.patch \
+        https://github.com/ornladios/ADIOS2/commit/8333d5e6ff4665d12cbbd5bae5150bfff5be2daa.patch
+    python3 -m patch -p 1 -d ADIOS2-* find-blosc2.patch
+
     # build
     mkdir build-adios2
     cd build-adios2

From 4d4c45526a2ce387adfc2c577ce62862a62a1fb3 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 27 Nov 2023 19:12:24 -0800
Subject: [PATCH 05/22] No Patch: Static C-Blosc2

---
 library_builders.bat | 5 -----
 library_builders.sh  | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index 91345781ac..091e00f606 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -21,11 +21,6 @@ exit /b 0
     https://github.com/ornladios/ADIOS2/archive/v2.9.2.zip
   powershell Expand-Archive adios2-2.9.2.zip -DestinationPath dep-adios2
 
-  :: Patch Static Blosc2
-  curl -sLo find-blosc2.patch ^
-      https://github.com/ornladios/ADIOS2/commit/8333d5e6ff4665d12cbbd5bae5150bfff5be2daa.patch
-  python3 -m patch -p 1 -d ADIOS2-* find-blosc2.patch
-
   cmake -S dep-adios2/ADIOS2-2.9.2 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DBUILD_SHARED_LIBS=OFF     ^
diff --git a/library_builders.sh b/library_builders.sh
index c10451e08b..fc971a0521 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -109,11 +109,6 @@ function build_adios2 {
     tar -xzf adios2*.tar.gz
     rm adios2*.tar.gz
 
-    # Patch Static Blosc2
-    curl -sLo find-blosc2.patch \
-        https://github.com/ornladios/ADIOS2/commit/8333d5e6ff4665d12cbbd5bae5150bfff5be2daa.patch
-    python3 -m patch -p 1 -d ADIOS2-* find-blosc2.patch
-
     # build
     mkdir build-adios2
     cd build-adios2

From 3fb361fe6c415be0e25faaa928d81847663c16ad Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 30 Nov 2023 17:59:34 -0800
Subject: [PATCH 06/22] Windows: More Blosc2 Updates

---
 .github/workflows/build.yml | 2 +-
 library_builders.bat        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c49bc4b55..784a667e6a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -114,7 +114,7 @@ jobs:
         # for the openPMD-api build, CMake shall search for
         # static dependencies of HDF5 and ADIOS1 (see setup.py)
         CIBW_ENVIRONMENT: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' ADIOS_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON'
-        CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc;C:/Program Files (x86)/blosc2;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib'
+        CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc2;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib'
         # C++17 support in macOS 10.13+ (partial) and 10.14+ (std::visit) and 10.15+ (std::filesystem::path)
         #   https://cibuildwheel.readthedocs.io/en/stable/cpp_standards/#macos-and-deployment-target-versions
         # arm64/aarch64 (M1/M2) requires 11.0+
diff --git a/library_builders.bat b/library_builders.bat
index 091e00f606..c831ccf989 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -70,6 +70,8 @@ exit /b 0
 
   cmake -S dep-blosc2/c-blosc2-2.11.1 -B build-blosc2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
+    -DCMAKE_INSTALL_PREFIX=%BUILD_PREFIX%/blosc2  ^
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON   ^
     -DBUILD_SHARED=OFF          ^
     -DBUILD_STATIC=ON           ^
     -DBUILD_BENCHMARKS=OFF      ^

From 245bcf010bcf6ed739f8eeacc6f4bd4e1f66069f Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Fri, 22 Dec 2023 04:18:40 -0800
Subject: [PATCH 07/22] Windows: keep FindBlosc2.cmake

---
 library_builders.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index c831ccf989..30590e311a 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -51,8 +51,8 @@ exit /b 0
 
   :: CMake Config package of C-Blosc 2.10.1+ only
   :: https://github.com/ornladios/ADIOS2/issues/3903
-  rmdir /s /q "%BUILD_PREFIX%/ADIOS2/lib/cmake/adios2/FindBlosc2.cmake"
-  if errorlevel 1 exit 1
+  :: rmdir /s /q "%BUILD_PREFIX%/ADIOS2/lib/cmake/adios2/FindBlosc2.cmake"
+  :: if errorlevel 1 exit 1
 
   rmdir /s /q build-adios2
   if errorlevel 1 exit 1

From 56a8490496b0a89447a6db1156ffbc0a21b3b3b9 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Tue, 30 Jan 2024 10:29:26 -0800
Subject: [PATCH 08/22] Win: Try ADIOS2 v2.10.0-rc1

---
 library_builders.bat | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index 30590e311a..a8c55e63ee 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -17,11 +17,11 @@ exit /b 0
 
 :build_adios2
   if exist adios2-stamp exit /b 0
-  curl -sLo adios2-2.9.2.zip ^
-    https://github.com/ornladios/ADIOS2/archive/v2.9.2.zip
-  powershell Expand-Archive adios2-2.9.2.zip -DestinationPath dep-adios2
+  curl -sLo adios2-2.10.0-rc1.zip ^
+    https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.0-rc1.zip
+  powershell Expand-Archive adios2-2.10.0-rc1.zip -DestinationPath dep-adios2
 
-  cmake -S dep-adios2/ADIOS2-2.9.2 -B build-adios2 ^
+  cmake -S dep-adios2/ADIOS2-2.10.0-rc1 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DBUILD_SHARED_LIBS=OFF     ^
     -DBUILD_TESTING=OFF         ^

From 8d66b7ad3f8078aa08347418b907046cd7346ebe Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Tue, 30 Jan 2024 10:55:27 -0800
Subject: [PATCH 09/22] ADIOS2 Windows: Disable libFFI

---
 library_builders.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library_builders.bat b/library_builders.bat
index a8c55e63ee..10b399e61b 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -23,6 +23,7 @@ exit /b 0
 
   cmake -S dep-adios2/ADIOS2-2.10.0-rc1 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
+    -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE  ^
     -DBUILD_SHARED_LIBS=OFF     ^
     -DBUILD_TESTING=OFF         ^
     -DADIOS2_USE_MPI=OFF        ^

From 3c556b99453c1226ec1aa71cbe04568c59310611 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Tue, 27 Feb 2024 10:47:07 -0800
Subject: [PATCH 10/22] Print CMake Version

---
 library_builders.bat | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library_builders.bat b/library_builders.bat
index 10b399e61b..598519098b 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -21,6 +21,8 @@ exit /b 0
     https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.0-rc1.zip
   powershell Expand-Archive adios2-2.10.0-rc1.zip -DestinationPath dep-adios2
 
+  cmake --version
+
   cmake -S dep-adios2/ADIOS2-2.10.0-rc1 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE  ^
@@ -69,6 +71,8 @@ exit /b 0
     https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.11.1.zip
   powershell Expand-Archive blosc2-2.11.1.zip -DestinationPath dep-blosc2
 
+  cmake --version
+
   cmake -S dep-blosc2/c-blosc2-2.11.1 -B build-blosc2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DCMAKE_INSTALL_PREFIX=%BUILD_PREFIX%/blosc2  ^

From 618ef2c44f91521d841240f4a7fc5f900e6aa24f Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Tue, 12 Mar 2024 10:55:01 -0700
Subject: [PATCH 11/22] ADIOS2: `release_210` Branch

---
 library_builders.bat | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index 598519098b..ef87d2401d 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -17,13 +17,13 @@ exit /b 0
 
 :build_adios2
   if exist adios2-stamp exit /b 0
-  curl -sLo adios2-2.10.0-rc1.zip ^
-    https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.0-rc1.zip
-  powershell Expand-Archive adios2-2.10.0-rc1.zip -DestinationPath dep-adios2
+  curl -sLo adios2-2.10.0.zip ^
+    https://github.com/ornladios/ADIOS2/archive/refs/heads/release_210.zip
+  powershell Expand-Archive adios2-2.10.0.zip -DestinationPath dep-adios2
 
   cmake --version
 
-  cmake -S dep-adios2/ADIOS2-2.10.0-rc1 -B build-adios2 ^
+  cmake -S dep-adios2/ADIOS2-release_210 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE  ^
     -DBUILD_SHARED_LIBS=OFF     ^

From cbfc753d0cbb9260a2657fd997a218ba964d098e Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Sun, 24 Mar 2024 23:09:35 -0700
Subject: [PATCH 12/22] Use Vincente's patch

Co-authored-by: Vicente Bolea <vicente.bolea@gmail.com>
---
 library_builders.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index ef87d2401d..b1baf8fe97 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -18,12 +18,12 @@ exit /b 0
 :build_adios2
   if exist adios2-stamp exit /b 0
   curl -sLo adios2-2.10.0.zip ^
-    https://github.com/ornladios/ADIOS2/archive/refs/heads/release_210.zip
+    https://github.com/vicentebolea/ADIOS2/archive/refs/heads/fix-static-blosc2-build.zip
   powershell Expand-Archive adios2-2.10.0.zip -DestinationPath dep-adios2
 
   cmake --version
 
-  cmake -S dep-adios2/ADIOS2-release_210 -B build-adios2 ^
+  cmake -S dep-adios2/ADIOS2-fix-static-blosc2-build -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE  ^
     -DBUILD_SHARED_LIBS=OFF     ^

From 8d273470f6732802f81f5c707d6f9df611d0df70 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Fri, 31 May 2024 11:10:31 -0700
Subject: [PATCH 13/22] ADIOS2: v2.10.1

---
 library_builders.bat | 4 ++--
 library_builders.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index b1baf8fe97..fd449ebabc 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -17,9 +17,9 @@ exit /b 0
 
 :build_adios2
   if exist adios2-stamp exit /b 0
-  curl -sLo adios2-2.10.0.zip ^
+  curl -sLo adios2-2.10.1.zip ^
     https://github.com/vicentebolea/ADIOS2/archive/refs/heads/fix-static-blosc2-build.zip
-  powershell Expand-Archive adios2-2.10.0.zip -DestinationPath dep-adios2
+  powershell Expand-Archive adios2-2.10.1.zip -DestinationPath dep-adios2
 
   cmake --version
 
diff --git a/library_builders.sh b/library_builders.sh
index fc971a0521..aa0f245ef5 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -103,8 +103,8 @@ function build_adios1 {
 function build_adios2 {
     if [ -e adios2-stamp ]; then return; fi
 
-    curl -sLo adios2-2.9.2.tar.gz \
-        https://github.com/ornladios/ADIOS2/archive/v2.9.2.tar.gz
+    curl -sLo adios2-2.10.1.tar.gz \
+        https://github.com/ornladios/ADIOS2/archive/v2.10.1.tar.gz
     file adios2*.tar.gz
     tar -xzf adios2*.tar.gz
     rm adios2*.tar.gz

From 28b0a46183e3d12d98a09ad773a71b157759f240 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 19:34:15 -0700
Subject: [PATCH 14/22] Windows: Update ADIOS2 v2.10.1 URL

---
 library_builders.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library_builders.bat b/library_builders.bat
index fd449ebabc..44e929fff1 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -18,7 +18,7 @@ exit /b 0
 :build_adios2
   if exist adios2-stamp exit /b 0
   curl -sLo adios2-2.10.1.zip ^
-    https://github.com/vicentebolea/ADIOS2/archive/refs/heads/fix-static-blosc2-build.zip
+    https://github.com/ornladios/ADIOS2/archive/v2.10.1.zip
   powershell Expand-Archive adios2-2.10.1.zip -DestinationPath dep-adios2
 
   cmake --version

From c1f2084a809df0fad3a3984daf72b5081ab3c856 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 21:46:08 -0700
Subject: [PATCH 15/22] Update GH Actions

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 784a667e6a..52d7494b81 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,19 +67,19 @@ jobs:
           #    MACOSX_DEPLOYMENT_TARGET: 11.0
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: 'src'
         ref: '0.15.2'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: 'src/.github/'
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v5
       name: Install Python
       with:
-        python-version: '3.8'
+        python-version: '3.9'
 
     - name: Install cibuildwheel
       run: |
@@ -132,7 +132,7 @@ jobs:
         python setup.py sdist --dist-dir ../wheelhouse
         python -m cibuildwheel --output-dir ../wheelhouse
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       name: Publish as GitHub artifact
       with:
         name: wheels

From a9004bfbf9b2c09a1beec16ae5c239f22d380588 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 21:49:58 -0700
Subject: [PATCH 16/22] Python 3.8 -> 3.13

---
 .github/workflows/build.yml |  2 +-
 .travis.yml                 | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 52d7494b81..e18e2ff4fa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
         #     https://github.com/pypa/manylinux/issues/899
         CIBW_SKIP: "pp*-manylinux*"
         CIBW_ARCHS: "${{ matrix.arch }}"
-        CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
+        CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
         # Install dependencies
         CIBW_BEFORE_BUILD_LINUX: bash -x .github/library_builders.sh
         CIBW_BEFORE_BUILD_MACOS: bash -x .github/library_builders.sh
diff --git a/.travis.yml b/.travis.yml
index 13c61a4f29..09ac5173d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
   global:
     - OPENPMD_GIT_REF="0.15.2"
 
-    - CIBW_PROJECT_REQUIRES_PYTHON=">=3.8"
+    - CIBW_PROJECT_REQUIRES_PYTHON=">=3.9"
     # Install dependencies on Linux and OSX
     - CIBW_BEFORE_BUILD="bash -x .github/library_builders.sh"
     # for the openPMD-api build, CMake shall search for
@@ -28,7 +28,7 @@ jobs:
       arch: arm64
       dist: focal
       env:
-        - CIBW_BUILD="cp38-manylinux_aarch64 cp39-manylinux_aarch64"
+        - CIBW_BUILD="cp39-manylinux_aarch64"
     - services: docker
       arch: arm64
       dist: focal
@@ -38,7 +38,7 @@ jobs:
       arch: arm64
       dist: focal
       env:
-        - CIBW_BUILD="cp312-manylinux_aarch64"
+        - CIBW_BUILD="cp312-manylinux_aarch64 cp313-manylinux_aarch64"
     - services: docker
       arch: arm64
       dist: focal
@@ -48,13 +48,13 @@ jobs:
       arch: arm64
       dist: focal
       env:
-        - CIBW_BUILD="pp38-manylinux_aarch64 pp39-manylinux_aarch64"
+        - CIBW_BUILD="pp39-manylinux_aarch64"
     # +musllinux
     - services: docker
       arch: arm64
       dist: focal
       env:
-        - CIBW_BUILD="cp38-musllinux_aarch64 cp39-musllinux_aarch64"
+        - CIBW_BUILD="cp39-musllinux_aarch64"
     - services: docker
       arch: arm64
       dist: focal
@@ -64,14 +64,9 @@ jobs:
       arch: arm64
       dist: focal
       env:
-        - CIBW_BUILD="cp312-musllinux_aarch64"
+        - CIBW_BUILD="cp312-musllinux_aarch64 cp313-musllinux_aarch64"
 
     # perform a linux PPC64LE build
-    - services: docker
-      arch: ppc64le
-      dist: focal
-      env:
-        - CIBW_BUILD="cp38-manylinux_ppc64le"
     - services: docker
       arch: ppc64le
       dist: focal
@@ -96,7 +91,7 @@ jobs:
       arch: ppc64le
       dist: focal
       env:
-        - CIBW_BUILD="cp38-musllinux_ppc64le"
+        - CIBW_BUILD="cp313-manylinux_ppc64le"
     - services: docker
       arch: ppc64le
       dist: focal
@@ -117,6 +112,11 @@ jobs:
       dist: focal
       env:
         - CIBW_BUILD="cp312-musllinux_ppc64le"
+    - services: docker
+      arch: ppc64le
+      dist: focal
+      env:
+        - CIBW_BUILD="cp313-musllinux_ppc64le"
 
     # perform a linux S390X build
     # blocked by https://github.com/GTkorvo/dill/issues/15

From 6a83a4cf63dcec00f69df9575cec648c616d4212 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 21:51:56 -0700
Subject: [PATCH 17/22] cibuildwheel: 2.16.2 -> 2.21.2

---
 .github/workflows/build.yml | 2 +-
 .travis.yml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e18e2ff4fa..47650fd0fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -84,7 +84,7 @@ jobs:
     - name: Install cibuildwheel
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        python -m pip install cibuildwheel==2.16.2
+        python -m pip install cibuildwheel==2.21.2
 
     # Hack: cmake --trace-expand
     #- name: Download Patch 2/2
diff --git a/.travis.yml b/.travis.yml
index 09ac5173d7..c6c4ec4f56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -136,7 +136,7 @@ install:
   - git clone --branch ${OPENPMD_GIT_REF} --depth 1 https://github.com/openPMD/openPMD-api.git src
   - cp library_builders.sh src/.github/
   - python -m pip install --upgrade pip setuptools wheel
-  - python -m pip install cibuildwheel==2.16.2
+  - python -m pip install cibuildwheel==2.21.2
   # twine & cryptography: see
   #   https://github.com/scikit-build/cmake-python-distributions/blob/4730aeee240917303f293dffc89a8d8d5a4787c4/requirements-deploy.txt
   #   https://github.com/pyca/cryptography/issues/6086

From c5e2e500137ab6cc467ab0365bf96b2111a960ca Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 22:31:50 -0700
Subject: [PATCH 18/22] `-DADIOS2_USE_Campaign=OFF`

Issues:
- https://github.com/ornladios/ADIOS2/issues/4360
- https://github.com/ornladios/ADIOS2/issues/4148
---
 library_builders.bat | 3 ++-
 library_builders.sh  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/library_builders.bat b/library_builders.bat
index 44e929fff1..1d65de9dcb 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -23,7 +23,7 @@ exit /b 0
 
   cmake --version
 
-  cmake -S dep-adios2/ADIOS2-fix-static-blosc2-build -B build-adios2 ^
+  cmake -S dep-adios2/ADIOS2-v2.10.1 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE  ^
     -DBUILD_SHARED_LIBS=OFF     ^
@@ -33,6 +33,7 @@ exit /b 0
     -DADIOS2_Blosc2_PREFER_SHARED=OFF ^
     -DADIOS2_USE_Blosc2=ON      ^
     -DADIOS2_USE_BZip2=OFF      ^
+    -DADIOS2_USE_Campaign=OFF   ^
     -DADIOS2_USE_Fortran=OFF    ^
     -DADIOS2_USE_HDF5=OFF       ^
     -DADIOS2_USE_MHS=OFF        ^
diff --git a/library_builders.sh b/library_builders.sh
index aa0f245ef5..2089d1d69d 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -122,6 +122,7 @@ function build_adios2 {
         -DADIOS2_Blosc2_PREFER_SHARED=OFF         \
         -DADIOS2_USE_BZip2=OFF                    \
         -DADIOS2_USE_Blosc2=ON                    \
+        -DADIOS2_USE_Campaign=OFF                 \
         -DADIOS2_USE_Fortran=OFF                  \
         -DADIOS2_USE_HDF5=OFF                     \
         -DADIOS2_USE_MHS=OFF                      \

From c96856c5ee7b99516691e4d69a81610bdd632dff Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 22:48:45 -0700
Subject: [PATCH 19/22] Win: Compile Release

Install was already Release
---
 library_builders.bat | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index 1d65de9dcb..778625d777 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -47,7 +47,7 @@ exit /b 0
 :: TODO: Could NOT find HDF5 (missing: HDF5_LIBRARIES C)
 ::  -DADIOS2_USE_HDF5=ON
 
-  cmake --build build-adios2 --parallel %CPU_COUNT%
+  cmake --build build-adios2 --config Release --parallel %CPU_COUNT%
   if errorlevel 1 exit 1
 
   cmake --build build-adios2 --target install --config Release
@@ -92,7 +92,7 @@ exit /b 0
 ::    -DZLIB_USE_STATIC_LIBS=ON
   if errorlevel 1 exit 1
 
-  cmake --build build-blosc2 --parallel %CPU_COUNT%
+  cmake --build build-blosc2 --config Release --parallel %CPU_COUNT%
   if errorlevel 1 exit 1
 
   cmake --build build-blosc2 --target install --config Release
@@ -130,7 +130,7 @@ exit /b 0
     -DCMAKE_INSTALL_PREFIX=%BUILD_PREFIX%/HDF5
   if errorlevel 1 exit 1
 
-  cmake --build build-hdf5 --parallel %CPU_COUNT%
+  cmake --build build-hdf5 --config Release --parallel %CPU_COUNT%
   if errorlevel 1 exit 1
 
   cmake --build build-hdf5 --target install --config Release
@@ -160,7 +160,7 @@ exit /b 0
 
   if errorlevel 1 exit 1
 
-  cmake --build build-zfp --parallel %CPU_COUNT%
+  cmake --build build-zfp --config Release --parallel %CPU_COUNT%
   if errorlevel 1 exit 1
 
   cmake --build build-zfp --target install --config Release
@@ -187,7 +187,7 @@ exit /b 0
 :: Manually-specified variables were not used by the project:
 ::   CMAKE_BUILD_TYPE
 
-  cmake --build build-zlib --parallel %CPU_COUNT%
+  cmake --build build-zlib --config Release --parallel %CPU_COUNT%
   if errorlevel 1 exit 1
 
   cmake --build build-zlib --target install --config Release

From 6d2312b7589f90a456d060ffa86f7dc5b1ccd1bd Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 7 Oct 2024 22:50:05 -0700
Subject: [PATCH 20/22] Window: Fix unzipped ADIOS2 path

---
 library_builders.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library_builders.bat b/library_builders.bat
index 778625d777..c3a92e71d5 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -23,7 +23,7 @@ exit /b 0
 
   cmake --version
 
-  cmake -S dep-adios2/ADIOS2-v2.10.1 -B build-adios2 ^
+  cmake -S dep-adios2/ADIOS2-2.10.1 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE  ^
     -DBUILD_SHARED_LIBS=OFF     ^

From 3a9ad6117c305a4dac1aac363770e80bdfedf9d4 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Tue, 8 Oct 2024 08:57:54 -0700
Subject: [PATCH 21/22] `actions/upload-artifact@v4` Names

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47650fd0fb..801b929922 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,8 +135,9 @@ jobs:
     - uses: actions/upload-artifact@v4
       name: Publish as GitHub artifact
       with:
-        name: wheels
+        name: wheels-${{ matrix.os }}-${{ matrix.arch }}
         path: ./wheelhouse
+        overwrite: true
 
     - name: Publish on pypi.org
       if: github.event_name == 'push' && github.repository == 'openPMD/openPMD-api' && github.ref == 'refs/heads/wheels'

From 8d3393f51936b138554b974f3811b05ccaae785b Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Tue, 8 Oct 2024 08:58:51 -0700
Subject: [PATCH 22/22] `macos-11` -> `macos-12`

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 801b929922..82da3d0481 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
               CMAKE_GENERATOR: "Visual Studio 16 2019"
               CMAKE_GENERATOR_PLATFORM: "Win32"
 
-          - os: macos-11
+          - os: macos-12
             arch: "x86_64"
             env:
               MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -48,7 +48,7 @@ jobs:
           # Apple Silicon M1/arm64/aarch64 builds:
           #   https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
           #   https://github.com/pypa/cibuildwheel/pull/704
-          - os: macos-11
+          - os: macos-12
             arch: "arm64"
             env:
               CMAKE_OSX_ARCHITECTURES: "arm64"
@@ -60,7 +60,7 @@ jobs:
           #   https://developer.apple.com/documentation/apple-silicon/building-a-universal-macos-binary
           # ADIOS1 tricky to build and HDF5 even with CMake as well (as of 1.12)
           # We could build them twice and use `lipo` to combine the lib artifacts.
-          #- os: macos-11
+          #- os: macos-12
           #  arch: "universal2"
           #  env:
           #    CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"