Merge branch 'release-0430' into HEAD

Author: hemiao2023

CMakeLists.txt

@@ -12,7 +12,9 @@ set(DUMPTOOL_USER $ENV{DUMPTOOL_USER})
 set(DUMPTOOL_PASS $ENV{DUMPTOOL_PASS})
 set(DUMPTOOL_HOST $ENV{DUMPTOOL_HOST})
 set(DUMPTOOL_TO $ENV{DUMPTOOL_TO})
-
+if(CX_DEBUG)
+  add_definitions(-D_DEBUG1=1)
+endif()
 include("version.inc")
 include(GNUInstallDirs)
 include(CMakeDependentOption)
@@ -620,7 +622,7 @@ endforeach()
 
 find_package(NLopt 1.4 REQUIRED)
 
-
+message(STATUS "SPNAV library found: ${SLIC3R_STATIC}")
 if(SLIC3R_STATIC)
     set(OPENVDB_USE_STATIC_LIBS ON)
     set(USE_BLOSC TRUE)
@@ -655,6 +657,28 @@ else()
 endif()
 
 set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
+function(copy_vld_dlls  target config)
+    get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    get_target_property(_alt_out_dir ${target} RUNTIME_OUTPUT_DIRECTORY)
+    message("------copy_vld_dlls-------")
+    if (_alt_out_dir)
+        set (_out_dir "${_alt_out_dir}")
+        message ("set out_dir to _alt_out_dir: ${_out_dir}")
+    elseif (_is_multi)
+        set(_out_dir "${CMAKE_CURRENT_BINARY_DIR}/${config}")
+        message ("set out_dir to CMAKE_CURRENT_BINARY_DIR/config: ${_out_dir}")
+    else ()
+        set(_out_dir "${CMAKE_CURRENT_BINARY_DIR}")
+        message ("set out_dir to CMAKE_CURRENT_BINARY_DIR: ${_out_dir}")
+    endif ()
+    file(GLOB ALL_FILES "$ENV{VLD_HOME}/bin/WIN64/*")
+    message("xxxx = ${ALL_FILES}")
+    foreach(FILE ${ALL_FILES})
+        file(COPY ${FILE} DESTINATION "${_out_dir}")
+    endforeach()
+    file(COPY $ENV{VLD_HOME}/vld.ini DESTINATION "${_out_dir}")
+endfunction()
+
 function(crealityprint_copy_dlls target config postfix output_dlls)
     if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         set(_bits 64)

CMakePresets.json

@@ -15,8 +15,6 @@
                 "CMAKE_CONFIGURE_TYPE": "${presetName}",
                 "BBL_RELEASE_TO_PUBLIC": "1",
                 "CMAKE_INSTALL_PREFIX": "./OrcaSlicer",
