From 073c9caa0a4125cd98e04efe39dbd87ce7790e42 Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Thu, 2 Jan 2025 09:17:07 -0500
Subject: [PATCH 1/9] fix jpeg install instruction

---
 ci-utils/install_prereq_linux.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index cb1564e0..6abfbbb2 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -142,17 +142,15 @@ if [[ $BUILD_Z5_DEP -eq 1 ]]; then
     cd ../../
 fi
 
+JPEG_INSTALL_PATH=$PWD
+curl -L http://www.ijg.org/files/jpegsrc.v9f.tar.gz -o jpegsrc.v9f.tar.gz
+tar -xzf jpegsrc.v9f.tar.gz
+cd jpeg-9f
+./configure --prefix="$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR"
+make install-lib
+cd ..
 
 if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
-    JPEG_INSTALL_PATH=$PWD
-    curl -L http://www.ijg.org/files/jpegsrc.v9e.tar.gz -o jpegsrc.v9e.tar.gz
-    tar -xzf jpegsrc.v9e.tar.gz
-    cd jpeg-9e
-    ./configure --prefix=
-    make DESTDIR="$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR" install
-    ./libtool --finish "$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR"/lib
-    cd ..
-
     curl -L  https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.zip -o v1.6.39.zip
     unzip v1.6.39.zip
     cd libpng-1.6.39

From c65d331c09dbcd93b6ed64258da5041c4fb4d906 Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Thu, 2 Jan 2025 09:39:39 -0500
Subject: [PATCH 2/9] fix jpeg install instruction

---
 ci-utils/install_prereq_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index 6abfbbb2..7e21b4c1 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -147,7 +147,7 @@ curl -L http://www.ijg.org/files/jpegsrc.v9f.tar.gz -o jpegsrc.v9f.tar.gz
 tar -xzf jpegsrc.v9f.tar.gz
 cd jpeg-9f
 ./configure --prefix="$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR"
-make install-lib
+make install -j4
 cd ..
 
 if [[ $BULD_DCMTK_DEP -eq 1 ]]; then

From ad35351cc82548a72b2a4aa253b71ece534ef37a Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Thu, 2 Jan 2025 14:43:33 -0500
Subject: [PATCH 3/9] fix jpeg install lookup

---
 ci-utils/install_prereq_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index 7e21b4c1..6de94069 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -192,7 +192,7 @@ unzip tiff-4.6.0.zip
 cd tiff-4.6.0
 mkdir build_man
 cd build_man
-cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/   ..
+cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARIES=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/ ..
 make install -j4
 cd ../../
 

From b441e51fa69df48bcfee56efa59c85dae65b2182 Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Mon, 6 Jan 2025 09:59:26 -0500
Subject: [PATCH 4/9] fix jpeg install lookup

---
 ci-utils/install_prereq_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index 6de94069..dba8b89d 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -192,7 +192,7 @@ unzip tiff-4.6.0.zip
 cd tiff-4.6.0
 mkdir build_man
 cd build_man
-cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARIES=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/ ..
+cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
 make install -j4
 cd ../../
 

From 4a295bc446090c804bc2195bdf4ad4248ad983ab Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Tue, 7 Jan 2025 12:15:46 -0500
Subject: [PATCH 5/9] fix jpeg install lookup

---
 ci-utils/install_prereq_linux.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index dba8b89d..8202988d 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -142,13 +142,15 @@ if [[ $BUILD_Z5_DEP -eq 1 ]]; then
     cd ../../
 fi
 
-JPEG_INSTALL_PATH=$PWD
-curl -L http://www.ijg.org/files/jpegsrc.v9f.tar.gz -o jpegsrc.v9f.tar.gz
-tar -xzf jpegsrc.v9f.tar.gz
-cd jpeg-9f
-./configure --prefix="$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR"
+
+curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip
+unzip 3.1.0.zip
+cd libjpeg-turbo-3.1.0
+mkdir build_man
+cd build_man
+cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/   ..
 make install -j4
-cd ..
+cd ../../
 
 if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
     curl -L  https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.zip -o v1.6.39.zip
@@ -192,7 +194,7 @@ unzip tiff-4.6.0.zip
 cd tiff-4.6.0
 mkdir build_man
 cd build_man
-cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
+cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  ..
 make install -j4
 cd ../../
 

From 4631d1dfe306b0ebd7d99416d5de2b9fbf95d7e9 Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Tue, 7 Jan 2025 13:04:51 -0500
Subject: [PATCH 6/9] fix jpeg install lookup

---
 ci-utils/install_prereq_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index 8202988d..064b8717 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -194,7 +194,7 @@ unzip tiff-4.6.0.zip
 cd tiff-4.6.0
 mkdir build_man
 cd build_man
-cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  ..
+cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
 make install -j4
 cd ../../
 

From 4b6fd9b9d00ec04140814001a0c7ce345ff830d3 Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Tue, 7 Jan 2025 21:33:50 -0500
Subject: [PATCH 7/9] fix jpeg install lookup

---
 ci-utils/install_prereq_linux.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index 064b8717..d31a47cf 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -194,7 +194,11 @@ unzip tiff-4.6.0.zip
 cd tiff-4.6.0
 mkdir build_man
 cd build_man
-cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib/libjpeg.dylib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
+else
+    cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ ..
+fi
 make install -j4
 cd ../../
 

From 40dbff27b3e4541c1b0b20428117460ba9d9b6cd Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Tue, 7 Jan 2025 22:06:55 -0500
Subject: [PATCH 8/9] fix jpeg install lookup

---
 ci-utils/install_prereq_linux.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index d31a47cf..b279af40 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -195,7 +195,7 @@ cd tiff-4.6.0
 mkdir build_man
 cd build_man
 if [[ "$OSTYPE" == "darwin"* ]]; then
-    cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib/libjpeg.dylib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
+    cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib/libjpeg.dylib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
 else
     cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ ..
 fi
@@ -216,7 +216,11 @@ if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
     cd ..
     mkdir build_man
     cd build_man
-    cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DDCMTK_WITH_ICONV=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_APPS=OFF  ..
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DDCMTK_WITH_ICONV=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_APPS=OFF -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib/libjpeg.dylib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
+    else
+        cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/   -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/  -DDCMTK_WITH_ICONV=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_APPS=OFF  ..
+    fi
     make install -j4
     cd ../../
 

From a5ff42a2be8ef1491c90805c49178edac828553b Mon Sep 17 00:00:00 2001
From: Sameeul Samee <sameeul@gmail.com>
Date: Wed, 8 Jan 2025 04:25:24 -0500
Subject: [PATCH 9/9] update libtiff

---
 ci-utils/install_prereq_linux.sh |  8 ++++----
 ci-utils/install_prereq_win.bat  | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
index b279af40..ba7931d8 100755
--- a/ci-utils/install_prereq_linux.sh
+++ b/ci-utils/install_prereq_linux.sh
@@ -184,14 +184,14 @@ cd ../../
 
 for i in {1..5}
 do
-    curl -L https://download.osgeo.org/libtiff/tiff-4.6.0.zip -o tiff-4.6.0.zip 
-    if [ -f "tiff-4.6.0.zip" ] ; then
+    curl -L https://download.osgeo.org/libtiff/tiff-4.7.0.zip -o tiff-4.7.0.zip 
+    if [ -f "tiff-4.7.0.zip" ] ; then
         break
     fi
 done
 
-unzip tiff-4.6.0.zip
-cd tiff-4.6.0
+unzip tiff-4.7.0.zip
+cd tiff-4.7.0
 mkdir build_man
 cd build_man
 if [[ "$OSTYPE" == "darwin"* ]]; then
diff --git a/ci-utils/install_prereq_win.bat b/ci-utils/install_prereq_win.bat
index 8b8965e5..35626d92 100644
--- a/ci-utils/install_prereq_win.bat
+++ b/ci-utils/install_prereq_win.bat
@@ -168,15 +168,25 @@ cmake --build . --config Release --target install --parallel 4
 popd
 popd
 
+curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip
+tar -xf 3.1.0.zip
+pushd libjpeg-turbo-3.1.0
+mkdir build_man
+pushd build_man
+cmake -DCMAKE_INSTALL_PREFIX=../../local_install/   -DCMAKE_PREFIX_PATH=../../local_install/  ..
+cmake --build . --config Release --target install --parallel 4
+popd
+popd
+
 for /l %%x in (1, 1, 5) do (
-    curl -L https://download.osgeo.org/libtiff/tiff-4.6.0.zip -o tiff-4.6.0.zip
-    if  exist tiff-4.6.0.zip (
+    curl -L https://download.osgeo.org/libtiff/tiff-4.7.0.zip -o tiff-4.7.0.zip
+    if  exist tiff-4.7.0.zip (
         goto :continue_tiff
     )
 )
 :continue_tiff
-tar -xf tiff-4.6.0.zip
-pushd tiff-4.6.0
+tar -xf tiff-4.7.0.zip
+pushd tiff-4.7.0
 mkdir build_man
 pushd build_man
 cmake -DCMAKE_INSTALL_PREFIX=../../local_install/   -DCMAKE_PREFIX_PATH=../../local_install/  ..