diff --git a/CuraEngine-3.6.5.obscpio b/CuraEngine-3.6.5.obscpio deleted file mode 100644 index d0ba369..0000000 --- a/CuraEngine-3.6.5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e3f87d423486a6bf72cf57688126d1915a4b5aceae5ed80fe7a841243059f8f -size 4335628 diff --git a/CuraEngine-3.6.9.obscpio b/CuraEngine-3.6.9.obscpio new file mode 100644 index 0000000..0a9849a --- /dev/null +++ b/CuraEngine-3.6.9.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:738d3ab03244f1b6ac31b4101a43e7fd83ffc6101c79713225a54dd77c75a3c4 +size 4337676 diff --git a/CuraEngine-gcc9.patch b/CuraEngine-gcc9.patch new file mode 100644 index 0000000..7d31b97 --- /dev/null +++ b/CuraEngine-gcc9.patch @@ -0,0 +1,31 @@ +--- src/layerPart.cpp.orig 2019-06-14 09:36:05.313574796 +0200 ++++ src/layerPart.cpp 2019-06-14 09:38:09.608954136 +0200 +@@ -49,7 +49,7 @@ + { + const auto total_layers = slicer->layers.size(); + assert(mesh.layers.size() == total_layers); +-#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic) ++#pragma omp parallel for default(none) shared(mesh, slicer, total_layers) schedule(dynamic) + for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++) + { + SliceLayer& layer_storage = mesh.layers[layer_nr]; +--- src/support.cpp.orig 2019-06-14 09:36:05.317574905 +0200 ++++ src/support.cpp 2019-06-14 09:45:31.129002024 +0200 +@@ -854,7 +854,7 @@ + const double tan_angle = tan(angle) - 0.01; // the XY-component of the supportAngle + xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, false).offset(xy_distance); + // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area +- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) ++ #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh, layer_count, xy_distance_overhang, xy_distance, tan_angle, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top) schedule(dynamic) + for (unsigned int layer_idx = 1; layer_idx < layer_count; layer_idx++) + { + Polygons outlines = storage.getLayerOutlines(layer_idx, false); +@@ -1054,7 +1054,7 @@ + const int max_checking_layer_idx = std::min(static_cast(storage.support.supportLayers.size()) + , static_cast(layer_count - (layer_z_distance_top - 1))); + const size_t max_checking_idx_size_t = std::max(0, max_checking_layer_idx); +-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) ++#pragma omp parallel for default(none) shared(support_areas, storage, layer_z_distance_top, max_checking_layer_idx, max_checking_idx_size_t) schedule(dynamic) + for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++) + { + support_areas[layer_idx] = support_areas[layer_idx].difference(storage.getLayerOutlines(layer_idx + layer_z_distance_top - 1, false)); diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index c84d49e..5cd8937 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.5 -mtime: 1543917478 -commit: 829ecb34609e34566405159554f5863d6940afd2 +version: 3.6.9 +mtime: 1557477977 +commit: 7f2188cb9926802483c745d21573cd130db260cf diff --git a/_service b/_service index 95cb608..7d3a33e 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.6.5 - 3.6.5 + v3.6.9 + 3.6.9 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 39fa323..85f4879 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Jun 14 07:57:43 UTC 2019 - Adrian Schröter + +- fix build with current libArcus +- fix build with gcc9 (CuraEngine-gcc9.patch) + +------------------------------------------------------------------- +Mon May 27 14:54:24 UTC 2019 - Adrian Schröter + +- update to version 3.6.9 + T7039: Fixed material first layer flow setting + +------------------------------------------------------------------- +Mon May 6 08:25:30 UTC 2019 - Adrian Schröter + +- update to version 3.6.8 + * no code changes + +------------------------------------------------------------------- +Wed May 1 11:18:03 UTC 2019 - Adrian Schröter + +- update to version 3.6.7 + * no code changes + +------------------------------------------------------------------- +Thu Apr 18 06:33:44 UTC 2019 - Adrian Schröter + +- update to version 3.6.6 + T6357: Changed extruder switch mechanics + T5146: fixed extruder slowing if time < min_layer_time + ------------------------------------------------------------------- Fri Apr 5 12:05:33 UTC 2019 - Adrian Schröter diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index 146d2c1..c5326a4 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.6.5 +Version: 3.6.9 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only @@ -26,7 +26,10 @@ Conflicts: cura-engine Url: https://code.alephobjects.com/diffusion/CTE/cura-engine.git Source0: CuraEngine-%{version}.tar.xz Source1: CuraEngine.1 +# X-OPENSUSE-PATCH fix-build.patch for new libArcus Patch1: fix-build.patch +# PATCH-FIX-OPENSUSE CuraEngine-gcc9.patch loose based on a patch from fedora +Patch2: CuraEngine-gcc9.patch %if 0%{?suse_version} < 1500 BuildRequires: gcc6-c++ #!BuildIgnore: libgcc_s1 @@ -48,6 +51,9 @@ This is the LulzBot variation of the engine. %prep %setup -q -n CuraEngine-%version %patch1 -p1 +%if 0%{?suse_version} > 1500 +%patch2 -p0 +%endif %build %if 0%{?suse_version} < 1500 diff --git a/fix-build.patch b/fix-build.patch index 941b52b..da1adbf 100644 --- a/fix-build.patch +++ b/fix-build.patch @@ -1,40 +1,18 @@ -diff --git a/tests/arcus/MockSocket.cpp b/tests/arcus/MockSocket.cpp -index 73cbb867..a72780e1 100644 ---- a/tests/arcus/MockSocket.cpp -+++ b/tests/arcus/MockSocket.cpp -@@ -20,7 +20,7 @@ void MockSocket::sendMessage(Arcus::MessagePtr message) - sent_messages.push_back(message); - } +--- ./src/communication/ArcusCommunication.cpp.orig 2019-06-14 09:55:36.709514543 +0200 ++++ ./src/communication/ArcusCommunication.cpp 2019-06-14 09:55:42.877682665 +0200 +@@ -481,7 +481,7 @@ --Arcus::MessagePtr MockSocket::takeNextMessage() -+Arcus::MessagePtr MockSocket::takeNextMessage(bool) + void ArcusCommunication::sliceNext() { - Arcus::MessagePtr result = received_messages.front(); - received_messages.pop_front(); -@@ -39,4 +39,4 @@ Arcus::MessagePtr MockSocket::popMessageFromSendQueue() - return result; - } +- const Arcus::MessagePtr message = private_data->socket->takeNextMessage(true); ++ const Arcus::MessagePtr message = private_data->socket->takeNextMessage(); --} //namespace cura -\ No newline at end of file -+} //namespace cura -diff --git a/tests/arcus/MockSocket.h b/tests/arcus/MockSocket.h -index 80370f49..f9e8050a 100644 ---- a/tests/arcus/MockSocket.h -+++ b/tests/arcus/MockSocket.h -@@ -27,7 +27,7 @@ public: - - //Catch these functions so that we can see whether they are called. - void sendMessage(Arcus::MessagePtr message) override; -- Arcus::MessagePtr takeNextMessage() override; -+ Arcus::MessagePtr takeNextMessage(bool) override; - - //Helpers to store the sent and received messages. - void pushMessageToReceivedQueue(Arcus::MessagePtr message); -@@ -38,4 +38,4 @@ public: + //Handle the main Slice message. + const cura::proto::Slice* slice_message = dynamic_cast(message.get()); //See if the message is of the message type Slice. Returns nullptr otherwise. +@@ -535,4 +535,4 @@ } //namespace cura --#endif //MOCKSOCKET_H -\ No newline at end of file -+#endif //MOCKSOCKET_H +-#endif //ARCUS +\ Kein Zeilenumbruch am Dateiende. ++#endif //ARCUS