cad/PrusaSlicer: Update to 2.3.3

- Update to 2.3.3
- Change the dependency from devel/tbb to devel/onetbb

ChangeLog: https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.3.3

PR:		258483
Submitted by:   Steve Wills <swills@FreeBSD.org>
Reported by:	teodorsigaev@gmail.com (tested), eborisch+FreeBSD@gmail.com (tested)

1 files changed, 47 insertions, 0 deletions

diff --git a/cad/PrusaSlicer/files/patch-src_libslic3r_SLAPrint.cpp b/cad/PrusaSlicer/files/patch-src_libslic3r_SLAPrint.cpp
new file mode 100644
index 000000000000..0b9990bc2b1e
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_libslic3r_SLAPrint.cpp
@@ -0,0 +1,47 @@
+--- src/libslic3r/SLAPrint.cpp.orig	2021-07-16 10:14:03 UTC
++++ src/libslic3r/SLAPrint.cpp
+@@ -19,8 +19,6 @@
+ #include <libnest2d/tools/benchmark.h>
+ #endif
+ 
+-//#include <tbb/spin_mutex.h>//#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::
+ 
+ void SLAPrint::clear()
+ {
+-    tbb::mutex::scoped_lock lock(this->state_mutex());
++    std::scoped_lock<std::mutex> 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 &mod
+         update_apply_status(false);
+ 
+     // Grab the lock for the Print / PrintObject milestones.
+-    tbb::mutex::scoped_lock lock(this->state_mutex());
++    std::scoped_lock<std::mutex> 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 &mod
+ void SLAPrint::set_task(const TaskParams &params)
+ {
+     // Grab the lock for the Print / PrintObject milestones.
+-    tbb::mutex::scoped_lock lock(this->state_mutex());
++    std::scoped_lock<std::mutex> lock(this->state_mutex());
+ 
+     int n_object_steps = int(params.to_object_step) + 1;
+     if (n_object_steps == 0)
+@@ -884,7 +882,7 @@ bool SLAPrint::is_step_done(SLAPrintObjectStep step) c
+ {
+     if (m_objects.empty())
+         return false;
+-    tbb::mutex::scoped_lock lock(this->state_mutex());
++    std::scoped_lock<std::mutex> lock(this->state_mutex());
+     for (const SLAPrintObject *object : m_objects)
+         if (! object->is_step_done_unguarded(step))
+             return false;