From aebc01abfc80c66e83312dc0fd677ad4903609e4 Mon Sep 17 00:00:00 2001
From: Noisyfox <timemanager.rick@gmail.com>
Date: Wed, 14 May 2025 15:04:49 +0800
Subject: [PATCH] Removed dependency on libtiff (#9514)

(cherry picked from commit prusa3d/PrusaSlicer@f12e0b4d2146c431bd1db9f94a78830006db7642)

Co-authored-by: Lukas Matena <lukasmatena@seznam.cz>
---
 deps/CMakeLists.txt                        |  7 -----
 deps/TIFF/TIFF.cmake                       | 30 ----------------------
 deps/wxWidgets/wxWidgets.cmake             |  4 +--
 flatpak/io.github.softfever.OrcaSlicer.yml |  2 +-
 src/CMakeLists.txt                         |  7 -----
 5 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 deps/TIFF/TIFF.cmake

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index b24ee20e26..dbb380e2d6 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -248,7 +248,6 @@ if(FLATPAK)
     find_package(EXPAT)
     find_package(CURL)
     find_package(JPEG)
-    find_package(TIFF)
     find_package(Freetype)
     find_package(OpenSSL 1.1...<3.2)
     find_package(CURL)
@@ -321,12 +320,6 @@ if (NOT JPEG_FOUND)
     set(JPEG_PKG dep_JPEG)
 endif()
 
-set(TIFF_PKG "")
-if (NOT TIFF_FOUND)
-    include(TIFF/TIFF.cmake)
-    set(TIFF_PKG "dep_TIFF")
-endif()
-
 # flatpak builds wxwidgets separately 
 set(WXWIDGETS_PKG "")
 if (NOT FLATPAK)
diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake
deleted file mode 100644
index 9d66d89b8b..0000000000
--- a/deps/TIFF/TIFF.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-find_package(OpenGL QUIET REQUIRED)
-
-if (APPLE)
-    message(STATUS "Compiling TIFF for macos ${CMAKE_SYSTEM_VERSION}.")
-    orcaslicer_add_cmake_project(TIFF
-        URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip
-        URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726
-        DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
-        CMAKE_ARGS
-            -Dlzma:BOOL=OFF
-            -Dwebp:BOOL=OFF
-            -Djbig:BOOL=OFF
-            -Dzstd:BOOL=OFF
-            -Dlibdeflate:BOOL=OFF
-            -Dpixarlog:BOOL=OFF
-    )
-else()
-    orcaslicer_add_cmake_project(TIFF
-        URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
-        URL_HASH SHA256=17a3e875acece9be40b093361cfef47385d4ef22c995ffbf36b2871f5785f9b8
-        DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
-        CMAKE_ARGS
-            -Dlzma:BOOL=OFF
-            -Dwebp:BOOL=OFF
-            -Djbig:BOOL=OFF
-            -Dzstd:BOOL=OFF
-            -Dpixarlog:BOOL=OFF
-    )
-
-endif()
\ No newline at end of file
diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake
index 1097e6cfc0..b7fc087a09 100644
--- a/deps/wxWidgets/wxWidgets.cmake
+++ b/deps/wxWidgets/wxWidgets.cmake
@@ -26,7 +26,7 @@ orcaslicer_add_cmake_project(
     wxWidgets
     GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
     GIT_SHALLOW ON
-    DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${TIFF_PKG} ${JPEG_PKG}
+    DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON
         ${_wx_toolkit}
@@ -52,7 +52,7 @@ orcaslicer_add_cmake_project(
         -DwxUSE_LIBPNG=sys
         -DwxUSE_ZLIB=sys
         -DwxUSE_LIBJPEG=sys
-        -DwxUSE_LIBTIFF=sys
+        -DwxUSE_LIBTIFF=OFF
         -DwxUSE_NANOSVG=OFF
         -DwxUSE_EXPAT=sys
 )
diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml
index ae29d671de..68979a549c 100755
--- a/flatpak/io.github.softfever.OrcaSlicer.yml
+++ b/flatpak/io.github.softfever.OrcaSlicer.yml
@@ -141,7 +141,7 @@ modules:
           -DwxUSE_LIBPNG=sys \
           -DwxUSE_ZLIB=sys \
           -DwxUSE_LIBJPEG=sys \
-          -DwxUSE_LIBTIFF=sys \
+          -DwxUSE_LIBTIFF=OFF \
           -DwxUSE_EXPAT=sys \
           -DBUILD_SHARED_LIBS:BOOL=ON \
           -DCMAKE_INSTALL_PREFIX:STRING=/app \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a3983ac9f1..a541e7c548 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,6 @@ if (SLIC3R_GUI)
     include(${wxWidgets_USE_FILE})
 
     find_package(JPEG QUIET)
-    find_package(TIFF QUIET)
 
     string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES})
     if (PNG_FOUND AND NOT WX_PNG_BUILTIN)
@@ -65,12 +64,6 @@ if (SLIC3R_GUI)
         list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES})
     endif ()
 
-    string(REGEX MATCH "wxtiff" WX_TIFF_BUILTIN ${wxWidgets_LIBRARIES})
-    if (TIFF_FOUND AND NOT WX_TIFF_BUILTIN)
-        list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX tiff)
-        list(APPEND wxWidgets_LIBRARIES ${TIFF_LIBRARIES})
-    endif ()
-
     string(REGEX MATCH "wxjpeg" WX_JPEG_BUILTIN ${wxWidgets_LIBRARIES})
     if (JPEG_FOUND AND NOT WX_JPEG_BUILTIN)
         list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX jpeg)