-                "CMAKE_PREFIX_PATH": "${sourceDir}/deps/build-dbg/OrcaSlicer_dep/usr/local/",
-                "WIN10SDK_PATH": "C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0",
                 "GENERATE_ORCA_HEADER": "OFF"
             },
             "condition": {
@@ -50,7 +48,8 @@
             "inherits": "x64-release",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_PREFIX_PATH": "${sourceDir}/deps/build/OrcaSlicer_dep/usr/local/"
+                "CMAKE_PREFIX_PATH": "${sourceDir}/deps/build/OrcaSlicer_dep/usr/local/",
+                "CX_DEBUG": "1"
             }
         },
         {
@@ -105,7 +104,8 @@
             "description": "Sets release build type",
             "inherits": "linux-debug",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_PREFIX_PATH": "${sourceDir}/deps/build/destdir/usr/local/"
             }
         },
         {

build_release_macos.sh

@@ -128,7 +128,7 @@ function build_deps() {
     echo "Building deps..."
     (
         set -x
-        mkdir -p "$DEPS"
+        mkdir -p "$DEPS_BUILD_DIR"
         cd "$DEPS_BUILD_DIR"
         if [ "1." != "$BUILD_ONLY". ]; then
             cmake .. \

cmake/modules/FindFFmpeg.cmake

@@ -0,0 +1,106 @@
+# FFmpeg 查找模块
+find_package(PkgConfig QUIET)
+
+# 设置 FFmpeg 组件列表
+set(FFMPEG_COMPONENTS
+    avcodec
+    avformat
+    avutil
+    avdevice
+    avfilter
+    swscale
+    swresample
+)
+
+# 查找 FFmpeg 包含路径
+find_path(FFMPEG_INCLUDE_DIR
+    NAMES libavcodec/avcodec.h
+    PATHS
+        /usr/include
+        /usr/local/include
+        /opt/local/include
+        "C:/msys64/mingw64/include"
+        "C:/msys64/usr/include"
+    PATH_SUFFIXES ffmpeg
+    DOC "FFmpeg 头文件目录"
+)
+
+# 查找各组件库文件
+foreach(COMPONENT ${FFMPEG_COMPONENTS})
+    string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+    
+    # 优先尝试 pkg-config
+    if(PKG_CONFIG_FOUND)
+        pkg_check_modules(PC_${UPPERCOMPONENT} QUIET lib${COMPONENT})
+    endif()
+
+    find_library(${UPPERCOMPONENT}_LIBRARY
+        NAMES ${COMPONENT} lib${COMPONENT}
+        HINTS ${PC_${UPPERCOMPONENT}_LIBRARY_DIRS}
+        PATHS
+            /usr/lib
+            /usr/local/lib
+            /opt/local/lib
+            "C:/msys64/mingw64/lib"
+            "C:/msys64/usr/lib"
+        PATH_SUFFIXES ffmpeg
+        DOC "FFmpeg ${COMPONENT} 库路径"
+    )
+
+    if(${UPPERCOMPONENT}_LIBRARY)
+        list(APPEND FFMPEG_LIBRARIES ${${UPPERCOMPONENT}_LIBRARY})
+    endif()
+endforeach()
+
+# 版本检测
+if(FFMPEG_INCLUDE_DIR AND EXISTS "${FFMPEG_INCLUDE_DIR}/libavutil/avutil.h")
+    file(STRINGS "${FFMPEG_INCLUDE_DIR}/libavutil/avutil.h" FFMPEG_VERSION_MAJOR
+         REGEX "#define LIBAVUTIL_VERSION_MAJOR [0-9]+")
+    string(REGEX REPLACE "#define LIBAVUTIL_VERSION_MAJOR ([0-9]+)" "\\1" FFMPEG_VERSION_MAJOR "${FFMPEG_VERSION_MAJOR}")
+
+    file(STRINGS "${FFMPEG_INCLUDE_DIR}/libavutil/avutil.h" FFMPEG_VERSION_MINOR
+         REGEX "#define LIBAVUTIL_VERSION_MINOR [0-9]+")
+    string(REGEX REPLACE "#define LIBAVUTIL_VERSION_MINOR ([0-9]+)" "\\1" FFMPEG_VERSION_MINOR "${FFMPEG_VERSION_MINOR}")
+
+    set(FFMPEG_VERSION "${FFMPEG_VERSION_MAJOR}.${FFMPEG_VERSION_MINOR}")
+endif()
+
+# 处理查找结果
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FFmpeg
+    REQUIRED_VARS
+        FFMPEG_INCLUDE_DIR
+        FFMPEG_LIBRARIES
+    VERSION_VAR FFMPEG_VERSION
+    HANDLE_COMPONENTS
+)
+
+# 定义导入目标
+if(FFMPEG_FOUND AND NOT TARGET FFmpeg::FFmpeg)
+    add_library(FFmpeg::FFmpeg INTERFACE IMPORTED)
+    set_target_properties(FFmpeg::FFmpeg PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${FFMPEG_LIBRARIES}"
+    )
+
+    # 为每个组件创建单独的目标
+    foreach(COMPONENT ${FFMPEG_COMPONENTS})
+        string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+        if(TARGET FFmpeg::${COMPONENT} OR NOT ${UPPERCOMPONENT}_LIBRARY)
+            continue()
+        endif()
+
+        add_library(FFmpeg::${COMPONENT} UNKNOWN IMPORTED)
+        set_target_properties(FFmpeg::${COMPONENT} PROPERTIES
+            IMPORTED_LOCATION "${${UPPERCOMPONENT}_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_INCLUDE_DIR}"
+        )
+    endforeach()
+endif()
+
+# 缓存变量
+mark_as_advanced(
+    FFMPEG_INCLUDE_DIR
+    FFMPEG_LIBRARIES
+    FFMPEG_VERSION
+)

cmake/modules/NSIS.template.in

@@ -719,7 +719,8 @@ Section "-Core installation"
 
   ExecWait '"$INSTDIR\\${WebView2Installer}" /silent /install'
   ExecWait '"$INSTDIR\\${VCREDIST_X64Installer}" /silent /install'
-  ExecWait '"$INSTDIR\\${STLTHUMB_X64Installer}" /silent /install'
+  ;ExecWait '"$INSTDIR\\${STLTHUMB_X64Installer}" /silent /install'
+  ;ExecWait 'msiexec /i ""$INSTDIR\\${STLTHUMB_X64Installer}" /fa /qn / REBOOT=Suppress' 
 
   ;Store installation folder
   WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
@@ -809,12 +810,12 @@ WriteRegStr HKCR "cxprj_cxsw\shell\open\command" "" '"$INSTDIR\${PROCESS_NAME}"
 System::Call "Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)"
 
   ;add stl thumb
-  ;ExecWait '"regsvr32" /s "$INSTDIR\STLThumbWinShellExtension.dll"'
-  ;WriteRegStr HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}" "" "{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
-  ;WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "" "STLThumbWinShellExtension.STLThumbnailProvider Class"
-  ;WriteRegDWORD HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "DisableProcessIsolation" 1
-  ;WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "" "$INSTDIR\STLThumbWinShellExtension.dll"
-  ;WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "ThreadingModel" "Both"
+  ExecWait '"regsvr32" /s "$INSTDIR\STLThumbWinShellExtension.dll"'
+  WriteRegStr HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}" "" "{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
+  WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "" "STLThumbWinShellExtension.STLThumbnailProvider Class"
+  WriteRegDWORD HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "DisableProcessIsolation" 1
+  WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "" "$INSTDIR\STLThumbWinShellExtension.dll"
+  WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "ThreadingModel" "Apartment"
 SectionEnd
 
 Section "-Add to path"
@@ -936,11 +937,11 @@ Section "Un.${APP_NAME}"
 !endif
 
   ; Remove stl thumb
-  ; ExecWait '"regsvr32" /s /u "$INSTDIR\STLThumbWinShellExtension.dll"'
-  ; Delete "$INSTDIR\stl-thumb.exe"
-  ; Delete "$INSTDIR\STLThumbWinShellExtension.dll"
-  ; DeleteRegKey HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}"
-  ; DeleteRegKey HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
+   ExecWait '"regsvr32" /s /u "$INSTDIR\STLThumbWinShellExtension.dll"'
+   Delete "$INSTDIR\stl-thumb.exe"
+   Delete "$INSTDIR\STLThumbWinShellExtension.dll"
+   DeleteRegKey HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}"
+   DeleteRegKey HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
 
   ;Remove the uninstaller itself.
   Delete "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"

