tkurbad/tkurbad-overlay
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Non functioning superslicer / orcaslicer WIP

Browse Source
This commit is contained in:
Torsten Kurbad
2024-06-26 12:53:25 +02:00
parent 499c5ad6fa
commit 7cfa23e0e8
21 changed files with 1243 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media-gfx/superslicer/files/superslicer-2.5.59.12-additional-imports-fixes.patch
+111
View File
@@ -0,0 +1,111 @@
diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp
index e4e16d263..629fd6e0b 100644
--- a/src/libslic3r/Extruder.hpp
+++ b/src/libslic3r/Extruder.hpp
@@ -3,6 +3,7 @@
#include "libslic3r.h"
#include "Point.hpp"
+#include <optional>
namespace Slic3r {
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 10cae794d..c82969e20 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -20,6 +20,7 @@
#include <wx/tglbtn.h>
#endif
#include <wx/tokenzr.h>
+#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/log/trivial.hpp>
#include "OG_CustomCtrl.hpp"
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index ab6039ff0..be01e890a 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -8,6 +8,7 @@
#include <wx/notebook.h>
#include <wx/scrolwin.h>
+#include <wx/display.h>
#include "Notebook.hpp"
#include "ButtonsDescription.hpp"
#include "OG_CustomCtrl.hpp"
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index a6c7b580e..1e1566f37 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -29,6 +29,7 @@
#include <wx/settings.h>
#include <wx/filedlg.h>
+#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp
index 782c58741..08dfba661 100644
--- a/src/libslic3r/ObjectID.hpp
+++ b/src/libslic3r/ObjectID.hpp
@@ -2,6 +2,7 @@
#define slic3r_ObjectID_hpp_
#include <cereal/access.hpp>
+#include <cereal/types/base_class.hpp>
namespace Slic3r {
diff --git a/src/libslic3r/Format/BBConfig.hpp b/src/libslic3r/Format/BBConfig.hpp
index a4b27675c..8d821bed5 100644
--- a/src/libslic3r/Format/BBConfig.hpp
+++ b/src/libslic3r/Format/BBConfig.hpp
@@ -2,6 +2,13 @@
#define slic3r_Format_BBconfig_hpp_
#include "miniz_extension.hpp"
+#include <fstream>
+#include <map>
+#include "libslic3r/Config.hpp"
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ini_parser.hpp>
#ifdef __APPLE__
#include <boost/filesystem.hpp>
diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp
index 8a39d92c5..68e8c9254 100644
--- a/src/libslic3r/GCode/FanMover.cpp
+++ b/src/libslic3r/GCode/FanMover.cpp
@@ -13,9 +13,8 @@
#include "../PrintConfig.hpp"
#include "../Utils.hpp"
#include "Print.hpp"
-
-#include <boost/log/trivial.hpp>
*/
+#include <boost/log/trivial.hpp>
namespace Slic3r {
diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp
index f1570b7a4..777f1d722 100644
--- a/src/libslic3r/Format/bbs_3mf.cpp
+++ b/src/libslic3r/Format/bbs_3mf.cpp
@@ -43,11 +43,13 @@
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/xml_parser.hpp>
#include <boost/foreach.hpp>
+#include <boost/thread/mutex.hpp>
//#include <openssl/md5.h>
namespace pt = boost::property_tree;
#include <tbb/parallel_reduce.h>
+#include <tbb/parallel_for.h>
#include <expat.h>
#include <Eigen/Dense>
media-gfx/superslicer/files/superslicer-2.5.59.12-boost-replace-load-string-file.patch
+43
View File
@@ -0,0 +1,43 @@
diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp
index f32e44204..272af5ec3 100644
--- a/src/slic3r/GUI/ScriptExecutor.cpp
+++ b/src/slic3r/GUI/ScriptExecutor.cpp
@@ -5,8 +5,11 @@
#include "libslic3r/PresetBundle.hpp"
#include "libslic3r/Print.hpp"
+#include <fstream>
#include <string>
+#include <boost/filesystem.hpp>
+
#include <angelscript/source/as_config.h>
#include <angelscript/add_on/autowrapper/aswrappedcall.h>
#include <angelscript/add_on/scriptarray/scriptarray.h>
@@ -616,6 +619,17 @@ bool as_is_enabled(std::string &key)
return f->is_enabled();
}
+inline
+void load_string_file(const boost::filesystem::path& p, std::string& str)
+{
+ std::ifstream file;
+ file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+ file.open(p, std::ios_base::binary);
+ std::size_t sz = static_cast<std::size_t>(boost::filesystem::file_size(p));
+ str.resize(sz, '\0');
+ file.read(&str[0], sz);
+}
+
//function to reset a field
void as_back_initial_value(std::string& key) {
current_script->add_to_reset(key);
@@ -745,7 +759,7 @@ void ScriptContainer::init(const std::string& tab_key, Tab* tab)
//res = builder.AddSectionFromFile(ui_script_file.string().c_str()); //seems to be problematic on cyrillic locale
{
std::string all_file;
- boost::filesystem::load_string_file(ui_script_file, all_file);
+ load_string_file(ui_script_file, all_file);
res = builder.AddSectionFromMemory(ui_script_file.string().c_str(), all_file.c_str(), (unsigned int)(all_file.length()), 0);
}
if (res < 0) throw CompileErrorException("Error, can't build the script for tab " + tab_key);
media-gfx/superslicer/files/superslicer-2.5.59.12-boost.patch
+302
View File
@@ -0,0 +1,302 @@
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/hints/HintsToPot.cpp SuperSlicer-2.5.59.12/src/hints/HintsToPot.cpp
--- SuperSlicer-2.5.59.12.orig/src/hints/HintsToPot.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/hints/HintsToPot.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -9,7 +9,7 @@
bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
{
- boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
+ boost::nowide::ofstream file(path.string(), std::ios_base::app);
for (const auto& element : data)
{
//Example of .pot element
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.cpp SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -1,5 +1,6 @@
#include "AppConfig.hpp"
+#include <boost/filesystem.hpp>
#include "libslic3r.h"
#include "format.hpp"
#include "Exception.hpp"
@@ -15,6 +16,7 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/directory.hpp>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
#include <boost/format/format_fwd.hpp>
#include <boost/locale.hpp>
#include <boost/log/trivial.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.hpp SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/AppConfig.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/AppConfig.hpp 2024-06-20 19:29:16.076450396 +0200
@@ -5,6 +5,7 @@
#include <map>
#include <string>
+#include <boost/filesystem/path.hpp>
#include <boost/algorithm/string/trim_all.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/LocalesUtils.cpp SuperSlicer-2.5.59.12/src/libslic3r/LocalesUtils.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/LocalesUtils.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/LocalesUtils.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -1,3 +1,4 @@
+#include <boost/lexical_cast.hpp>
#include "LocalesUtils.hpp"
#ifdef _WIN32
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/Preset.cpp SuperSlicer-2.5.59.12/src/libslic3r/Preset.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/Preset.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/Preset.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -84,7 +84,7 @@
VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
{
ptree tree;
- boost::filesystem::ifstream ifs(path);
+ boost::nowide::ifstream ifs(path.string());
boost::property_tree::read_ini(ifs, tree);
return VendorProfile::from_ini(tree, path, load_all);
}
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/Utils.hpp SuperSlicer-2.5.59.12/src/libslic3r/Utils.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/Utils.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/Utils.hpp 2024-06-20 19:29:16.076450396 +0200
@@ -7,6 +7,7 @@
#include <type_traits>
#include <system_error>
+#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -18,6 +18,11 @@
#include <wx/notebook.h>
#include "Notebook.hpp"
+#include <boost/filesystem.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ini_parser.hpp>
+#include <boost/log/trivial.hpp>
+
#include "MainFrame.hpp"
#include "wxExtensions.hpp"
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/DesktopIntegrationDialog.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/DesktopIntegrationDialog.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/DesktopIntegrationDialog.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/DesktopIntegrationDialog.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -14,6 +14,7 @@
#include <boost/log/trivial.hpp>
#include <boost/dll/runtime_symbol_info.hpp>
#include <boost/algorithm/string/replace.hpp>
+#include <boost/nowide/fstream.hpp>
#include <wx/filename.h>
#include <wx/stattext.h>
@@ -503,4 +504,4 @@
} // namespace GUI
} // namespace Slic3r
-#endif // __linux__
\ Kein Zeilenumbruch am Dateiende.
+#endif // __linux__
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/FreeCADDialog.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/FreeCADDialog.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/FreeCADDialog.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/FreeCADDialog.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -38,6 +38,7 @@
#include <boost/log/trivial.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
+#include <boost/nowide/fstream.hpp>
// hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int'
// and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash
@@ -322,7 +323,7 @@
try {
std::locale loc = boost::locale::generator()("en_US.UTF-8");
// Open the stream to 'lock' the file.
- boost::filesystem::ifstream in;
+ boost::nowide::ifstream in;
in.imbue(loc);
in.open(path);
// Obtain the size of the file.
@@ -369,7 +370,7 @@
boost::filesystem::create_directories(file.parent_path());
std::locale loc = boost::locale::generator()("en_US.UTF-8");
// Open the stream to 'lock' the file.
- boost::filesystem::ofstream out;
+ boost::nowide::ofstream out;
out.imbue(loc);
out.open(file);
out << towrite;
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/GUI_App.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/GUI_App.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/GUI_App.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/GUI_App.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -19,6 +19,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/convert.hpp>
+#include <boost/nowide/fstream.hpp>
#include <wx/stdpaths.h>
#include <wx/imagpng.h>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/HintNotification.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/HintNotification.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/HintNotification.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/HintNotification.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -14,12 +14,14 @@
#include "libslic3r/Config.hpp"
#include "libslic3r/PrintConfig.hpp"
+#include <map>
+
#include <boost/algorithm/string/replace.hpp>
#include <boost/filesystem.hpp>
#include <boost/nowide/fstream.hpp>
#include <boost/log/trivial.hpp>
#include <boost/property_tree/ini_parser.hpp>
-#include <map>
+
#include <cereal/archives/binary.hpp>
#include <cereal/types/string.hpp>
#include <cereal/types/vector.hpp>
@@ -65,7 +67,7 @@
void write_used_binary(const std::vector<std::string>& ids)
{
- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
cereal::BinaryOutputArchive archive(file);
HintsCerealData cd { ids };
try
@@ -84,7 +86,7 @@
BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
return;
}
- boost::filesystem::ifstream file(path);
+ boost::nowide::ifstream file(path.string());
cereal::BinaryInputArchive archive(file);
HintsCerealData cd;
try
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Preferences.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/Preferences.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Preferences.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/Preferences.cpp 2024-06-20 19:29:16.076450396 +0200
@@ -12,6 +12,7 @@
#include "wxExtensions.hpp"
#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/PrintHostDialogs.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/PrintHostDialogs.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/PrintHostDialogs.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/PrintHostDialogs.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -81,8 +81,8 @@
if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos)
m_valid_suffix = recent_path.substr(extension_start);
// .gcode suffix control
- auto validate_path = [this](const wxString &path) -> bool {
- if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
+ auto validate_path = [this](const std::wstring &path) -> bool {
+ if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) {
MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
if (msg_wingow.ShowModal() == wxID_NO)
return false;
@@ -92,7 +92,7 @@
auto* btn_ok = add_button(wxID_OK, true, _L("Upload"));
btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
- if (validate_path(txt_filename->GetValue())) {
+ if (validate_path(txt_filename->GetValue().ToStdWstring())) {
post_upload_action = PrintHostPostUploadAction::None;
EndDialog(wxID_OK);
}
@@ -102,7 +102,7 @@
if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
- if (validate_path(txt_filename->GetValue())) {
+ if (validate_path(txt_filename->GetValue().ToStdWstring())) {
post_upload_action = PrintHostPostUploadAction::StartPrint;
EndDialog(wxID_OK);
}
@@ -113,7 +113,7 @@
// Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here.
auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate"));
btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
- if (validate_path(txt_filename->GetValue())) {
+ if (validate_path(txt_filename->GetValue().ToStdWstring())) {
post_upload_action = PrintHostPostUploadAction::StartSimulation;
EndDialog(wxID_OK);
}
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/RemovableDriveManager.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/RemovableDriveManager.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/RemovableDriveManager.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/RemovableDriveManager.cpp 2024-06-20 19:31:37.636759560 +0200
@@ -22,7 +22,7 @@
#include <pwd.h>
#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem.hpp>
#include <boost/process.hpp>
#endif
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/ScriptExecutor.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/ScriptExecutor.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/ScriptExecutor.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/ScriptExecutor.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -2,6 +2,12 @@
#include "libslic3r/PresetBundle.hpp"
#include "libslic3r/Print.hpp"
+#include <boost/log/trivial.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/trim_all.hpp>
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/filesystem.hpp>
#include "GUI_App.hpp"
#include "Plater.hpp"
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Tab.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/Tab.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/Tab.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/Tab.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -38,6 +38,7 @@
#include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/nowide/fstream.hpp>
#include <boost/log/trivial.hpp>
#include <wx/app.h>
@@ -1775,7 +1776,7 @@
//read file
//std::ifstream filestream(ui_layout_file.c_str());
- boost::filesystem::ifstream filestream(ui_layout_file);
+ boost::nowide::ifstream filestream(ui_layout_file);
std::string full_line;
while (std::getline(filestream, full_line)) {
//remove spaces
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/Utils/Http.cpp SuperSlicer-2.5.59.12/src/slic3r/Utils/Http.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/Utils/Http.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/Utils/Http.cpp 2024-06-20 19:29:16.079783739 +0200
@@ -11,6 +11,7 @@
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
#include <boost/log/trivial.hpp>
+#include <boost/nowide/fstream.hpp>
#include <curl/curl.h>
@@ -52,7 +53,7 @@
% error;
})
.on_complete([&](std::string body, unsigned /* http_status */) {
- boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
+ boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
file.write(body.c_str(), body.size());
file.close();
boost::filesystem::rename(tmp_path, target_path);
media-gfx/superslicer/files/superslicer-2.5.59.12-cereal.patch
+53
View File
@@ -0,0 +1,53 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18f26ba..c0a1f1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -468,6 +468,9 @@ endif ()
# Find the Cereal serialization library
find_package(cereal REQUIRED)
+if (NOT TARGET cereal::cereal)
+ add_library(cereal::cereal ALIAS cereal)
+endif ()
# l10n
set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b2defe..f63aaad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,7 +141,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 cereal::cereal)
if (APPLE)
# add_compile_options(-stdlib=libc++)
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 0ab5584..36917f3 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -416,7 +416,7 @@ find_package(JPEG REQUIRED)
target_link_libraries(libslic3r
libnest2d
admesh
- cereal
+ cereal::cereal
libigl
miniz
boost_libs
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index c11f860..4ca2523 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>: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 cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
if (MSVC)
target_link_libraries(libslic3r_gui Setupapi.lib)
media-gfx/superslicer/files/superslicer-2.5.59.12-dont-install-angelscript.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f63aaad..ba2fe01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ if (SLIC3R_GUI)
include_directories(hidapi/include)
add_subdirectory(exif)
include_directories(exif/include)
- add_subdirectory(angelscript)
+ add_subdirectory(angelscript EXCLUDE_FROM_ALL)
# include_directories(angelscript/include)
if(WIN32)
media-gfx/superslicer/files/superslicer-2.5.59.12-fix-compilation-error-gnu17.patch
+20
View File
@@ -0,0 +1,20 @@
# https://github.com/prusa3d/PrusaSlicer/commit/4aa7366fafb7a3f91cc68d4a808f5195a4aa3dcf
diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index d76bf468c7f..22232573953 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -152,12 +152,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh)
const auto &vertices = cgalmesh.vertices();
int vsize = int(vertices.size());
- for (auto &vi : vertices) {
+ for (const auto &vi : vertices) {
auto &v = cgalmesh.point(vi); // Don't ask...
its.vertices.emplace_back(to_vec3f(v));
}
- for (auto &face : faces) {
+ for (const auto &face : faces) {
auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
int i = 0;
media-gfx/superslicer/files/superslicer-2.5.59.12-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
+82
View File
@@ -0,0 +1,82 @@
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 68ec2ce..cd828a6 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2081,31 +2081,30 @@ void GCode::process_layers(
}
});
const auto spiral_vase = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
- [&spiral_vase = *this->m_spiral_vase](LayerResult in) -> LayerResult {
+ [spiral_vase = this->m_spiral_vase.get()](LayerResult in) -> LayerResult {
if (in.nop_layer_result)
return in;
CNumericLocalesSetter locales_setter;
- spiral_vase.enable(in.spiral_vase_enable);
- return LayerResult{ spiral_vase.process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
+ spiral_vase->enable(in.spiral_vase_enable);
+ return { spiral_vase->process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
});
const auto pressure_equalizer = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
- [&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) -> LayerResult {
- return pressure_equalizer.process_layer(std::move(in));
+ [pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult in) -> LayerResult {
+ return pressure_equalizer->process_layer(std::move(in));
});
const auto cooling = tbb::make_filter<LayerResult, std::string>(slic3r_tbb_filtermode::serial_in_order,
- [&cooling_buffer = *this->m_cooling_buffer](LayerResult in) -> std::string {
+ [cooling_buffer = this->m_cooling_buffer.get()](LayerResult in)->std::string {
if (in.nop_layer_result)
return in.gcode;
CNumericLocalesSetter locales_setter;
- return cooling_buffer.process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
+ return cooling_buffer->process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
});
const auto find_replace = tbb::make_filter<std::string, std::string>(slic3r_tbb_filtermode::serial_in_order,
- [&self = *this->m_find_replace](std::string s) -> std::string {
- CNumericLocalesSetter locales_setter;
- return self.process_layer(std::move(s));
- });
+ [find_replace = this->m_find_replace.get()](std::string s) -> std::string {
+ return find_replace->process_layer(std::move(s));
+});
const auto output = tbb::make_filter<std::string, void>(slic3r_tbb_filtermode::serial_in_order,
[&output_stream](std::string s) {
CNumericLocalesSetter locales_setter;
@@ -2183,25 +2182,26 @@ void GCode::process_layers(
}
});
const auto spiral_vase = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
- [&spiral_vase = *this->m_spiral_vase](LayerResult in)->LayerResult {
+ [spiral_vase = this->m_spiral_vase.get()](LayerResult in) -> LayerResult {
if (in.nop_layer_result)
return in;
- spiral_vase.enable(in.spiral_vase_enable);
- return { spiral_vase.process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
+ spiral_vase->enable(in.spiral_vase_enable);
+ return { spiral_vase->process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
});
const auto pressure_equalizer = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
- [&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) -> LayerResult {
- return pressure_equalizer.process_layer(std::move(in));
+ [pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult in) -> LayerResult {
+ return pressure_equalizer->process_layer(std::move(in));
});
const auto cooling = tbb::make_filter<LayerResult, std::string>(slic3r_tbb_filtermode::serial_in_order,
- [&cooling_buffer = *this->m_cooling_buffer](LayerResult in)->std::string {
+ [cooling_buffer = this->m_cooling_buffer.get()](LayerResult in) -> std::string {
if (in.nop_layer_result)
return in.gcode;
- return cooling_buffer.process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
+ return cooling_buffer->process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
+
});
const auto find_replace = tbb::make_filter<std::string, std::string>(slic3r_tbb_filtermode::serial_in_order,
- [&self = *this->m_find_replace](std::string s) -> std::string {
- return self.process_layer(std::move(s));
+ [find_replace = this->m_find_replace.get()](std::string s) -> std::string {
+ return find_replace->process_layer(std::move(s));
});
const auto output = tbb::make_filter<std::string, void>(slic3r_tbb_filtermode::serial_in_order,
[&output_stream](std::string s) {
media-gfx/superslicer/files/superslicer-2.5.59.12-gcodeviewer-symlink-fix.patch
+11
View File
@@ -0,0 +1,11 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba2fe01..b84292b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -300,5 +300,5 @@ else ()
install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
# Install the symlink for gcodeviewer
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
endif ()
media-gfx/superslicer/files/superslicer-2.5.59.12-libnest2d-link-xcb.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/src/libnest2d/CMakeLists.txt b/src/libnest2d/CMakeLists.txt
index c18dc31cb..852d26d5e 100644
--- a/src/libnest2d/CMakeLists.txt
+++ b/src/libnest2d/CMakeLists.txt
@@ -24,5 +24,6 @@ set(LIBNEST2D_SRCFILES
add_library(libnest2d STATIC ${LIBNEST2D_SRCFILES})
target_include_directories(libnest2d PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
-target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost libslic3r)
+target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost
+ libslic3r xcb)
target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r)
media-gfx/superslicer/files/superslicer-2.5.59.12-link-occtwrapper-statically.patch
+93
View File
@@ -0,0 +1,93 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b84292b..63fea9c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,7 @@ add_subdirectory(libnest2d)
add_subdirectory(libslic3r)
if (SLIC3R_ENABLE_FORMAT_STEP)
- add_subdirectory(occt_wrapper)
+ add_subdirectory(occt_wrapper EXCLUDE_FROM_ALL)
endif ()
if (SLIC3R_GUI)
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 36917f3..63c4201 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -435,10 +435,7 @@ target_link_libraries(libslic3r
qoi
)
-if (APPLE)
- # TODO: we need to fix notarization with the separate shared library
- target_link_libraries(libslic3r OCCTWrapper)
-endif ()
+target_link_libraries(libslic3r OCCTWrapper)
if (TARGET OpenVDB::openvdb)
target_link_libraries(libslic3r OpenVDB::openvdb)
diff --git a/src/libslic3r/Format/STEP.cpp b/src/libslic3r/Format/STEP.cpp
index 5165bb7..3ed0154 100644
--- a/src/libslic3r/Format/STEP.cpp
+++ b/src/libslic3r/Format/STEP.cpp
@@ -22,17 +22,13 @@
namespace Slic3r {
-#if __APPLE__
extern "C" bool load_step_internal(const char *path, OCCTResult* res);
-#endif
LoadStepFn get_load_step_fn()
{
static LoadStepFn load_step_fn = nullptr;
-#ifndef __APPLE__
constexpr const char* fn_name = "load_step_internal";
-#endif
if (!load_step_fn) {
auto libpath = boost::dll::program_location().parent_path();
@@ -54,22 +50,8 @@ LoadStepFn get_load_step_fn()
FreeLibrary(module);
throw;
}
-#elif __APPLE__
- load_step_fn = &load_step_internal;
#else
- libpath /= "OCCTWrapper.so";
- void *plugin_ptr = dlopen(libpath.c_str(), RTLD_NOW | RTLD_GLOBAL);
-
- if (plugin_ptr) {
- load_step_fn = reinterpret_cast<LoadStepFn>(dlsym(plugin_ptr, fn_name));
- if (!load_step_fn) {
- dlclose(plugin_ptr);
- throw Slic3r::RuntimeError(std::string("Cannot load function from OCCTWrapper.so: ") + fn_name
- + "\n\n" + dlerror());
- }
- } else {
- throw Slic3r::RuntimeError(std::string("Cannot load OCCTWrapper.so:\n\n") + dlerror());
- }
+ load_step_fn = &load_step_internal;
#endif
}
diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
index 16de4e0..ad983be 100644
--- a/src/occt_wrapper/CMakeLists.txt
+++ b/src/occt_wrapper/CMakeLists.txt
@@ -1,12 +1,7 @@
cmake_minimum_required(VERSION 3.13)
project(OCCTWrapper)
-if (APPLE)
- # TODO: we need to fix notarization with the separate shared library
- add_library(OCCTWrapper STATIC OCCTWrapper.cpp)
-else ()
- add_library(OCCTWrapper MODULE OCCTWrapper.cpp)
-endif ()
+add_library(OCCTWrapper STATIC OCCTWrapper.cpp)
set_target_properties(OCCTWrapper
PROPERTIES
media-gfx/superslicer/files/superslicer-2.5.59.12-missing-includes-fix.patch
+90
View File
@@ -0,0 +1,90 @@
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/CustomGCode.hpp SuperSlicer-2.5.59.12/src/libslic3r/CustomGCode.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/CustomGCode.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/CustomGCode.hpp 2024-06-19 12:34:19.590033501 +0200
@@ -3,6 +3,7 @@
#include <string>
#include <vector>
+#include <cstdint>
namespace Slic3r {
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/ExtrusionEntity.hpp SuperSlicer-2.5.59.12/src/libslic3r/ExtrusionEntity.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/ExtrusionEntity.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/ExtrusionEntity.hpp 2024-06-19 12:34:19.590033501 +0200
@@ -9,6 +9,8 @@
#include <string_view>
#include <numeric>
+#include "Config.hpp"
+
namespace Slic3r {
class ExPolygonCollection;
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/Geometry/ArcFitter.cpp SuperSlicer-2.5.59.12/src/libslic3r/Geometry/ArcFitter.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/Geometry/ArcFitter.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/Geometry/ArcFitter.cpp 2024-06-19 12:34:19.590033501 +0200
@@ -3,6 +3,7 @@
#include <cmath>
#include <cassert>
+#include "Polyline.hpp"
namespace Slic3r { namespace Geometry {
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/PerimeterGenerator.hpp SuperSlicer-2.5.59.12/src/libslic3r/PerimeterGenerator.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/PerimeterGenerator.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/PerimeterGenerator.hpp 2024-06-19 12:34:19.593366846 +0200
@@ -1,6 +1,7 @@
#ifndef slic3r_PerimeterGenerator_hpp_
#define slic3r_PerimeterGenerator_hpp_
+#include "ClipperUtils.hpp"
#include "libslic3r.h"
#include <vector>
#include "ExPolygonCollection.hpp"
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/PNGReadWrite.hpp SuperSlicer-2.5.59.12/src/libslic3r/PNGReadWrite.hpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/PNGReadWrite.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/PNGReadWrite.hpp 2024-06-19 12:34:19.590033501 +0200
@@ -2,6 +2,7 @@
#define PNGREAD_HPP
#include <vector>
+#include <cstdint>
#include <string>
#include <istream>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/libslic3r/Print.cpp SuperSlicer-2.5.59.12/src/libslic3r/Print.cpp
--- SuperSlicer-2.5.59.12.orig/src/libslic3r/Print.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/libslic3r/Print.cpp 2024-06-19 12:34:19.593366846 +0200
@@ -18,6 +18,8 @@
#include "Utils.hpp"
#include "BuildVolume.hpp"
+#include <tbb/tbb.h>
+
#include <float.h>
#include <algorithm>
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/BitmapCache.hpp SuperSlicer-2.5.59.12/src/slic3r/GUI/BitmapCache.hpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/BitmapCache.hpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/BitmapCache.hpp 2024-06-19 12:34:19.593366846 +0200
@@ -3,6 +3,7 @@
#include <map>
#include <vector>
+#include <cstdint>
#include <wx/wxprec.h>
#ifndef WX_PRECOMP
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp SuperSlicer-2.5.59.12/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
--- SuperSlicer-2.5.59.12.orig/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/slic3r/GUI/CreateMMUTiledCanvas.cpp 2024-06-19 12:34:19.593366846 +0200
@@ -36,6 +36,7 @@
#include <wx/rawbmp.h>
#include <wx/textctrl.h>
#include <wx/wrapsizer.h>
+#include <wx/rawbmp.h>
#include "wxExtensions.hpp"
#include <boost/filesystem/operations.hpp>
media-gfx/superslicer/files/superslicer-2.5.59.12-openexr3.patch
+77
View File
@@ -0,0 +1,77 @@
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
index 4fde5fa..566e73a 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()
media-gfx/superslicer/files/superslicer-2.5.59.12-relax-OpenCASCADE-dep.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
index ed75531..16de4e0 100644
--- a/src/occt_wrapper/CMakeLists.txt
+++ b/src/occt_wrapper/CMakeLists.txt
@@ -19,7 +19,7 @@ include(GenerateExportHeader)
generate_export_header(OCCTWrapper)
-find_package(OpenCASCADE 7.6.2 REQUIRED)
+find_package(OpenCASCADE REQUIRED)
set(OCCT_LIBS
TKXDESTEP
media-gfx/superslicer/files/superslicer-2.5.59.12-wxgtk3-wayland-fix.patch
+21
View File
@@ -0,0 +1,21 @@
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index ccd3cc0..be8bbe5 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -33,6 +33,16 @@ class AppConfig;
namespace GUI {
+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
+#ifdef __WXGTK3__
+struct ForceX11 {
+ ForceX11() {
+ setenv("GDK_BACKEND", "x11", 1);
+ }
+};
+static struct ForceX11 forcex11;
+#endif
+
#if __APPLE__
IOPMAssertionID assertionID;
#endif