update deps

bundled_deps/CMakeLists.txt

@@ -40,6 +40,9 @@ target_include_directories(ankerl INTERFACE ankerl)
 add_library(stb_dxt INTERFACE)
 target_include_directories(stb_dxt INTERFACE stb_dxt)
 
+add_library(stb_image INTERFACE)
+target_include_directories(stb_image INTERFACE stb_image)
+
 add_library(tcbspan INTERFACE)
 target_include_directories(tcbspan INTERFACE tcbspan)
 

deps/+Boost/Boost.cmake

@@ -18,6 +18,7 @@ add_cmake_project(Boost
         -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
         -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros
         -DBUILD_TESTING:BOOL=OFF
+        -DBOOST_IOSTREAMS_ENABLE_ZSTD:BOOL=OFF
         "${_context_abi_line}"
         "${_context_arch_line}"
 )

deps/+Catch2/Catch2.cmake

@@ -1,6 +1,7 @@
 add_cmake_project(Catch2
-    URL "https://github.com/catchorg/Catch2/archive/refs/tags/v2.13.10.zip"
+    URL "https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.zip"
-    URL_HASH SHA256=121e7488912c2ce887bfe4699ebfb983d0f2e0d68bcd60434cdfd6bb0cf78b43
+    URL_HASH SHA256=bffd2c45a84e5a4b0c17e695798e8d2f65931cbaf5c7556d40388d1d8d04eb83
     CMAKE_ARGS
         -DCATCH_BUILD_TESTING:BOOL=OFF
+        -DCMAKE_CXX_STANDARD=17
 )

deps/+LibBGCode/LibBGCode.cmake

@@ -1,8 +1,8 @@
 set(LibBGCode_SOURCE_DIR "" CACHE PATH "Optionally specify local LibBGCode source directory")
 
 set(_source_dir_line
-    URL https://github.com/prusa3d/libbgcode/archive/d33a277a3ce2c0a7f9ba325caac6d730e0f7a412.zip
+    URL https://github.com/prusa3d/libbgcode/archive/5041c093b33e2748e76d6b326f2251310823f3df.zip
-    URL_HASH SHA256=0db3b0852df8d3ae32a4283884bc4ad6f1dd4d3c748ed679491f70b1e1d1acd5)
+    URL_HASH SHA256=c323aa196a82d75f08a5b114c95f2d1a019e84b555a196e55d8ea52e5787284c)
 
 if (LibBGCode_SOURCE_DIR)
     set(_source_dir_line "SOURCE_DIR;${LibBGCode_SOURCE_DIR};BUILD_ALWAYS;ON")

deps/+PNG/PNG.cmake

@@ -1,17 +1,18 @@
-if (APPLE)
+if (MSVC OR APPLE)
+    if (APPLE)
         # Only disable NEON extension for Apple ARM builds, leave it enabled for Raspberry PI.
         set(_disable_neon_extension "-DPNG_ARM_NEON:STRING=off")
-else ()
+    else ()
         set(_disable_neon_extension "")
-endif ()
+    endif ()
 
-set(_patch_cmd PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patched CMakeLists.txt)
+    set(_patch_cmd PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patched CMakeLists.txt)
 
-if (APPLE)
+    if (APPLE)
         set(_patch_cmd ${_patch_cmd} && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch)
-endif ()
+    endif ()
 
