Merge branch 'main' into pr/tommasobbianchi/15238

deps/CMakeLists.txt

@@ -381,7 +381,7 @@ include(libnoise/libnoise.cmake)
 
 include(Draco/Draco.cmake)
 
-# Assimp: glTF/GLB/FBX import for the texture-to-color feature.
+include(FFMPEG/FFMPEG.cmake)
 include(Assimp/Assimp.cmake)
 
 
@@ -466,6 +466,7 @@ set(_dep_list
     dep_libnoise
     dep_python3
     dep_wxInspector
+    dep_FFMPEG
     dep_Assimp
     )
 

deps/FFMPEG/FFMPEG.cmake

@@ -0,0 +1,87 @@
+set(_conf_cmd ./configure)
+
+if (MSVC)
+    set(_source_dir "${CMAKE_BINARY_DIR}/dep_FFMPEG-prefix/src/dep_FFMPEG")
+
+    set(PREBUILD_URL_arm64 "https://github.com/Noisyfox/FFmpeg-Builds-Orca/releases/download/autobuild-2026-07-17-14-28/ffmpeg-n7.0.3-31-g9b6ffd74b5-winarm64-orca-shared-7.0.zip")
+    set(PREBUILD_HASH_arm64 "12f4140279f2f8469885e1b5b2e8be9d788882914c21523cacd56989f3548054")
+    set(PREBUILD_URL_x64 "https://github.com/Noisyfox/FFmpeg-Builds-Orca/releases/download/autobuild-2026-07-17-14-28/ffmpeg-n7.0.3-31-g9b6ffd74b5-win64-orca-shared-7.0.zip")
+    set(PREBUILD_HASH_x64 "e65916020ddb9ef84b2666dfbcbfc9b1d67f69d15b4a66db53754637bf2d498c")
+
+    ExternalProject_Add(dep_FFMPEG
+        URL ${PREBUILD_URL_${DEPS_ARCH}}
+        URL_HASH SHA256=${PREBUILD_HASH_${DEPS_ARCH}}
+        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFMPEG
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND
+            COMMAND ${CMAKE_COMMAND} -E copy_directory  "${_source_dir}/bin" "${DESTDIR}/bin"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory  "${_source_dir}/lib" "${DESTDIR}/lib"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory  "${_source_dir}/include" "${DESTDIR}/include"
+    )
+
+else ()
+    if (APPLE)
+        set(_minos_cmd
+            "--extra-cflags=-mmacosx-version-min=${DEP_OSX_TARGET}"
+            "--extra-ldflags=-mmacosx-version-min=${DEP_OSX_TARGET}"
+            )
+        # Static FFmpeg: nothing to bundle into the .app, no rpath handling.
+        # Disable the VideoToolbox/AudioToolbox HW-accel paths: the player decodes
+        # in software (swscale), and the auto-detected HW objects would drag in
+        # system frameworks that the static libs would then depend on.
+        set(_link_cmd --enable-static --disable-shared --disable-videotoolbox --disable-audiotoolbox)
+        if (IS_CROSS_COMPILE)
+            set(_cross_cmd --enable-cross-compile)
+            set(_pic_cmd --enable-pic)
+            if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
+                set(_arch_cmd --arch=arm64)
+                set(_cc_cmd "--cc=clang -arch arm64")
+            else()
+                set(_arch_cmd --arch=x86_64)
+                set(_cc_cmd "--cc=clang -arch x86_64")
+            endif()
+        endif()
+    else ()
+        set(_link_cmd --enable-shared)
+    endif ()
+
+    set(_build_j -j)
+    if(DEFINED ENV{CMAKE_BUILD_PARALLEL_LEVEL})
+        set(_build_j "-j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}")
+    endif()
+
+    ExternalProject_Add(dep_FFMPEG
+        URL https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.0.3.tar.gz
+        URL_HASH SHA256=DEEDCABE339165214A3637DF4C86A507AEF0D793CF8774FF68735F4737E8DDBC
+        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFMPEG
+        CONFIGURE_COMMAND ${_conf_cmd}
+            ${_cross_cmd}
+            ${_pic_cmd}
+            ${_arch_cmd}
+            ${_cc_cmd}
+            "--prefix=${DESTDIR}"
+            ${_link_cmd}
+            ${_minos_cmd}
+            --disable-doc
+            --enable-small
+            --disable-outdevs
+            --disable-filters
+            --enable-filter=*null*,afade,*fifo,*format,*resample,aeval,allrgb,allyuv,atempo,pan,*bars,color,*key,crop,draw*,eq*,framerate,*_qsv,*_vaapi,*v4l2*,hw*,scale,volume,test*
+            --disable-protocols
+            --enable-protocol=file,fd,pipe,rtp,udp
+            --disable-muxers
+            --enable-muxer=rtp
+            --disable-encoders
+            --disable-decoders
+            --enable-decoder=*aac*,h264*,mp3*,mjpeg,rv*
+            --disable-demuxers
+            --enable-demuxer=h264,mp3,mov
+            --disable-zlib
+            --disable-avdevice
+        BUILD_IN_SOURCE ON
+        BUILD_COMMAND make ${_build_j}
+        INSTALL_COMMAND make install
+    )
+
+endif()

