summaryrefslogtreecommitdiff
path: root/media-gfx/prusaslicer
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-01 17:41:24 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-01 17:41:24 +0000
commit5d5b0e27ed33330cca5636eb792368fbbf46774c (patch)
tree9df5f4721779bac4fe92c830c1c5d2786f274b88 /media-gfx/prusaslicer
parentfd1824e9b1fd180f410170bf2d02e1f098f53db9 (diff)
gentoo auto-resync : 01:03:2024 - 17:41:24
Diffstat (limited to 'media-gfx/prusaslicer')
-rw-r--r--media-gfx/prusaslicer/Manifest9
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch93
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch40
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch48
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch14
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch76
-rw-r--r--media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild89
-rw-r--r--media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild88
8 files changed, 0 insertions, 457 deletions
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 033e6a338c82..68b718ae9ed7 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,18 +1,9 @@
-AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3297 BLAKE2B 2353b6c84d0c9bba6c0858517ce5ca374c61d5727b585828c0ebb1dc24c6746b58539d7ca7e13863e269e6969edb7fc127e310c30607d0a2e19dc23a1ed89dc0 SHA512 1493e0547b0068b60af0a1bc376caa04a8fa2f482665b009386ca94013718a4f08088bd68514a146d9f67155d5b5a7a79a23d4374f127d19085fd02488ceeac8
-AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2509 BLAKE2B 6acf83743780b847fe3334213c227f33ec992e4fff8a873f42dcf26be8d008212928d01034b3fd9daf3873e0ef94943947d8adeadc4c426918f97493a008c0a1 SHA512 fef42120814bf5c45dd5bcd7dbad477cdd74ec62bea85335a67973072ae5e16e91e08530815a4bbb649c9ac418510e18b2cd4c136abcd1eacb0c2ca7a943871c
-AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6
-AUX prusaslicer-2.5.0_rc1-fix-tests.patch 363 BLAKE2B 49c2dd3da996148497ab09854421cadd5054d06d5d78c2fd973f274857817c4fa0da7dfdb5efed03125422c2cab432d0f946f0f84929e08756ca3180bebd6709 SHA512 952958b687bf1b0d454ed921799d283b08fe56acaccbd909c41269243839cd5c02b1aca594d1fa947aff73c853ef6dcfd52e938f4f39a54396ec32d2e9cb284b
-AUX prusaslicer-2.5.2-fix-slicing.patch 5038 BLAKE2B 5d732bd8585e8a70c4f04270092bccfdfd7fc9d95999f58b8b9ba0f7516b9fad273102702959ce964a138a8f575f008277f84ff28ff2de77835b360d8f3a435d SHA512 40e5f094c5f9904b970e404f57ef9658024df4c60ecd75d4e4e8d2bc586d6c81bdcad6254e2355137bd1ec78b711bfdd7d1cc8ac73c46ae43cb0f4131763b8b2
AUX prusaslicer-2.6.0-disable-noisy-asserts.patch 503 BLAKE2B 11624effbd6082bb04d6cad3a5f06c047dd267e8157607da9e29c1010632c17595515bc7958db0828392104f1c98e4571cca836d416277f66b703fd7606e7ede SHA512 9607f8819d886b777a7ff4ad4d3e4bf2c6cda51cc00660ce91c6750e6f74096f286685df92757af097098872624d07a064a9fbfea416df5b13a4f2df733083ef
AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 535 BLAKE2B 216255701f709b115089c26c6b2dc00a5b55875d18ca1b84f0f62cf9a95ca5b07825867022558f78afe7497bbd90cca4735bffda1380e0798050c893aad0da52 SHA512 3a0fb2cf23a8de2465b1a457b4069c69b2aa105bd42a20a35dd801d59a9b9654ed331a26df9525a56ba43bca5052fde418ea937ed7416025b68b9ca13f79f877
AUX prusaslicer-2.6.0-libexpat-double-definition-fix.patch 839 BLAKE2B 699b323d52bf8307e9dec433be337c6688815519a169bb27e3841a94ef364a50fc33cb115def6c715dc4eec5e9e9f44c10f4393c568251e9b4b4b6b28d56d6a8 SHA512 1835cb47b5a85b0af7bd565ae080d81bd844ff5976a960d9f1ee13d16cdc6ebe9eb95658f39ee6a8885474ac9cb140b088eba7e9559293b3b6fcb27ffc8ffdbf
-DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8 SHA512 7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2
-DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b SHA512 c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c
DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9 SHA512 2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f SHA512 20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8 SHA512 74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db
-EBUILD prusaslicer-2.5.2-r1.ebuild 2030 BLAKE2B 3e6010909c0091d12fb99915c524e9da1fb8a81925fec81e43f2a53eb59167d3cf398b0612025ce71b1b845fa8b986b9a1c580796aea67872e64e22df1751735 SHA512 defbdc0a6f2a1bb266ab8fbe8628b7e2376122926c49155448814e8fe447a2a15c59047551a8e7a6204184f369cc788addcb05aee2ae901d24a8cdc46ced42c3
-EBUILD prusaslicer-2.6.0-r1.ebuild 1973 BLAKE2B 45a9956388b41d8d4c42ee4702cc1f80abdb4075c82cf8504898d8d67f99f6f76753cb202b529472708f52566d5d4c6490869325708219f623795f0e947ce549 SHA512 7e0aed116a7e52781c1462dd805f843b487337189a03263249ee98d649a21ca28d6cf8962781e6fafbfb8f9c6de71dabfdc59effd91e078df92ec9901e22ee88
EBUILD prusaslicer-2.6.1.ebuild 1993 BLAKE2B 9aed21a5e7e62ff8cbfd4e13d3716e0067828f924226b00ab1355dbeb5e501fde123b81df3b8b458abdc339236bf62483d470dd55982a97bb4f792f24a8c9f6d SHA512 4c05f5af7f46e72c01b651e0c2ce075d3a842e9386d93c38076640ac1ad1997641b7996b41dae086de25f7aa83cf20310abfbed8c699103dc9855538392f08ed
EBUILD prusaslicer-2.7.1.ebuild 1960 BLAKE2B aed93e9eb315299f6d63903380a095ede25d66868cbd26fec5abe9a5604f333f84a0f8e920338160b8c330f6421195df26cf3296ea3f7dde92b7ca195cfd6b90 SHA512 62c17d874095cc1a5276cd15216911b7fb78cc5780066631c17e21d5984462efd41515b17a9bb7d2b91b9757ef7e60af0535a16c045eb0626217be0376b050d6
EBUILD prusaslicer-2.7.2.ebuild 1960 BLAKE2B aed93e9eb315299f6d63903380a095ede25d66868cbd26fec5abe9a5604f333f84a0f8e920338160b8c330f6421195df26cf3296ea3f7dde92b7ca195cfd6b90 SHA512 62c17d874095cc1a5276cd15216911b7fb78cc5780066631c17e21d5984462efd41515b17a9bb7d2b91b9757ef7e60af0535a16c045eb0626217be0376b050d6
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
deleted file mode 100644
index 9418707c1065..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -1,6 +1,7 @@
- #include <iostream>
- #include <vector>
- #include <string>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
-@@ -9,7 +10,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(std::move(path), std::ios_base::app);
- for (const auto& element : data)
- {
- //Example of .pot element
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -25,6 +25,7 @@
- #include <stdexcept>
- #include <unordered_map>
- #include <boost/format.hpp>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/fstream.hpp>
- #include <boost/algorithm/string.hpp>
-@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
- VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
- {
- ptree tree;
-- boost::filesystem::ifstream ifs(path);
-+ boost::nowide::ifstream ifs(path);
- boost::property_tree::read_ini(ifs, tree);
- return VendorProfile::from_ini(tree, path, load_all);
- }
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
-
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
-
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -13,6 +13,7 @@
- #include <cstdlib>
- #include <regex>
- #include <string_view>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string.hpp>
- #include <boost/format.hpp>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -15,6 +15,7 @@
- #include "libslic3r/PrintConfig.hpp"
-
- #include <boost/algorithm/string/replace.hpp>
-+#include <boost/nowide/fstream.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
-@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
-
- 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"), std::ios::binary);
- cereal::BinaryOutputArchive archive(file);
- HintsCerealData cd { ids };
- try
-@@ -84,7 +85,7 @@ void read_used_binary(std::vector<std::string>& ids)
- 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);
- cereal::BinaryInputArchive archive(file);
- HintsCerealData cd;
- try
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
deleted file mode 100644
index becab0a88355..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
-@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
- 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;
-@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog
-
- 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);
- }
-@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog
- 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);
- }
-@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog
- // 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 --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
deleted file mode 100644
index 056c6150a7b0..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -127,7 +127,7 @@
- set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
-
--target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r libcereal)
-
- if (APPLE)
- # add_compile_options(-stdlib=libc++)
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@
-
- encoding_check(libslic3r_gui)
-
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-
- if (MSVC)
- target_link_libraries(libslic3r_gui Setupapi.lib)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -395,7 +395,7 @@
- target_link_libraries(libslic3r
- libnest2d
- admesh
-- cereal
-+ libcereal
- libigl
- miniz
- boost_libs
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -446,6 +446,12 @@
-
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+add_library(libcereal INTERFACE)
-+if (NOT TARGET cereal::cereal)
-+ target_link_libraries(libcereal INTERFACE cereal)
-+else()
-+ target_link_libraries(libcereal INTERFACE cereal::cereal)
-+endif()
-
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch
deleted file mode 100644
index c86c585926ab..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -4,10 +4,9 @@
- #include "libslic3r/GCodeReader.hpp"
- #include "libslic3r/Config.hpp"
- #include "libslic3r/Print.hpp"
--#include "libslic3r/Format/OBJ.hpp"
--#include "libslic3r/Format/STL.hpp"
-
- #include <cstdlib>
-+#include <fstream>
- #include <string>
-
- #include <boost/nowide/cstdio.hpp>
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch
deleted file mode 100644
index ae85057f10bd..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
-index f8fc2e5a7..c74ee32dd 100644
---- a/src/libslic3r/GCode.cpp
-+++ b/src/libslic3r/GCode.cpp
-@@ -1551,27 +1551,27 @@ 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) { output_stream.write(s); }
-@@ -1633,25 +1633,25 @@ 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) { output_stream.write(s); }
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
deleted file mode 100644
index 6c02da88bcab..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="$(ver_rs 3 -)"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-cpp/tbb:=
- dev-libs/boost:=[nls]
- dev-libs/cereal
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/gmp:=
- dev-libs/mpfr:=
- media-gfx/openvdb:=
- net-misc/curl[adns]
- media-libs/glew:0=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- media-libs/qhull:=
- sci-libs/libigl
- sci-libs/nlopt
- sci-libs/opencascade:=
- sci-mathematics/cgal:=
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/opengl
- x11-libs/gtk+:3
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
- media-libs/qhull[static-libs]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
- "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
- "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
- "${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch"
- "${FILESDIR}/${PN}-2.5.2-fix-slicing.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
-src_prepare() {
- sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
-
- sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
- src/occt_wrapper/CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE="Release"
-
- setup-wxwidgets
-
- local mycmakeargs=(
- -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
- -DSLIC3R_BUILD_TESTS=$(usex test)
- -DSLIC3R_FHS=ON
- -DSLIC3R_GTK=3
- -DSLIC3R_GUI=ON
- -DSLIC3R_PCH=OFF
- -DSLIC3R_STATIC=OFF
- -DSLIC3R_WX_STABLE=ON
- -Wno-dev
- )
-
- cmake_src_configure
-}
diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
deleted file mode 100644
index 92abbdc12468..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="$(ver_rs 3 -)"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-cpp/tbb:=
- dev-libs/boost:=[nls]
- dev-libs/cereal
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/gmp:=
- dev-libs/mpfr:=
- media-gfx/openvdb:=
- net-misc/curl[adns]
- media-libs/glew:0=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- media-libs/qhull:=
- sci-libs/libigl
- sci-libs/nlopt
- sci-libs/opencascade:=
- sci-mathematics/cgal:=
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/opengl
- x11-libs/gtk+:3
- >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
- media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
- media-libs/qhull[static-libs]
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-libexpat-double-definition-fix.patch"
- "${FILESDIR}/${P}-disable-noisy-asserts.patch"
- "${FILESDIR}/${P}-dont-force-link-to-wayland-and-x11.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
-src_prepare() {
- sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
-
- sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
- src/occt_wrapper/CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE="Release"
-
- setup-wxwidgets
-
- local mycmakeargs=(
- -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
- -DSLIC3R_BUILD_TESTS=$(usex test)
- -DSLIC3R_FHS=ON
- -DSLIC3R_GTK=3
- -DSLIC3R_GUI=ON
- -DSLIC3R_PCH=OFF
- -DSLIC3R_STATIC=OFF
- -DSLIC3R_WX_STABLE=ON
- -Wno-dev
- )
-
- cmake_src_configure
-}