From 5cc7daa4c3f7d1a9d1eedaafe60df8ce7afa55d7 Mon Sep 17 00:00:00 2001 From: Dominic Date: Thu, 24 Feb 2022 15:20:27 +0100 Subject: [PATCH] superslicer-prerelease 2.4.58.0-1 --- .SRCINFO | 32 +- 0002-fix-cereal.patch | 70 ++++ 0003-openexr3.patch | 77 +++++ FindTBB.cmake | 497 --------------------------- PKGBUILD | 32 +- tbb-2021.patch | 769 ------------------------------------------ 6 files changed, 176 insertions(+), 1301 deletions(-) create mode 100644 0002-fix-cereal.patch create mode 100644 0003-openexr3.patch delete mode 100644 FindTBB.cmake delete mode 100644 tbb-2021.patch diff --git a/.SRCINFO b/.SRCINFO index 5553a87..b361110 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,42 +1,40 @@ pkgbase = superslicer-prerelease pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) - pkgver = 2.3.57.9 - pkgrel = 2 + pkgver = 2.4.58.0 + pkgrel = 1 epoch = 1 url = https://github.com/supermerill/SuperSlicer arch = x86_64 license = AGPL3 - makedepends = cereal + makedepends = boost>=1.73.0 + makedepends = cereal>=1.3.0 makedepends = cmake - makedepends = ninja makedepends = eigen makedepends = libigl makedepends = openvdb - makedepends = boost>=1.73.0 + makedepends = samurai makedepends = wxgtk2-dev-314-opt + depends = boost-libs>=1.73.0 depends = cgal depends = glew depends = imath + depends = libspnav depends = nlopt depends = openvdb - depends = wxgtk3-dev-314-opt - depends = boost-libs>=1.73.0 depends = qhull>=2020.2-4 + depends = wxgtk3-dev-314-opt optdepends = superslicer-profiles: Predefined printer profiles - provides = superslicer=1:2.3.57.9 + provides = superslicer=1:2.4.58.0 conflicts = superslicer conflicts = superslicer-git - replaces = slic3r++ options = !emptydirs - source = https://github.com/supermerill/SuperSlicer/archive/2.3.57.9.tar.gz + source = https://github.com/supermerill/SuperSlicer/archive/2.4.58.0.tar.gz source = 0001-wxgtk3-is-broken-on-wayland.patch - source = https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch - source = tbb-2021.patch - source = FindTBB.cmake - sha512sums = bf421afa55ad7d1c3eafa8dc15efb20ab463e21b78f5e03d188f68d018a7b32cd24c2163974d90eff80e1ebb39a669b3e877a614e1040bc31c7160cca7ffc554 + source = 0002-fix-cereal.patch + source = 0003-openexr3.patch + sha512sums = 11a025960b516d70b9936c777a2ea57fe1116330b2abc042d5ccd77b47e99140d353dc6b156b5a3fd412896dfb0d3595246d7966855ce4af5b17bb581828245d sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5 - sha512sums = c33c2414746bc9d7dceb5af59ecb4aed2189211fc3c8b144d712a39d3677ba4d366eb9b4dd05fbc3811954d69cd1273d714dc4536489fe153ac1aee2919e5c98 - sha512sums = b8425f6d0402042f73891d21d1be370d0afc3a156f8366da5d1cd73aeb197347dbe59a544b95b1aa40b2a3e28c520ac410fa4f92aa99822c0cb8b41b595d6519 - sha512sums = 5a6426f7d5b1761923c83838b1b5c976529b7a4b5e8c5c98f34c6174d8636fbfca34e3a04ed5f5314c88db3261c454c9f4576f7cf58f6623a43cff08a0b5b105 + sha512sums = c3ba2d16140d445168681ff442bda12e87de22f8b94d59c32576bd7079ffe5864cce8e62cddd1ed47458f9eddcbd3e1a02645b0645aad6f2e0cb08a876bf783f + sha512sums = 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb pkgname = superslicer-prerelease diff --git a/0002-fix-cereal.patch b/0002-fix-cereal.patch new file mode 100644 index 0000000..839b0ec --- /dev/null +++ b/0002-fix-cereal.patch @@ -0,0 +1,70 @@ +diff --git a/cmake/modules/Findcereal.cmake b/cmake/modules/Findcereal.cmake +deleted file mode 100644 +index b4829757e..000000000 +--- a/cmake/modules/Findcereal.cmake ++++ /dev/null +@@ -1,26 +0,0 @@ +-set(_q "") +-if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) +- set(_q QUIET) +- set(_quietly TRUE) +-endif() +-find_package(${CMAKE_FIND_PACKAGE_NAME} ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG ${_q}) +- +-if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FOUND) +- # Fall-back solution to find the Cereal serialization library header file +- include(CheckIncludeFileCXX) +- add_library(cereal INTERFACE) +- target_include_directories(cereal INTERFACE include) +- +- if (_quietly) +- set(CMAKE_REQUIRED_QUIET ON) +- endif() +- CHECK_INCLUDE_FILE_CXX("cereal/cereal.hpp" HAVE_CEREAL_H) +- +- if (NOT HAVE_CEREAL_H) +- if (${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) +- message(FATAL_ERROR "Cereal library not found. Please install the dependency.") +- elseif(NOT _quietly) +- message(WARNING "Cereal library not found.") +- endif() +- endif () +-endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01ef37905..98dbafa01 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -139,7 +139,7 @@ if (NOT WIN32) + set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") + endif () + +-target_link_libraries(Slic3r libslic3r cereal) ++target_link_libraries(Slic3r libslic3r) + if (APPLE) + # add_compile_options(-stdlib=libc++) + # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 7048fb60c..95c5ed9e2 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -356,7 +356,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS}) + target_link_libraries(libslic3r + libnest2d + admesh +- cereal + libigl + miniz + boost_libs +diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt +index fe3d15425..24be67592 100644 +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -291,7 +291,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$:SLIC3 + + encoding_check(libslic3r_gui) + +-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) + + if (MSVC) + target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/0003-openexr3.patch b/0003-openexr3.patch new file mode 100644 index 0000000..8ae71c1 --- /dev/null +++ b/0003-openexr3.patch @@ -0,0 +1,77 @@ +diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake +index 4fde5fa4a..566e73a5e 100644 +--- a/cmake/modules/FindOpenVDB.cmake ++++ b/cmake/modules/FindOpenVDB.cmake +@@ -347,28 +347,10 @@ macro(just_fail msg) + return() + endmacro() + +-find_package(IlmBase QUIET) +-if(NOT IlmBase_FOUND) +- pkg_check_modules(IlmBase QUIET IlmBase) +-endif() +-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half) +- message(STATUS "Falling back to IlmBase found by pkg-config...") +- +- find_library(IlmHalf_LIBRARY NAMES Half) +- if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS) +- just_fail("IlmBase::Half can not be found!") +- endif() +- +- add_library(IlmBase::Half UNKNOWN IMPORTED) +- set_target_properties(IlmBase::Half PROPERTIES +- IMPORTED_LOCATION "${IlmHalf_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") +-elseif(NOT IlmBase_FOUND) +- just_fail("IlmBase::Half can not be found!") +-endif() + find_package(TBB ${_quiet} ${_required} COMPONENTS tbb) + find_package(ZLIB ${_quiet} ${_required}) + find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system ) ++find_package(Imath CONFIG) + + # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to + # which we can query for optional deps. This basically runs ldd/otoll/objdump +@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST}) + set(OpenVDB_USES_LOG4CPLUS ON) + endif() + +- string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP) ++ string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP) + if(NOT ${_HAS_DEP} EQUAL -1) + set(OpenVDB_USES_ILM ON) + endif() +@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS) + find_package(Log4cplus ${_quiet} ${_required}) + endif() + +-if(OpenVDB_USES_ILM) +- find_package(IlmBase ${_quiet} ${_required}) +-endif() +- +-if(OpenVDB_USES_EXR) ++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR) + find_package(OpenEXR ${_quiet} ${_required}) + endif() + +@@ -471,7 +449,7 @@ endif() + set(_OPENVDB_VISIBLE_DEPENDENCIES + Boost::iostreams + Boost::system +- IlmBase::Half ++ Imath::Imath + ) + + set(_OPENVDB_DEFINITIONS) +@@ -481,10 +459,7 @@ endif() + + if(OpenVDB_USES_EXR) + list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES +- IlmBase::IlmThread +- IlmBase::Iex +- IlmBase::Imath +- OpenEXR::IlmImf ++ OpenEXR::OpenEXR + ) + list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR") + endif() diff --git a/FindTBB.cmake b/FindTBB.cmake deleted file mode 100644 index 4180794..0000000 --- a/FindTBB.cmake +++ /dev/null @@ -1,497 +0,0 @@ -# source: archlinux prusa-slicer-tbb-2021-patch -# https://github.com/archlinux/svntogit-community/blob/packages/prusa-slicer/trunk/prusa-slicer-tbb-2021.patch - -# - Find ThreadingBuildingBlocks include dirs and libraries -# Use this module by invoking find_package with the form: -# find_package(TBB -# [REQUIRED] # Fail with error if TBB is not found -# ) # -# Once done, this will define -# -# TBB_FOUND - system has TBB -# TBB_INCLUDE_DIRS - the TBB include directories -# TBB_LIBRARIES - TBB libraries to be lined, doesn't include malloc or -# malloc proxy -# TBB::tbb - imported target for the TBB library -# -# TBB_VERSION_MAJOR - Major Product Version Number -# TBB_VERSION_MINOR - Minor Product Version Number -# TBB_INTERFACE_VERSION - Engineering Focused Version Number -# TBB_COMPATIBLE_INTERFACE_VERSION - The oldest major interface version -# still supported. This uses the engineering -# focused interface version numbers. -# -# TBB_MALLOC_FOUND - system has TBB malloc library -# TBB_MALLOC_INCLUDE_DIRS - the TBB malloc include directories -# TBB_MALLOC_LIBRARIES - The TBB malloc libraries to be lined -# TBB::malloc - imported target for the TBB malloc library -# -# TBB_MALLOC_PROXY_FOUND - system has TBB malloc proxy library -# TBB_MALLOC_PROXY_INCLUDE_DIRS = the TBB malloc proxy include directories -# TBB_MALLOC_PROXY_LIBRARIES - The TBB malloc proxy libraries to be lined -# TBB::malloc_proxy - imported target for the TBB malloc proxy library -# -# -# This module reads hints about search locations from variables: -# ENV TBB_ARCH_PLATFORM - for eg. set it to "mic" for Xeon Phi builds -# ENV TBB_ROOT or just TBB_ROOT - root directory of tbb installation -# ENV TBB_BUILD_PREFIX - specifies the build prefix for user built tbb -# libraries. Should be specified with ENV TBB_ROOT -# and optionally... -# ENV TBB_BUILD_DIR - if build directory is different than ${TBB_ROOT}/build -# -# -# Modified by Robert Maynard from the original OGRE source -# -#------------------------------------------------------------------- -# This file is part of the CMake build system for OGRE -# (Object-oriented Graphics Rendering Engine) -# For the latest info, see http://www.ogre3d.org/ -# -# The contents of this file are placed in the public domain. Feel -# free to make use of it in any way you like. -#------------------------------------------------------------------- -# -# ========================================================================= -# Taken from Copyright.txt in the root of the VTK source tree as per -# instructions to substitute the full license in place of the summary -# reference when distributing outside of VTK -# ========================================================================= -# -# Program: Visualization Toolkit -# Module: Copyright.txt -# -# Copyright (c) 1993-2015 Ken Martin, Will Schroeder, Bill Lorensen -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# * Neither name of Ken Martin, Will Schroeder, or Bill Lorensen nor the names -# of any contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# =========================================================================*/ - -#============================================================================= -# FindTBB helper functions and macros -# - -# Use TBBConfig.cmake if possible. - -set(_tbb_find_quiet) -if (TBB_FIND_QUIETLY) - set(_tbb_find_quiet QUIET) -endif () -set(_tbb_find_components) -set(_tbb_find_optional_components) -foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS) - if (TBB_FIND_REQUIRED_${_tbb_find_component}) - list(APPEND _tbb_find_components "${_tbb_find_component}") - else () - list(APPEND _tbb_find_optional_components "${_tbb_find_component}") - endif () -endforeach () -unset(_tbb_find_component) -find_package(TBB CONFIG ${_tbb_find_quiet} - COMPONENTS ${_tbb_find_components} - OPTIONAL_COMPONENTS ${_tbb_find_optional_components}) -unset(_tbb_find_quiet) -unset(_tbb_find_components) -unset(_tbb_find_optional_components) -if (TBB_FOUND) - return () -endif () - -#==================================================== -# Fix the library path in case it is a linker script -#==================================================== -function(tbb_extract_real_library library real_library) - if(NOT UNIX OR NOT EXISTS ${library}) - set(${real_library} "${library}" PARENT_SCOPE) - return() - endif() - - #Read in the first 4 bytes and see if they are the ELF magic number - set(_elf_magic "7f454c46") - file(READ ${library} _hex_data OFFSET 0 LIMIT 4 HEX) - if(_hex_data STREQUAL _elf_magic) - #we have opened a elf binary so this is what - #we should link to - set(${real_library} "${library}" PARENT_SCOPE) - return() - endif() - - file(READ ${library} _data OFFSET 0 LIMIT 1024) - if("${_data}" MATCHES "INPUT \\(([^(]+)\\)") - #extract out the .so name from REGEX MATCH command - set(_proper_so_name "${CMAKE_MATCH_1}") - - #construct path to the real .so which is presumed to be in the same directory - #as the input file - get_filename_component(_so_dir "${library}" DIRECTORY) - set(${real_library} "${_so_dir}/${_proper_so_name}" PARENT_SCOPE) - else() - #unable to determine what this library is so just hope everything works - #and pass it unmodified. - set(${real_library} "${library}" PARENT_SCOPE) - endif() -endfunction() - -#=============================================== -# Do the final processing for the package find. -#=============================================== -macro(findpkg_finish PREFIX TARGET_NAME) - if (${PREFIX}_INCLUDE_DIR AND ${PREFIX}_LIBRARY) - set(${PREFIX}_FOUND TRUE) - set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIR}) - set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARY}) - else () - if (${PREFIX}_FIND_REQUIRED AND NOT ${PREFIX}_FIND_QUIETLY) - message(FATAL_ERROR "Required library ${PREFIX} not found.") - endif () - endif () - - if (NOT TARGET "TBB::${TARGET_NAME}") - if (${PREFIX}_LIBRARY_RELEASE) - tbb_extract_real_library(${${PREFIX}_LIBRARY_RELEASE} real_release) - endif () - if (${PREFIX}_LIBRARY_DEBUG) - tbb_extract_real_library(${${PREFIX}_LIBRARY_DEBUG} real_debug) - endif () - add_library(TBB::${TARGET_NAME} UNKNOWN IMPORTED) - set_target_properties(TBB::${TARGET_NAME} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${${PREFIX}_INCLUDE_DIR}") - if (${PREFIX}_LIBRARY_DEBUG AND ${PREFIX}_LIBRARY_RELEASE) - set_target_properties(TBB::${TARGET_NAME} PROPERTIES - IMPORTED_LOCATION "${real_release}" - IMPORTED_LOCATION_DEBUG "${real_debug}" - IMPORTED_LOCATION_RELEASE "${real_release}") - elseif (${PREFIX}_LIBRARY_RELEASE) - set_target_properties(TBB::${TARGET_NAME} PROPERTIES - IMPORTED_LOCATION "${real_release}") - elseif (${PREFIX}_LIBRARY_DEBUG) - set_target_properties(TBB::${TARGET_NAME} PROPERTIES - IMPORTED_LOCATION "${real_debug}") - endif () - endif () - - #mark the following variables as internal variables - mark_as_advanced(${PREFIX}_INCLUDE_DIR - ${PREFIX}_LIBRARY - ${PREFIX}_LIBRARY_DEBUG - ${PREFIX}_LIBRARY_RELEASE) -endmacro() - -#=============================================== -# Generate debug names from given release names -#=============================================== -macro(get_debug_names PREFIX) - foreach(i ${${PREFIX}}) - set(${PREFIX}_DEBUG ${${PREFIX}_DEBUG} ${i}d ${i}D ${i}_d ${i}_D ${i}_debug ${i}) - endforeach() -endmacro() - -#=============================================== -# See if we have env vars to help us find tbb -#=============================================== -macro(getenv_path VAR) - set(ENV_${VAR} $ENV{${VAR}}) - # replace won't work if var is blank - if (ENV_${VAR}) - string( REGEX REPLACE "\\\\" "/" ENV_${VAR} ${ENV_${VAR}} ) - endif () -endmacro() - -#=============================================== -# Couple a set of release AND debug libraries -#=============================================== -macro(make_library_set PREFIX) - if (${PREFIX}_RELEASE AND ${PREFIX}_DEBUG) - set(${PREFIX} optimized ${${PREFIX}_RELEASE} debug ${${PREFIX}_DEBUG}) - elseif (${PREFIX}_RELEASE) - set(${PREFIX} ${${PREFIX}_RELEASE}) - elseif (${PREFIX}_DEBUG) - set(${PREFIX} ${${PREFIX}_DEBUG}) - endif () -endmacro() - -#=============================================== -# Ensure that the release & debug libraries found are from the same installation. -#=============================================== -macro(find_tbb_library_verifying_release_debug_locations PREFIX) - find_library(${PREFIX}_RELEASE - NAMES ${${PREFIX}_NAMES} - HINTS ${TBB_LIB_SEARCH_PATH}) - if (${PREFIX}_RELEASE) - # To avoid finding a mismatched set of release & debug libraries from - # different installations if the first found does not have debug libraries - # by forcing the search for debug to only occur within the detected release - # library directory (if found). Although this would break detection if the - # release & debug libraries were shipped in different directories, this is - # not the case in the official TBB releases for any platform. - get_filename_component( - FOUND_RELEASE_LIB_DIR "${${PREFIX}_RELEASE}" DIRECTORY) - find_library(${PREFIX}_DEBUG - NAMES ${${PREFIX}_NAMES_DEBUG} - HINTS ${FOUND_RELEASE_LIB_DIR} - NO_DEFAULT_PATH) - else() - find_library(${PREFIX}_DEBUG - NAMES ${${PREFIX}_NAMES_DEBUG} - HINTS ${TBB_LIB_SEARCH_PATH}) - endif() -endmacro() - -#============================================================================= -# Now to actually find TBB -# - -# Get path, convert backslashes as ${ENV_${var}} -getenv_path(TBB_ROOT) - -# initialize search paths -set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT}) -set(TBB_INC_SEARCH_PATH "") -set(TBB_LIB_SEARCH_PATH "") - - -# If user built from sources -set(TBB_BUILD_PREFIX $ENV{TBB_BUILD_PREFIX}) -if (TBB_BUILD_PREFIX AND ENV_TBB_ROOT) - getenv_path(TBB_BUILD_DIR) - if (NOT ENV_TBB_BUILD_DIR) - set(ENV_TBB_BUILD_DIR ${ENV_TBB_ROOT}/build) - endif () - - # include directory under ${ENV_TBB_ROOT}/include - list(APPEND TBB_LIB_SEARCH_PATH - ${ENV_TBB_BUILD_DIR}/${TBB_BUILD_PREFIX}_release - ${ENV_TBB_BUILD_DIR}/${TBB_BUILD_PREFIX}_debug) -endif () - - -# For Windows, let's assume that the user might be using the precompiled -# TBB packages from the main website. These use a rather awkward directory -# structure (at least for automatically finding the right files) depending -# on platform and compiler, but we'll do our best to accommodate it. -# Not adding the same effort for the precompiled linux builds, though. Those -# have different versions for CC compiler versions and linux kernels which -# will never adequately match the user's setup, so there is no feasible way -# to detect the "best" version to use. The user will have to manually -# select the right files. (Chances are the distributions are shipping their -# custom version of tbb, anyway, so the problem is probably nonexistent.) -if (WIN32 AND MSVC) - set(COMPILER_PREFIX "vc7.1") - if (MSVC_VERSION EQUAL 1400) - set(COMPILER_PREFIX "vc8") - elseif(MSVC_VERSION EQUAL 1500) - set(COMPILER_PREFIX "vc9") - elseif(MSVC_VERSION EQUAL 1600) - set(COMPILER_PREFIX "vc10") - elseif(MSVC_VERSION EQUAL 1700) - set(COMPILER_PREFIX "vc11") - elseif(MSVC_VERSION EQUAL 1800) - set(COMPILER_PREFIX "vc12") - elseif(MSVC_VERSION GREATER_EQUAL 1900) - set(COMPILER_PREFIX "vc14") - endif () - - # for each prefix path, add ia32/64\${COMPILER_PREFIX}\lib to the lib search path - foreach (dir IN LISTS TBB_PREFIX_PATH) - if (CMAKE_CL_64) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia64/${COMPILER_PREFIX}/lib) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia64/${COMPILER_PREFIX}) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/${COMPILER_PREFIX}/lib) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64/${COMPILER_PREFIX}) - else () - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/${COMPILER_PREFIX}/lib) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32/${COMPILER_PREFIX}) - endif () - endforeach () -endif () - -# For OS X binary distribution, choose libc++ based libraries for Mavericks (10.9) -# and above and AppleClang -if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND - NOT CMAKE_SYSTEM_VERSION VERSION_LESS 13.0) - set (USE_LIBCXX OFF) - cmake_policy(GET CMP0025 POLICY_VAR) - - if (POLICY_VAR STREQUAL "NEW") - if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") - set (USE_LIBCXX ON) - endif () - else () - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set (USE_LIBCXX ON) - endif () - endif () - - if (USE_LIBCXX) - foreach (dir IN LISTS TBB_PREFIX_PATH) - list (APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/libc++ ${dir}/libc++/lib) - endforeach () - endif () -endif () - -# check compiler ABI -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - set(COMPILER_PREFIX) - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) - list(APPEND COMPILER_PREFIX "gcc4.8") - endif() - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7) - list(APPEND COMPILER_PREFIX "gcc4.7") - endif() - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4) - list(APPEND COMPILER_PREFIX "gcc4.4") - endif() - list(APPEND COMPILER_PREFIX "gcc4.1") -elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(COMPILER_PREFIX) - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) # Complete guess - list(APPEND COMPILER_PREFIX "gcc4.8") - endif() - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6) - list(APPEND COMPILER_PREFIX "gcc4.7") - endif() - list(APPEND COMPILER_PREFIX "gcc4.4") -else() # Assume compatibility with 4.4 for other compilers - list(APPEND COMPILER_PREFIX "gcc4.4") -endif () - -# if platform architecture is explicitly specified -set(TBB_ARCH_PLATFORM $ENV{TBB_ARCH_PLATFORM}) -if (TBB_ARCH_PLATFORM) - foreach (dir IN LISTS TBB_PREFIX_PATH) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/${TBB_ARCH_PLATFORM}/lib) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/${TBB_ARCH_PLATFORM}) - endforeach () -endif () - -foreach (dir IN LISTS TBB_PREFIX_PATH) - foreach (prefix IN LISTS COMPILER_PREFIX) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64/${prefix}) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/lib) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/${prefix}/lib) - else () - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32/${prefix}) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/lib) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/${prefix}/lib) - endif () - endforeach() -endforeach () - -# add general search paths -foreach (dir IN LISTS TBB_PREFIX_PATH) - list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib ${dir}/Lib ${dir}/lib/tbb - ${dir}/Libs) - list(APPEND TBB_INC_SEARCH_PATH ${dir}/include ${dir}/Include - ${dir}/include/tbb) -endforeach () - -set(TBB_LIBRARY_NAMES tbb) -get_debug_names(TBB_LIBRARY_NAMES) - -find_path(TBB_INCLUDE_DIR - NAMES tbb/tbb.h - HINTS ${TBB_INC_SEARCH_PATH}) -find_tbb_library_verifying_release_debug_locations(TBB_LIBRARY) -make_library_set(TBB_LIBRARY) - -findpkg_finish(TBB tbb) - -#if we haven't found TBB no point on going any further -if (NOT TBB_FOUND) - return() -endif () - -#============================================================================= -# Look for TBB's malloc package -set(TBB_MALLOC_LIBRARY_NAMES tbbmalloc) -get_debug_names(TBB_MALLOC_LIBRARY_NAMES) - -find_path(TBB_MALLOC_INCLUDE_DIR - NAMES tbb/tbb.h - HINTS ${TBB_INC_SEARCH_PATH}) -find_tbb_library_verifying_release_debug_locations(TBB_MALLOC_LIBRARY) -make_library_set(TBB_MALLOC_LIBRARY) - -findpkg_finish(TBB_MALLOC tbbmalloc) - -#============================================================================= -# Look for TBB's malloc proxy package -set(TBB_MALLOC_PROXY_LIBRARY_NAMES tbbmalloc_proxy) -get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES) - -find_path(TBB_MALLOC_PROXY_INCLUDE_DIR - NAMES tbb/tbbmalloc_proxy.h - HINTS ${TBB_INC_SEARCH_PATH}) -find_tbb_library_verifying_release_debug_locations(TBB_MALLOC_PROXY_LIBRARY) -make_library_set(TBB_MALLOC_PROXY_LIBRARY) - -findpkg_finish(TBB_MALLOC_PROXY tbbmalloc_proxy) - - -#============================================================================= -#parse all the version numbers from tbb -if(NOT TBB_VERSION) - set(TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1 - "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h") - set(TBB_VERSION_FILE_AFTER_TBB_2021_1 - "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h") - - if (EXISTS "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}") - set(TBB_VERSION_FILE "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}") - elseif (EXISTS "${TBB_VERSION_FILE_AFTER_TBB_2021_1}") - set(TBB_VERSION_FILE "${TBB_VERSION_FILE_AFTER_TBB_2021_1}") - else() - message(FATAL_ERROR "Found TBB installation: ${TBB_INCLUDE_DIR} " - "missing version header.") - endif() - - #only read the start of the file - file(STRINGS - "${TBB_VERSION_FILE}" - TBB_VERSION_CONTENTS - REGEX "VERSION") - - string(REGEX REPLACE - ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" - TBB_VERSION_MAJOR "${TBB_VERSION_CONTENTS}") - - string(REGEX REPLACE - ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" - TBB_VERSION_MINOR "${TBB_VERSION_CONTENTS}") - - string(REGEX REPLACE - ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" - TBB_INTERFACE_VERSION "${TBB_VERSION_CONTENTS}") - - string(REGEX REPLACE - ".*#define TBB_COMPATIBLE_INTERFACE_VERSION ([0-9]+).*" "\\1" - TBB_COMPATIBLE_INTERFACE_VERSION "${TBB_VERSION_CONTENTS}") - -endif() diff --git a/PKGBUILD b/PKGBUILD index c7eceec..7b06e5f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,31 +1,28 @@ # Maintainer: Lukas1818 aur at lukas1818 dot de pkgname=superslicer-prerelease -pkgver=2.3.57.9 +pkgver=2.4.58.0 _pkgtag=$pkgver -pkgrel=2 +pkgrel=1 epoch=1 pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" arch=("$CARCH") url="https://github.com/supermerill/SuperSlicer" license=('AGPL3') options=(!emptydirs) -depends=('cgal' 'glew' 'imath' 'nlopt' 'openvdb' 'wxgtk3-dev-314-opt' 'boost-libs>=1.73.0' 'qhull>=2020.2-4') -replaces=('slic3r++') -makedepends=('cereal' 'cmake' 'ninja' 'eigen' 'libigl' 'openvdb' 'boost>=1.73.0' 'wxgtk2-dev-314-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed +depends=('boost-libs>=1.73.0' 'cgal' 'glew' 'imath' 'libspnav' 'nlopt' 'openvdb' 'qhull>=2020.2-4' 'wxgtk3-dev-314-opt') +makedepends=('boost>=1.73.0' 'cereal>=1.3.0' 'cmake' 'eigen' 'libigl' 'openvdb' 'samurai' 'wxgtk2-dev-314-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed optdepends=('superslicer-profiles: Predefined printer profiles') provides=("superslicer=$epoch:$pkgver") conflicts=('superslicer' 'superslicer-git') source=("https://github.com/supermerill/SuperSlicer/archive/$_pkgtag.tar.gz" "0001-wxgtk3-is-broken-on-wayland.patch" - "https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch" - "tbb-2021.patch" - "FindTBB.cmake") -sha512sums=('bf421afa55ad7d1c3eafa8dc15efb20ab463e21b78f5e03d188f68d018a7b32cd24c2163974d90eff80e1ebb39a669b3e877a614e1040bc31c7160cca7ffc554' + "0002-fix-cereal.patch" + "0003-openexr3.patch") +sha512sums=('11a025960b516d70b9936c777a2ea57fe1116330b2abc042d5ccd77b47e99140d353dc6b156b5a3fd412896dfb0d3595246d7966855ce4af5b17bb581828245d' 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5' - 'c33c2414746bc9d7dceb5af59ecb4aed2189211fc3c8b144d712a39d3677ba4d366eb9b4dd05fbc3811954d69cd1273d714dc4536489fe153ac1aee2919e5c98' - 'b8425f6d0402042f73891d21d1be370d0afc3a156f8366da5d1cd73aeb197347dbe59a544b95b1aa40b2a3e28c520ac410fa4f92aa99822c0cb8b41b595d6519' - '5a6426f7d5b1761923c83838b1b5c976529b7a4b5e8c5c98f34c6174d8636fbfca34e3a04ed5f5314c88db3261c454c9f4576f7cf58f6623a43cff08a0b5b105') + 'c3ba2d16140d445168681ff442bda12e87de22f8b94d59c32576bd7079ffe5864cce8e62cddd1ed47458f9eddcbd3e1a02645b0645aad6f2e0cb08a876bf783f' + '840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb') prepare() { @@ -37,10 +34,9 @@ prepare() sed -i 's,add_subdirectory(test),,g' src/CMakeLists.txt # apply patches - patch --forward --strip=1 --input="$srcdir/0001-wxgtk3-is-broken-on-wayland.patch" - patch -p1 < "$srcdir/prusa-slicer-openexr3.patch" # Fix build with openEXR 3 - patch -p1 < "$srcdir/tbb-2021.patch" # Fix build with TBB 2021 - cp "$srcdir/FindTBB.cmake" "cmake/modules/FindTBB.cmake" # Fix build with TBB 2021 + patch -Np1 -i "$srcdir/0001-wxgtk3-is-broken-on-wayland.patch" + patch -Np1 -i "$srcdir/0002-fix-cereal.patch" + patch -Np1 -i "$srcdir/0003-openexr3.patch" } build() @@ -62,13 +58,13 @@ build() -DwxWidgets_CONFIG_EXECUTABLE=/opt/wxgtk-dev-314/bin/wx-config \ -DCMAKE_CXX_FLAGS="-Wno-unused-command-line-argument -Wl,-rpath=/opt/wxgtk-dev-314/lib" - ninja + samu } package() { cd "$srcdir/SuperSlicer-$_pkgtag/build" - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" samu install test ! -h "$pkgdir/usr/share/SuperSlicer/resources" || rm "$pkgdir/usr/share/SuperSlicer/resources" } diff --git a/tbb-2021.patch b/tbb-2021.patch deleted file mode 100644 index 8b100e5..0000000 --- a/tbb-2021.patch +++ /dev/null @@ -1,769 +0,0 @@ -From 2b2e1a16be8e53ee7120e696aa918cbdaa4761f2 Mon Sep 17 00:00:00 2001 -From: Lukas1818 -Date: Thu, 30 Dec 2021 12:40:16 +0100 -Subject: [PATCH] fixs for tbb21 based on - https://github.com/archlinux/svntogit-community/blob/packages/prusa-slicer/trunk/prusa-slicer-tbb-2021.patch - ---- - src/libslic3r/Print.cpp | 6 ++-- - src/libslic3r/PrintBase.cpp | 2 +- - src/libslic3r/PrintBase.hpp | 40 ++++++++++----------- - src/libslic3r/SLA/Concurrency.hpp | 5 +-- - src/libslic3r/SLA/SupportTree.cpp | 3 -- - src/libslic3r/SLAPrint.cpp | 10 +++--- - src/libslic3r/SupportMaterial.cpp | 1 - - src/libslic3r/Thread.cpp | 10 +++--- - src/libslic3r/pchheader.hpp | 3 -- - src/libslic3r/utils.cpp | 6 ++-- - src/slic3r/GUI/BackgroundSlicingProcess.cpp | 6 ++-- - src/slic3r/GUI/BackgroundSlicingProcess.hpp | 2 +- - src/slic3r/GUI/InstanceCheck.hpp | 2 +- - src/slic3r/GUI/Mouse3DController.cpp | 38 ++++++++++---------- - src/slic3r/GUI/Mouse3DController.hpp | 10 +++--- - src/slic3r/GUI/RemovableDriveManager.cpp | 24 ++++++------- - src/slic3r/GUI/RemovableDriveManager.hpp | 6 ++-- - 17 files changed, 80 insertions(+), 94 deletions(-) - -diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp -index 1132af8dd9..ae64b970d0 100644 ---- a/src/libslic3r/Print.cpp -+++ b/src/libslic3r/Print.cpp -@@ -37,7 +37,7 @@ template class PrintState; - - void Print::clear() - { -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - // The following call should stop background processing if it is running. - this->invalidate_all_steps(); - for (PrintObject *object : m_objects) -@@ -353,7 +353,7 @@ bool Print::is_step_done(PrintObjectStep step) const - { - if (m_objects.empty()) - return false; -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - for (const PrintObject *object : m_objects) - if (! object->is_step_done_unguarded(step)) - return false; -@@ -706,7 +706,7 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_ - update_apply_status(false); - - // Grab the lock for the Print / PrintObject milestones. -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - - // The following call may stop the background processing. - if (! print_diff.empty()) -diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp -index 5ca0198d54..beabfb76b1 100644 ---- a/src/libslic3r/PrintBase.cpp -+++ b/src/libslic3r/PrintBase.cpp -@@ -141,7 +141,7 @@ void PrintBase::status_update_warnings(ObjectID object_id, int step, PrintStateB - printf("%s warning: %s\n", (object_id == this->id()) ? "print" : "print object", message.c_str()); - } - --tbb::mutex& PrintObjectBase::state_mutex(PrintBase *print) -+std::mutex& PrintObjectBase::state_mutex(PrintBase *print) - { - return print->state_mutex(); - } -diff --git a/src/libslic3r/PrintBase.hpp b/src/libslic3r/PrintBase.hpp -index a2db978fc7..8d138137fe 100644 ---- a/src/libslic3r/PrintBase.hpp -+++ b/src/libslic3r/PrintBase.hpp -@@ -6,12 +6,8 @@ - #include - #include - #include -- --// tbb/mutex.h includes Windows, which in turn defines min/max macros. Convince Windows.h to not define these min/max macros. --#ifndef NOMINMAX -- #define NOMINMAX --#endif --#include "tbb/mutex.h" -+#include -+#include - - #include "ObjectID.hpp" - #include "Model.hpp" -@@ -84,23 +80,23 @@ class PrintState : public PrintStateBase - public: - PrintState() {} - -- StateWithTimeStamp state_with_timestamp(StepType step, tbb::mutex &mtx) const { -- tbb::mutex::scoped_lock lock(mtx); -+ StateWithTimeStamp state_with_timestamp(StepType step, std::mutex &mtx) const { -+ std::scoped_lock lock(mtx); - StateWithTimeStamp state = m_state[step]; - return state; - } - -- StateWithWarnings state_with_warnings(StepType step, tbb::mutex &mtx) const { -- tbb::mutex::scoped_lock lock(mtx); -+ StateWithWarnings state_with_warnings(StepType step, std::mutex &mtx) const { -+ std::scoped_lock lock(mtx); - StateWithWarnings state = m_state[step]; - return state; - } - -- bool is_started(StepType step, tbb::mutex &mtx) const { -+ bool is_started(StepType step, std::mutex &mtx) const { - return this->state_with_timestamp(step, mtx).state == STARTED; - } - -- bool is_done(StepType step, tbb::mutex &mtx) const { -+ bool is_done(StepType step, std::mutex &mtx) const { - return this->state_with_timestamp(step, mtx).state == DONE; - } - -@@ -121,8 +117,8 @@ class PrintState : public PrintStateBase - // This is necessary to block until the Print::apply() updates its state, which may - // influence the processing step being entered. - template -- bool set_started(StepType step, tbb::mutex &mtx, ThrowIfCanceled throw_if_canceled) { -- tbb::mutex::scoped_lock lock(mtx); -+ bool set_started(StepType step, std::mutex &mtx, ThrowIfCanceled throw_if_canceled) { -+ std::scoped_lock lock(mtx); - // If canceled, throw before changing the step state. - throw_if_canceled(); - #ifndef NDEBUG -@@ -154,8 +150,8 @@ class PrintState : public PrintStateBase - // Timestamp when this stepentered the DONE state. - // bool indicates whether the UI has to update the slicing warnings of this step or not. - template -- std::pair set_done(StepType step, tbb::mutex &mtx, ThrowIfCanceled throw_if_canceled) { -- tbb::mutex::scoped_lock lock(mtx); -+ std::pair set_done(StepType step, std::mutex &mtx, ThrowIfCanceled throw_if_canceled) { -+ std::scoped_lock lock(mtx); - // If canceled, throw before changing the step state. - throw_if_canceled(); - assert(m_state[step].state == STARTED); -@@ -266,9 +262,9 @@ class PrintState : public PrintStateBase - // Return value: - // Current milestone (StepType). - // bool indicates whether the UI has to be updated or not. -- std::pair active_step_add_warning(PrintStateBase::WarningLevel warning_level, const std::string &message, int message_id, tbb::mutex &mtx) -+ std::pair active_step_add_warning(PrintStateBase::WarningLevel warning_level, const std::string &message, int message_id, std::mutex &mtx) - { -- tbb::mutex::scoped_lock lock(mtx); -+ std::scoped_lock lock(mtx); - assert(m_step_active != -1); - StateWithWarnings &state = m_state[m_step_active]; - assert(state.state == STARTED); -@@ -314,7 +310,7 @@ class PrintObjectBase : public ObjectBase - PrintObjectBase(ModelObject *model_object) : m_model_object(model_object) {} - virtual ~PrintObjectBase() {} - // Declared here to allow access from PrintBase through friendship. -- static tbb::mutex& state_mutex(PrintBase *print); -+ static std::mutex& state_mutex(PrintBase *print); - static std::function cancel_callback(PrintBase *print); - // Notify UI about a new warning of a milestone "step" on this PrintObjectBase. - // The UI will be notified by calling a status callback registered on print. -@@ -473,7 +469,7 @@ class PrintBase : public ObjectBase - friend class PrintObjectBase; - friend class BackgroundSlicingProcess; - -- tbb::mutex& state_mutex() const { return m_state_mutex; } -+ std::mutex& state_mutex() const { return m_state_mutex; } - std::function cancel_callback() { return m_cancel_callback; } - void call_cancel_callback() { m_cancel_callback(); } - // Notify UI about a new warning of a milestone "step" on this PrintBase. -@@ -498,7 +494,7 @@ class PrintBase : public ObjectBase - status_callback_type m_status_callback; - - private: -- tbb::atomic m_cancel_status; -+ std::atomic m_cancel_status; - - // Callback to be evoked to stop the background processing before a state is updated. - cancel_callback_type m_cancel_callback = [](){}; -@@ -506,7 +502,7 @@ class PrintBase : public ObjectBase - // Mutex used for synchronization of the worker thread with the UI thread: - // The mutex will be used to guard the worker thread against entering a stage - // while the data influencing the stage is modified. -- mutable tbb::mutex m_state_mutex; -+ mutable std::mutex m_state_mutex; - }; - - template -diff --git a/src/libslic3r/SLA/Concurrency.hpp b/src/libslic3r/SLA/Concurrency.hpp -index 300024c76d..6b609da00c 100644 ---- a/src/libslic3r/SLA/Concurrency.hpp -+++ b/src/libslic3r/SLA/Concurrency.hpp -@@ -1,12 +1,13 @@ - #ifndef SLA_CONCURRENCY_H - #define SLA_CONCURRENCY_H - -+#include - #include --#include - #include - #include - - #include -+#include - #include - - #include -@@ -23,7 +24,7 @@ template struct _ccr {}; - template<> struct _ccr - { - using SpinningMutex = tbb::spin_mutex; -- using BlockingMutex = tbb::mutex; -+ using BlockingMutex = std::mutex; - - template - static IteratorOnly loop_(const tbb::blocked_range &range, Fn &&fn) -diff --git a/src/libslic3r/SLA/SupportTree.cpp b/src/libslic3r/SLA/SupportTree.cpp -index e09735fdc5..e934843eec 100644 ---- a/src/libslic3r/SLA/SupportTree.cpp -+++ b/src/libslic3r/SLA/SupportTree.cpp -@@ -16,9 +16,6 @@ - #include - #include - #include --#include --#include --#include - #include - - //! macro used to mark string used at localization, -diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp -index a24bdf8aa7..d5a1f84217 100644 ---- a/src/libslic3r/SLAPrint.cpp -+++ b/src/libslic3r/SLAPrint.cpp -@@ -19,8 +19,6 @@ - #include - #endif - --//#include //#include "tbb/mutex.h" -- - #include "I18N.hpp" - - //! macro used to mark string used at localization, -@@ -118,7 +116,7 @@ bool validate_pad(const TriangleMesh &pad, const sla::PadConfig &pcfg) - - void SLAPrint::clear() - { -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - // The following call should stop background processing if it is running. - this->invalidate_all_steps(); - for (SLAPrintObject *object : m_objects) -@@ -212,7 +210,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, DynamicPrintConfig con - update_apply_status(false); - - // Grab the lock for the Print / PrintObject milestones. -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - - // The following call may stop the background processing. - bool invalidate_all_model_objects = false; -@@ -514,7 +512,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, DynamicPrintConfig con - void SLAPrint::set_task(const TaskParams ¶ms) - { - // Grab the lock for the Print / PrintObject milestones. -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - - int n_object_steps = int(params.to_object_step) + 1; - if (n_object_steps == 0) -@@ -897,7 +895,7 @@ bool SLAPrint::is_step_done(SLAPrintObjectStep step) const - { - if (m_objects.empty()) - return false; -- tbb::mutex::scoped_lock lock(this->state_mutex()); -+ std::scoped_lock lock(this->state_mutex()); - for (const SLAPrintObject *object : m_objects) - if (! object->is_step_done_unguarded(step)) - return false; -diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp -index 71f734cd35..4160e3fedb 100644 ---- a/src/libslic3r/SupportMaterial.cpp -+++ b/src/libslic3r/SupportMaterial.cpp -@@ -13,7 +13,6 @@ - #include - - #include --#include - #include - #include - -diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp -index bd44bc4f56..15a5928cc3 100644 ---- a/src/libslic3r/Thread.cpp -+++ b/src/libslic3r/Thread.cpp -@@ -9,10 +9,10 @@ - #include - #include - #include -+#include -+#include - #include --#include - #include --#include - - #include "Thread.hpp" - -@@ -207,12 +207,12 @@ void name_tbb_thread_pool_threads() - #endif - - if (nthreads != nthreads_hw) -- new tbb::task_scheduler_init(int(nthreads)); -+ tbb::global_control(tbb::global_control::max_allowed_parallelism, nthreads); - - std::atomic nthreads_running(0); - std::condition_variable cv; - std::mutex cv_m; -- auto master_thread_id = tbb::this_tbb_thread::get_id(); -+ auto master_thread_id = std::this_thread::get_id(); - auto now = std::chrono::system_clock::now(); - tbb::parallel_for( - tbb::blocked_range(0, nthreads, 1), -@@ -228,7 +228,7 @@ void name_tbb_thread_pool_threads() - // here can be deadlock with the main that creates me. - cv.wait_until(lk, now + std::chrono::milliseconds(50), [&nthreads_running, nthreads]{return nthreads_running == nthreads;}); - } -- auto thread_id = tbb::this_tbb_thread::get_id(); -+ auto thread_id = std::this_thread::get_id(); - if (thread_id == master_thread_id) { - // The calling thread runs the 0'th task. - //assert(range.begin() == 0); -diff --git a/src/libslic3r/pchheader.hpp b/src/libslic3r/pchheader.hpp -index 0135fd7120..98c55bf379 100644 ---- a/src/libslic3r/pchheader.hpp -+++ b/src/libslic3r/pchheader.hpp -@@ -93,12 +93,9 @@ - #include - #include - --#include - #include - #include --#include - #include --#include - - #include - #include -diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp -index ef77f22632..1f1add2003 100644 ---- a/src/libslic3r/utils.cpp -+++ b/src/libslic3r/utils.cpp -@@ -43,7 +43,7 @@ - #include - #include - --#include -+#include - - #if defined(__linux__) || defined(__GNUC__ ) - #include -@@ -118,9 +118,7 @@ void trace(unsigned int level, const char *message) - void disable_multi_threading() - { - // Disable parallelization so the Shiny profiler works -- static tbb::task_scheduler_init *tbb_init = nullptr; -- if (tbb_init == nullptr) -- tbb_init = new tbb::task_scheduler_init(1); -+ tbb::global_control(tbb::global_control::max_allowed_parallelism, 1); - } - - static std::string g_var_dir; -diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp -index 638e5f39b8..fd3f6d948b 100644 ---- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp -+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp -@@ -519,7 +519,7 @@ void BackgroundSlicingProcess::schedule_export(const std::string &path, bool exp - return; - - // Guard against entering the export step before changing the export path. -- tbb::mutex::scoped_lock lock(m_print->state_mutex()); -+ std::scoped_lock lock(m_print->state_mutex()); - this->invalidate_step(bspsGCodeFinalize); - m_export_path = path; - m_export_path_on_removable_media = export_path_on_removable_media; -@@ -532,7 +532,7 @@ void BackgroundSlicingProcess::schedule_upload(Slic3r::PrintHostJob upload_job) - return; - - // Guard against entering the export step before changing the export path. -- tbb::mutex::scoped_lock lock(m_print->state_mutex()); -+ std::scoped_lock lock(m_print->state_mutex()); - this->invalidate_step(bspsGCodeFinalize); - m_export_path.clear(); - m_upload_job = std::move(upload_job); -@@ -552,7 +552,7 @@ void BackgroundSlicingProcess::reset_export() - m_export_path.clear(); - m_export_path_on_removable_media = false; - // invalidate_step expects the mutex to be locked. -- tbb::mutex::scoped_lock lock(m_print->state_mutex()); -+ std::scoped_lock lock(m_print->state_mutex()); - this->invalidate_step(bspsGCodeFinalize); - } - } -diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp -index 814ed33f73..95c5e462fe 100644 ---- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp -+++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp -@@ -230,7 +230,7 @@ class BackgroundSlicingProcess - std::shared_ptr m_ui_task; - - PrintState m_step_state; -- mutable tbb::mutex m_step_state_mutex; -+ mutable std::mutex m_step_state_mutex; - bool set_step_started(BackgroundSlicingProcessStep step); - void set_step_done(BackgroundSlicingProcessStep step); - bool is_step_done(BackgroundSlicingProcessStep step) const; -diff --git a/src/slic3r/GUI/InstanceCheck.hpp b/src/slic3r/GUI/InstanceCheck.hpp -index 9fb74b0a94..23a75edc59 100644 ---- a/src/slic3r/GUI/InstanceCheck.hpp -+++ b/src/slic3r/GUI/InstanceCheck.hpp -@@ -13,7 +13,7 @@ - - #if __linux__ - #include --#include -+#include - #include - #endif // __linux__ - -diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp -index 692ae7f1ba..5413451949 100644 ---- a/src/slic3r/GUI/Mouse3DController.cpp -+++ b/src/slic3r/GUI/Mouse3DController.cpp -@@ -66,7 +66,7 @@ void update_maximum(std::atomic& maximum_value, T const& value) noexcept - - void Mouse3DController::State::append_translation(const Vec3d& translation, size_t input_queue_max_size) - { -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -+ std::scoped_lock lock(m_input_queue_mutex); - while (m_input_queue.size() >= input_queue_max_size) - m_input_queue.pop_front(); - m_input_queue.emplace_back(QueueItem::translation(translation)); -@@ -77,7 +77,7 @@ void Mouse3DController::State::append_translation(const Vec3d& translation, size - - void Mouse3DController::State::append_rotation(const Vec3f& rotation, size_t input_queue_max_size) - { -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -+ std::scoped_lock lock(m_input_queue_mutex); - while (m_input_queue.size() >= input_queue_max_size) - m_input_queue.pop_front(); - m_input_queue.emplace_back(QueueItem::rotation(rotation.cast())); -@@ -92,7 +92,7 @@ void Mouse3DController::State::append_rotation(const Vec3f& rotation, size_t inp - - void Mouse3DController::State::append_button(unsigned int id, size_t /* input_queue_max_size */) - { -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -+ std::scoped_lock lock(m_input_queue_mutex); - m_input_queue.emplace_back(QueueItem::buttons(id)); - #if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT - update_maximum(input_queue_max_size_achieved, m_input_queue.size()); -@@ -277,7 +277,7 @@ void Mouse3DController::device_attached(const std::string &device) - #if ENABLE_CTRL_M_ON_WINDOWS - m_device_str = format_device_string(vid, pid); - if (auto it_params = m_params_by_device.find(m_device_str); it_params != m_params_by_device.end()) { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - m_params = m_params_ui = it_params->second; - } - else -@@ -295,7 +295,7 @@ void Mouse3DController::device_detached(const std::string& device) - int pid = 0; - if (sscanf(device.c_str(), "\\\\?\\HID#VID_%x&PID_%x&", &vid, &pid) == 2) { - if (std::find(_3DCONNEXION_VENDORS.begin(), _3DCONNEXION_VENDORS.end(), vid) != _3DCONNEXION_VENDORS.end()) { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - m_params_by_device[format_device_string(vid, pid)] = m_params_ui; - } - } -@@ -307,12 +307,12 @@ void Mouse3DController::device_detached(const std::string& device) - // Filter out mouse scroll events produced by the 3DConnexion driver. - bool Mouse3DController::State::process_mouse_wheel() - { -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -- if (m_mouse_wheel_counter == 0) -- // No 3DConnexion rotation has been captured since the last mouse scroll event. -+ std::scoped_lock lock(m_input_queue_mutex); -+ if (m_mouse_wheel_counter == 0) -+ // No 3DConnexion rotation has been captured since the last mouse scroll event. - return false; - if (std::find_if(m_input_queue.begin(), m_input_queue.end(), [](const QueueItem &item){ return item.is_rotation(); }) != m_input_queue.end()) { -- // There is a rotation stored in the queue. Suppress one mouse scroll event. -+ // There is a rotation stored in the queue. Suppress one mouse scroll event. - -- m_mouse_wheel_counter; - return true; - } -@@ -329,7 +329,7 @@ bool Mouse3DController::State::apply(const Mouse3DController::Params ¶ms, Ca - std::deque input_queue; - { - // Atomically move m_input_queue to input_queue. -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -+ std::scoped_lock lock(m_input_queue_mutex); - input_queue = std::move(m_input_queue); - m_input_queue.clear(); - } -@@ -418,7 +418,7 @@ bool Mouse3DController::apply(Camera& camera) - #if ENABLE_CTRL_M_ON_WINDOWS - #ifdef _WIN32 - { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - if (m_params_ui_changed) { - m_params = m_params_ui; - m_params_ui_changed = false; -@@ -447,7 +447,7 @@ void Mouse3DController::render_settings_dialog(GLCanvas3D& canvas) const - Params params_copy; - bool params_changed = false; - { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - params_copy = m_params_ui; - } - -@@ -565,7 +565,7 @@ void Mouse3DController::render_settings_dialog(GLCanvas3D& canvas) const - - if (params_changed) { - // Synchronize front end parameters to back end. -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - auto pthis = const_cast(this); - #if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT - if (params_copy.input_queue_max_size != params_copy.input_queue_max_size) -@@ -586,7 +586,7 @@ void Mouse3DController::connected(std::string device_name) - m_device_str = device_name; - // Copy the parameters for m_device_str into the current parameters. - if (auto it_params = m_params_by_device.find(m_device_str); it_params != m_params_by_device.end()) { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - m_params = m_params_ui = it_params->second; - } - m_connected = true; -@@ -597,7 +597,7 @@ void Mouse3DController::disconnected() - // Copy the current parameters for m_device_str into the parameter database. - assert(m_connected == ! m_device_str.empty()); - if (m_connected) { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - m_params_by_device[m_device_str] = m_params_ui; - m_device_str.clear(); - m_connected = false; -@@ -621,7 +621,7 @@ bool Mouse3DController::handle_input(const DataPacketAxis& packet) - { - // Synchronize parameters between the UI thread and the background thread. - //FIXME is this necessary on OSX? Are these notifications triggered from the main thread or from a worker thread? -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - if (m_params_ui_changed) { - m_params = m_params_ui; - m_params_ui_changed = false; -@@ -733,7 +733,7 @@ void Mouse3DController::run() - - for (;;) { - { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - if (m_stop) - break; - if (m_params_ui_changed) { -@@ -998,7 +998,7 @@ bool Mouse3DController::connect_device() - #endif // ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT - // Copy the parameters for m_device_str into the current parameters. - if (auto it_params = m_params_by_device.find(m_device_str); it_params != m_params_by_device.end()) { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - m_params = m_params_ui = it_params->second; - } - } -@@ -1023,7 +1023,7 @@ void Mouse3DController::disconnect_device() - BOOST_LOG_TRIVIAL(info) << "Disconnected device: " << m_device_str; - // Copy the current parameters for m_device_str into the parameter database. - { -- tbb::mutex::scoped_lock lock(m_params_ui_mutex); -+ std::scoped_lock lock(m_params_ui_mutex); - m_params_by_device[m_device_str] = m_params_ui; - } - m_device_str.clear(); -diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp -index af131992ce..f648efa6e6 100644 ---- a/src/slic3r/GUI/Mouse3DController.hpp -+++ b/src/slic3r/GUI/Mouse3DController.hpp -@@ -10,12 +10,12 @@ - - #include - #include -+#include - #include - #include - #include - #include - --#include - - namespace Slic3r { - -@@ -85,7 +85,7 @@ class Mouse3DController - // m_input_queue is accessed by the background thread and by the UI thread. Access to m_input_queue - // is guarded with m_input_queue_mutex. - std::deque m_input_queue; -- mutable tbb::mutex m_input_queue_mutex; -+ mutable std::mutex m_input_queue_mutex; - - #ifdef WIN32 - // When the 3Dconnexion driver is running the system gets, by default, mouse wheel events when rotations around the X axis are detected. -@@ -112,12 +112,12 @@ class Mouse3DController - - #if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT - Vec3d get_first_vector_of_type(unsigned int type) const { -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -+ std::scoped_lock lock(m_input_queue_mutex); - auto it = std::find_if(m_input_queue.begin(), m_input_queue.end(), [type](const QueueItem& item) { return item.type_or_buttons == type; }); - return (it == m_input_queue.end()) ? Vec3d::Zero() : it->vector; - } - size_t input_queue_size_current() const { -- tbb::mutex::scoped_lock lock(m_input_queue_mutex); -+ std::scoped_lock lock(m_input_queue_mutex); - return m_input_queue.size(); - } - std::atomic input_queue_max_size_achieved; -@@ -133,7 +133,7 @@ class Mouse3DController - // UI thread will read / write this copy. - Params m_params_ui; - bool m_params_ui_changed { false }; -- mutable tbb::mutex m_params_ui_mutex; -+ mutable std::mutex m_params_ui_mutex; - - // This is a database of parametes of all 3DConnexion devices ever connected. - // This database is loaded from AppConfig on application start and it is stored to AppConfig on application exit. -diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp -index 59a202beb7..8de684e2ef 100644 ---- a/src/slic3r/GUI/RemovableDriveManager.cpp -+++ b/src/slic3r/GUI/RemovableDriveManager.cpp -@@ -84,7 +84,7 @@ void RemovableDriveManager::eject_drive() - this->update(); - #endif // REMOVABLE_DRIVE_MANAGER_OS_CALLBACKS - BOOST_LOG_TRIVIAL(info) << "Ejecting started"; -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - auto it_drive_data = this->find_last_save_path_drive_data(); - if (it_drive_data != m_current_drives.end()) { - // get handle to device -@@ -130,7 +130,7 @@ std::string RemovableDriveManager::get_removable_drive_path(const std::string &p - this->update(); - #endif // REMOVABLE_DRIVE_MANAGER_OS_CALLBACKS - -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - if (m_current_drives.empty()) - return std::string(); - std::size_t found = path.find_last_of("\\"); -@@ -146,7 +146,7 @@ std::string RemovableDriveManager::get_removable_drive_path(const std::string &p - - std::string RemovableDriveManager::get_removable_drive_from_path(const std::string& path) - { -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - std::size_t found = path.find_last_of("\\"); - std::string new_path = path.substr(0, found); - int letter = PathGetDriveNumberW(boost::nowide::widen(new_path).c_str()); -@@ -285,7 +285,7 @@ void RemovableDriveManager::eject_drive() - - DriveData drive_data; - { -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - auto it_drive_data = this->find_last_save_path_drive_data(); - if (it_drive_data == m_current_drives.end()) - return; -@@ -341,7 +341,7 @@ void RemovableDriveManager::eject_drive() - if (success) { - // Remove the drive_data from m_current drives, searching by value, not by pointer, as m_current_drives may get modified during - // asynchronous execution on m_eject_thread. -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - auto it = std::find(m_current_drives.begin(), m_current_drives.end(), drive_data); - if (it != m_current_drives.end()) - m_current_drives.erase(it); -@@ -361,7 +361,7 @@ std::string RemovableDriveManager::get_removable_drive_path(const std::string &p - std::size_t found = path.find_last_of("/"); - std::string new_path = found == path.size() - 1 ? path.substr(0, found) : path; - -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - for (const DriveData &data : m_current_drives) - if (search_for_drives_internal::compare_filesystem_id(new_path, data.path)) - return path; -@@ -377,7 +377,7 @@ std::string RemovableDriveManager::get_removable_drive_from_path(const std::stri - new_path = new_path.substr(0, found); - - // check if same filesystem -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - for (const DriveData &drive_data : m_current_drives) - if (search_for_drives_internal::compare_filesystem_id(new_path, drive_data.path)) - return drive_data.path; -@@ -452,7 +452,7 @@ RemovableDriveManager::RemovableDrivesStatus RemovableDriveManager::status() - - RemovableDriveManager::RemovableDrivesStatus out; - { -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - out.has_eject = - // Cannot control eject on Chromium. - platform_flavor() != PlatformFlavor::LinuxOnChromium && -@@ -468,17 +468,17 @@ RemovableDriveManager::RemovableDrivesStatus RemovableDriveManager::status() - // Update is called from thread_proc() and from most of the public methods on demand. - void RemovableDriveManager::update() - { -- tbb::mutex::scoped_lock inside_update_lock; -+ std::unique_lock inside_update_lock(m_inside_update_mutex, std::defer_lock); - #ifdef _WIN32 - // All wake up calls up to now are now consumed when the drive enumeration starts. - m_wakeup = false; - #endif // _WIN32 -- if (inside_update_lock.try_acquire(m_inside_update_mutex)) { -+ if (inside_update_lock.try_lock()) { - // Got the lock without waiting. That means, the update was not running. - // Run the update. - std::vector current_drives = this->search_for_removable_drives(); - // Post update events. -- tbb::mutex::scoped_lock lock(m_drives_mutex); -+ std::scoped_lock lock(m_drives_mutex); - std::sort(current_drives.begin(), current_drives.end()); - if (current_drives != m_current_drives) { - assert(m_callback_evt_handler); -@@ -489,7 +489,7 @@ void RemovableDriveManager::update() - } else { - // Acquiring the m_iniside_update lock failed, therefore another update is running. - // Just block until the other instance of update() finishes. -- inside_update_lock.acquire(m_inside_update_mutex); -+ inside_update_lock.lock(); - } - } - -diff --git a/src/slic3r/GUI/RemovableDriveManager.hpp b/src/slic3r/GUI/RemovableDriveManager.hpp -index f707b40c32..29363647c8 100644 ---- a/src/slic3r/GUI/RemovableDriveManager.hpp -+++ b/src/slic3r/GUI/RemovableDriveManager.hpp -@@ -5,7 +5,7 @@ - #include - - #include --#include -+#include - #include - - // Custom wxWidget events -@@ -111,9 +111,9 @@ class RemovableDriveManager - // m_current_drives is guarded by m_drives_mutex - // sorted ascending by path - std::vector m_current_drives; -- mutable tbb::mutex m_drives_mutex; -+ mutable std::mutex m_drives_mutex; - // Locking the update() function to avoid that the function is executed multiple times. -- mutable tbb::mutex m_inside_update_mutex; -+ mutable std::mutex m_inside_update_mutex; - - // Returns drive path (same as path in DriveData) if exists otherwise empty string. - std::string get_removable_drive_from_path(const std::string& path);