deps/OCCT/OCCT.cmake

@@ -1,3 +1,10 @@
+# clang-cl cannot emit IGESAppli_GeneralModule.cxx on ARM64
+# (llvm/llvm-project#62081). cl and clang-cl share an ABI.
+set(_occt_compiler_args "")
+if ("${DEPS_ARCH}" STREQUAL "arm64" AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    set(_occt_compiler_args -DCMAKE_C_COMPILER:STRING=cl -DCMAKE_CXX_COMPILER:STRING=cl)
+endif ()
+
 if(WIN32)
     set(library_build_type "Shared")
 else()
@@ -46,6 +53,7 @@ orcaslicer_add_cmake_project(OCCT
         -DBUILD_MODULE_ModelingAlgorithms=${SLIC3R_CAD}
         -DBUILD_MODULE_ModelingData=OFF
         -DBUILD_MODULE_Visualization=OFF
+        ${_occt_compiler_args}
 )
 
 # add_dependencies(dep_OCCT ${FREETYPE_PKG})

deps/OpenCV/OpenCV.cmake

@@ -10,6 +10,13 @@ else ()
     set(_options "")
 endif ()
 
+# carotene is OpenCV's ARM NEON HAL. It uses M_PI without _USE_MATH_DEFINES
+# and does not compile with clang-cl.
+set(_disable_carotene "")
+if ("${DEPS_ARCH}" STREQUAL "arm64" AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    set(_disable_carotene "-DWITH_CAROTENE=OFF")
+endif ()
+
 if (IN_GIT_REPO)
     set(OpenCV_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenCV-prefix/src/dep_OpenCV)
 endif ()
@@ -83,5 +90,6 @@ orcaslicer_add_cmake_project(OpenCV
        -DWITH_PROTOBUF=OFF
        -DWITH_WIN32UI=OFF
        -DHAVE_WIN32UI=FALSE
+       ${_disable_carotene}
 )
 

deps/OpenSSL/OpenSSL.cmake

@@ -6,7 +6,7 @@ if(DEFINED OPENSSL_ARCH)
     set(_cross_arch ${OPENSSL_ARCH})
 else()
     if(WIN32)
-        if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
+        if("${DEPS_ARCH}" STREQUAL "arm64")
             set(_cross_arch "VC-WIN64-ARM")
         else()
             set(_cross_arch "VC-WIN64A")

deps/PNG/PNG.cmake

@@ -1,6 +1,10 @@
 if (APPLE)
     # Only disable NEON extension for Apple ARM builds, leave it enabled for Raspberry PI.
     set(_disable_neon_extension "-DPNG_ARM_NEON=off")
+elseif ("${DEPS_ARCH}" STREQUAL "arm64" AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    # libpng's CMake ignores PNG_ARM_NEON on Windows ARM64 and skips the NEON
+    # sources, but pngpriv.h enables NEON anyway.
+    set(_disable_neon_extension "-DCMAKE_C_FLAGS=/DWIN32 /D_WINDOWS /DPNG_ARM_NEON_OPT=0")
 else ()
     set(_disable_neon_extension "")
 endif ()

deps/python3/python3.cmake

@@ -15,7 +15,13 @@ if(WIN32)
     # See https://github.com/python/cpython/issues/153438
     # Patch from https://github.com/python/cpython/pull/153608
     # This patch has not been merged to 3.12 yet so we need to apply it manually
-    set(_patch_cmd git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/01-windows-nuget.patch)
+    #
+    # Without core.autocrlf=false the patched find_python.bat comes out LF and
+    # cmd.exe cannot find its goto labels.
+    set(_patch_cmd git init
+                   && ${GIT_EXECUTABLE} -c core.autocrlf=false apply --verbose
+                      --ignore-space-change --whitespace=fix
+                      ${CMAKE_CURRENT_LIST_DIR}/01-windows-nuget.patch)
 
     if(MSVC_VERSION EQUAL 1800)
         set(_python_platform_toolset v120)
@@ -53,12 +59,9 @@ if(WIN32)
         set(_python_pcbuild_output_dir win32)
     endif()
 
+    # pybind11 undefines _DEBUG around Python.h so a debug build links the
+    # release python3xx.lib; Py_DEBUG could not load release plugin modules.
     set(_python_pcbuild_config Release)
-    set(_python_layout_debug OFF)
-    if(DEFINED DEP_DEBUG AND DEP_DEBUG)
-        set(_python_pcbuild_config Debug)
-        set(_python_layout_debug ON)
-    endif()
 
     # CPython's PCbuild needs a 64-bit-hosted toolchain: find_msbuild.bat picks the
     # 32-bit Bin\MSBuild.exe, whose x86 cl.exe/link.exe run out of address space
@@ -101,7 +104,6 @@ if(WIN32)
             -DPYTHON_BUILD_DIR=<SOURCE_DIR>/PCbuild/${_python_pcbuild_output_dir}
             -DPYTHON_DEST_DIR=${DESTDIR}/libpython
             -DPYTHON_LAYOUT_ARCH=${_python_layout_arch}
-            -DPYTHON_DEBUG=${_python_layout_debug}
             -P ${CMAKE_CURRENT_LIST_DIR}/stage_windows.cmake
     )
 elseif(APPLE)

deps/python3/stage_windows.cmake

@@ -9,9 +9,6 @@ foreach(_var PYTHON_SOURCE_DIR PYTHON_BUILD_DIR PYTHON_DEST_DIR PYTHON_LAYOUT_AR
 endforeach()
 
 set(_python_exe "${PYTHON_BUILD_DIR}/python.exe")
-if(PYTHON_DEBUG)
-    set(_python_exe "${PYTHON_BUILD_DIR}/python_d.exe")
-endif()
 
 if(NOT EXISTS "${_python_exe}")
     message(FATAL_ERROR "Built Python executable not found: ${_python_exe}")
@@ -49,22 +46,11 @@ endif()
 set(_required_files
     "${PYTHON_DEST_DIR}/Lib/encodings/__init__.py"
     "${PYTHON_DEST_DIR}/include/Python.h"
+    "${PYTHON_DEST_DIR}/python.exe"
+    "${PYTHON_DEST_DIR}/python${_python_abi}.dll"
+    "${PYTHON_DEST_DIR}/libs/python${_python_abi}.lib"
 )
 
-if(PYTHON_DEBUG)
-    list(APPEND _required_files
-        "${PYTHON_DEST_DIR}/python_d.exe"
-        "${PYTHON_DEST_DIR}/python${_python_abi}_d.dll"
-        "${PYTHON_DEST_DIR}/libs/python${_python_abi}_d.lib"
-    )
-else()
-    list(APPEND _required_files
-        "${PYTHON_DEST_DIR}/python.exe"
-        "${PYTHON_DEST_DIR}/python${_python_abi}.dll"
-        "${PYTHON_DEST_DIR}/libs/python${_python_abi}.lib"
-    )
-endif()
-
 foreach(_required_file IN LISTS _required_files)
     if(NOT EXISTS "${_required_file}")
         message(FATAL_ERROR "Staged Python file missing: ${_required_file}")