update libtiff

PolusAI · Jan 8, 2025 · a5ff42a · a5ff42a
1 parent 40dbff2
commit a5ff42a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git 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
@@ -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/  ..