From 4dffa200605cbff13ce33ab08e6e97ffc2f2e3a1 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Fri, 18 Aug 2023 20:28:24 -0600
Subject: [PATCH] [Patch] ADIOS2: Fix ChunkV Issue

https://github.com/openPMD/openPMD-api/pull/1387#issuecomment-1684193022
---
 library_builders.bat | 12 ++++++++++++
 library_builders.sh  | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/library_builders.bat b/library_builders.bat
index 653c69a3ee..cd4de7265a 100644
--- a/library_builders.bat
+++ b/library_builders.bat
@@ -20,6 +20,18 @@ exit /b 0
     https://github.com/ornladios/ADIOS2/archive/v2.9.1.zip
   powershell Expand-Archive adios2-2.9.1.zip -DestinationPath dep-adios2
 
+  :: C-Blosc2 Static Build
+  :: https://github.com/ornladios/ADIOS2/pull/3715
+  curl -sLo adios2-cblosc2-static.patch ^
+    https://patch-diff.githubusercontent.com/raw/ornladios/ADIOS2/pull/3715.patch
+  python -m patch -p 1 -d dep-adios2/ADIOS2-2.9.1 adios2-cblosc2-static.patch
+
+  :: fix compression issues
+  :: https://github.com/ornladios/ADIOS2/pull/3769
+  curl -sLo adios2-chunkv.patch ^
+    https://patch-diff.githubusercontent.com/raw/ornladios/ADIOS2/pull/3769.patch
+  python -m patch -p 1 -d dep-adios2/ADIOS2-2.9.1 adios2-chunkv.patch
+
   cmake -S dep-adios2/ADIOS2-2.9.1 -B build-adios2 ^
     -DCMAKE_BUILD_TYPE=Release  ^
     -DBUILD_SHARED_LIBS=OFF     ^
diff --git a/library_builders.sh b/library_builders.sh
index ae036d87a3..419c559ec9 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -103,14 +103,24 @@ function build_adios1 {
 function build_adios2 {
     if [ -e adios2-stamp ]; then return; fi
 
-    #curl -sLo adios2-2.9.0.tar.gz \
-    #    https://github.com/ornladios/ADIOS2/archive/v2.9.0.tar.gz
-    curl -sLo adios2-fix-blosc2-findpackage.tar.gz \
-        https://github.com/ax3l/ADIOS2/archive/refs/heads/fix-blosc2-findpackage.tar.gz
+    curl -sLo adios2-2.9.1.tar.gz \
+        https://github.com/ornladios/ADIOS2/archive/v2.9.1.tar.gz
     file adios2*.tar.gz
     tar -xzf adios2*.tar.gz
     rm adios2*.tar.gz
 
+    # C-Blosc2 Static Build
+    # https://github.com/ornladios/ADIOS2/pull/3715
+    curl -sLo adios2-cblosc2-static.patch \
+        https://patch-diff.githubusercontent.com/raw/ornladios/ADIOS2/pull/3715.patch
+    python3 -m patch -p 1 -d ADIOS2-* adios2-cblosc2-static.patch
+
+    # fix compression issues
+    # https://github.com/ornladios/ADIOS2/pull/3769
+    curl -sLo adios2-chunkv.patch \
+        https://patch-diff.githubusercontent.com/raw/ornladios/ADIOS2/pull/3769.patch
+    python3 -m patch -p 1 -d ADIOS2-* adios2-chunkv.patch
+
     # build
     mkdir build-adios2
     cd build-adios2