-add_cmake_project(PNG 
+    add_cmake_project(PNG 
         URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip
         URL_HASH SHA256=3d22d46c566b1761a0e15ea397589b3a5f36ac09b7c785382e6470156c04247f
         PATCH_COMMAND "${_patch_cmd}"
@@ -22,6 +23,7 @@ add_cmake_project(PNG
             -DPNG_TESTS=OFF
             -DPNG_EXECUTABLES=OFF
             ${_disable_neon_extension}
-)
+    )
 
-set(DEP_PNG_DEPENDS ZLIB)
+    set(DEP_PNG_DEPENDS ZLIB)
+endif()

deps/+wxWidgets/webview.patch

@@ -1,15 +0,0 @@
-diff -ur build.orig/cmake/lib/webview/CMakeLists.txt build/cmake/lib/webview/CMakeLists.txt
---- wxWidgets.orig/build/cmake/lib/webview/CMakeLists.txt	2024-06-14 19:02:36.000000000 +0200
-+++ wxWidgets/build/cmake/lib/webview/CMakeLists.txt	2024-07-01 16:21:52.922737200 +0200
-@@ -46,9 +46,9 @@
- elseif(WXMSW)
-     if(wxUSE_WEBVIEW_EDGE)
-         # Update the following variables if updating WebView2 SDK
--        set(WEBVIEW2_VERSION "1.0.705.50")
-+        set(WEBVIEW2_VERSION "1.0.2592.51")
-         set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
--        set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
-+        set(WEBVIEW2_SHA256 "805c79e05184fab18c9fe7b8ba820c598399b97adc1fbf5b0ea490efad91d5b8")
- 
-         set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
- 

deps/+wxWidgets/wx-fixes.patch

@@ -0,0 +1,45 @@
+diff --color -urN wxWidgets-323a465e577e03f330e2e6a4c78e564d125340cb/build/cmake/lib/webview/CMakeLists.txt dep_wxWidgets/build/cmake/lib/webview/CMakeLists.txt
+--- wxWidgets-323a465e577e03f330e2e6a4c78e564d125340cb/src/osx/carbon/dcscreen.cpp	2024-06-26 10:39:50.000000000 +0200
++++ dep_wxWidgets/src/osx/carbon/dcscreen.cpp	2025-01-08 14:13:51.980634573 +0100
+@@ -14,6 +14,7 @@
+ #include "wx/osx/dcscreen.h"
+ 
+ #include "wx/osx/private.h"
++#include "wx/osx/private/available.h"
+ #include "wx/graphics.h"
+ 
+ wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
+@@ -68,15 +69,26 @@
+     if ( subrect )
+         srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ;
+ 
+-    CGImageRef image = NULL;
+-    
+-    image = CGDisplayCreateImage(kCGDirectMainDisplay);
++    CGImageRef image = nullptr;
+ 
+-    wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
+-
+-    CGContextDrawImage(context, srcRect, image);
++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
++    if ( WX_IS_MACOS_AVAILABLE(14, 4) ) // errors on lower versions of macOS 14
++    {
++        // TODO add ScreenKit implementation
++    }
++    else
++#endif // macOS 10.14+
++    {
++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 150000
++        image = CGDisplayCreateImage(kCGDirectMainDisplay);
++#endif
++    }
+ 
+-    CGImageRelease(image);
++    if ( image != nullptr )
++    {
++        CGContextDrawImage(context, srcRect, image);
++        CGImageRelease(image);
++    }
+ 
+     CGContextRestoreGState(context);
+ #else

deps/+wxWidgets/wxWidgets.cmake

@@ -28,9 +28,9 @@ else ()
 endif ()
 
 add_cmake_project(wxWidgets
-    URL https://github.com/prusa3d/wxWidgets/archive/323a465e577e03f330e2e6a4c78e564d125340cb.zip
+    URL https://github.com/prusa3d/wxWidgets/archive/5462e7d7cfac645926188443e842171e107b312c.zip
-    URL_HASH SHA256=B538E4AD3CC93117932F4DED70C476D6650F9C70A9D4055A08F3693864C47465
+    URL_HASH SHA256=3EBB971DDB45CEEA6D9B965C3D0266F44EDAE71F2A7DAA5D48DB34BD95AA878B
-    PATCH_COMMAND COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/webview.patch
+    PATCH_COMMAND COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/wx-fixes.patch
     CMAKE_ARGS
         "-DCMAKE_DEBUG_POSTFIX:STRING="
         -DwxBUILD_PRECOMP=ON

deps/+z3/z3.cmake

@@ -0,0 +1,15 @@
+add_cmake_project(z3
+  URL https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.13.0.zip
+  URL_HASH SHA256=81543736dcbbbcb037a7df55d0be596245d509f3f69f56610df32728e48ee050
+  CMAKE_ARGS
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    -DZ3_INCLUDE_GIT_HASH=OFF
+    -DZ3_INCLUDE_GIT_DESCRIBE=OFF
+    -DZ3_USE_LIB_GMP=OFF
+    -DZ3_BUILD_LIBZ3_SHARED=OFF
+    -DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+    -DZ3_ALWAYS_BUILD_DOCS=OFF
+    -DZ3_BUILD_EXECUTABLE=OFF
+    -DZ3_BUILD_TEST_EXECUTABLES=OFF
+)
+

deps/CMakeLists.txt

@@ -1,23 +1,3 @@
-# This CMake project downloads, configures and builds QIDISlicer dependencies on Unix and Windows.
-#
-# When using this script, it's recommended to perform an out-of-source build using CMake.
-#
-# All the dependencies are installed in a `destdir` directory in the root of the build directory,
-# in a traditional Unix-style prefix structure. The destdir can be used directly by CMake
-# when building QIDISlicer - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
-# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building QIDISlicer.
-#
-# For better clarity of console output, it's recommended to _not_ use a parallelized build
-# for the top-level command, ie. use `make -j 1` or `ninja -j 1` to force single-threaded top-level
-# build. This doesn't degrade performance as individual dependencies are built in parallel fashion
-# if supported by the dependency.
-#
-# On Windows, architecture (64 vs 32 bits) is judged based on the compiler variant.
-# To build dependencies for either 64 or 32 bit OS, use the respective compiler command line.
-#
-# WARNING: On UNIX platforms wxWidgets hardcode the destdir path into its `wx-conffig` utility,
-# therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
-#
 cmake_minimum_required(VERSION 3.12)
 project(QIDISlicer_deps)