deps/CMakeLists.txt

@@ -339,10 +339,15 @@ if(NOT FREETYPE_FOUND)
     include(FREETYPE/FREETYPE.cmake)
     set(FREETYPE_PKG "dep_FREETYPE") 
 endif()
-
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    include(FFmpeg/ffmpeg.cmake)
+endif()
 include(OCCT/OCCT.cmake)
 include(OpenCV/OpenCV.cmake)
 include(aliyun-oss-cpp-sdk/aliyun-oss-cpp-sdk.cmake)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  include(metartc/metartc.cmake)
+endif()
 include(breakpad/breakpad.cmake)
 set(_dep_list
     dep_Boost
@@ -366,7 +371,9 @@ set(_dep_list
     dep_BREAKPAD
 	dep_Assimp
     )
-
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	list(APPEND _dep_list "dep_metartc")
+endif()
 if (MSVC)
     # Experimental
     #list(APPEND _dep_list "dep_qhull")

deps/FFmpeg/ffmpeg.cmake

@@ -0,0 +1,20 @@
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+set(_conf_cmd ./configure)
+set(_make_cmd make -j${NPROC})
+set(_install_cmd make -j${NPROC} install)
+ExternalProject_Add(dep_FFmpeg
+    #EXCLUDE_FROM_ALL ON
+    URL "https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2"
+    URL_HASH SHA256=306bde5f411e9ee04352d1d3de41bd3de986e42e2af2a4c44052dce1ada26fb8
+    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFmpeg
+	CONFIGURE_COMMAND ${_conf_cmd}
+        "--prefix=${DESTDIR}"
+        "--enable-gpl"
+        "--enable-libx264"
+        "--enable-static"
+        "--disable-x86asm"
+    BUILD_IN_SOURCE ON
+    BUILD_COMMAND ${_make_cmd}
+    INSTALL_COMMAND ${_install_cmd}
+)
+endif()

deps/MPFR/MPFR.cmake

@@ -25,7 +25,7 @@ else ()
     endif ()
 
     ExternalProject_Add(dep_MPFR
-        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
+        URL https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1.tar.bz2
         URL_HASH SHA256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON

deps/metartc/metartc.cmake

@@ -0,0 +1,15 @@
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+orcaslicer_add_cmake_project(metartc
+  # GIT_REPOSITORY https://github.com/aliyun/aliyun-oss-cpp-sdk.git
+  # GIT_TAG v1.9.2
+  URL https://github.com/CrealityOfficial/metartc/archive/refs/tags/v1.0.0.tar.gz
+  URL_HASH SHA256=696780282b3a9324e87d451ee2c8889e3ebc93c45d06db46571208477bc93d9a
+  #PATCH_COMMAND ${patch_command}
+)
+
+add_dependencies(dep_metartc dep_FFmpeg)
+
+if (MSVC)
+    add_debug_dep(dep_FFmpeg)
+endif ()
+endif()

deps/wxWidgets/wxWidgets.cmake

@@ -24,8 +24,8 @@ endif ()
 
 orcaslicer_add_cmake_project(
     wxWidgets
-    GIT_REPOSITORY "https://github.com/CrealityOfficial/Orca-deps-wxWidgets.git"
-    GIT_SHALLOW ON
+    URL "https://github.com/CrealityOfficial/Orca-deps-wxWidgets/archive/refs/tags/v1.0.0.tar.gz"
+    URL_HASH SHA256=74089054448d887c1b551ac98f4b46fa8960a5168df48aa77700c7a58071148c
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${TIFF_PKG} ${JPEG_PKG}
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON