From 79c8a222eeb91ce35d22a05df11a9682cb416b512b9ced6d6d147fbc3674c465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 18 Apr 2019 06:34:59 +0000 Subject: [PATCH 1/7] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=55 --- CuraEngine-3.6.5.obscpio | 3 --- CuraEngine-3.6.6.obscpio | 3 +++ CuraEngine.obsinfo | 6 +++--- _service | 4 ++-- cura-engine-lulzbot.changes | 7 +++++++ cura-engine-lulzbot.spec | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 CuraEngine-3.6.5.obscpio create mode 100644 CuraEngine-3.6.6.obscpio 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.6.obscpio b/CuraEngine-3.6.6.obscpio new file mode 100644 index 0000000..7dc5f1a --- /dev/null +++ b/CuraEngine-3.6.6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df8e38a823152e4360f7564604b90fba647a1cb856eb55ea20784f1876383d16 +size 4337164 diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index c84d49e..c74ac82 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.5 -mtime: 1543917478 -commit: 829ecb34609e34566405159554f5863d6940afd2 +version: 3.6.6 +mtime: 1554812612 +commit: b79e53d099920f2b0c45af0f7ba90d163d559178 diff --git a/_service b/_service index 95cb608..1011f21 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.6 + 3.6.6 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 39fa323..9081702 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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..f85f4b7 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.6 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From 8db6e5eadff8f2c7a99f2648b676568c0ca88c017d1be0dbf3f70bb8f08eebdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 1 May 2019 11:18:40 +0000 Subject: [PATCH 2/7] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=56 --- CuraEngine-3.6.6.obscpio | 3 --- CuraEngine-3.6.7.obscpio | 3 +++ CuraEngine.obsinfo | 2 +- _service | 4 ++-- cura-engine-lulzbot.changes | 6 ++++++ cura-engine-lulzbot.spec | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 CuraEngine-3.6.6.obscpio create mode 100644 CuraEngine-3.6.7.obscpio diff --git a/CuraEngine-3.6.6.obscpio b/CuraEngine-3.6.6.obscpio deleted file mode 100644 index 7dc5f1a..0000000 --- a/CuraEngine-3.6.6.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df8e38a823152e4360f7564604b90fba647a1cb856eb55ea20784f1876383d16 -size 4337164 diff --git a/CuraEngine-3.6.7.obscpio b/CuraEngine-3.6.7.obscpio new file mode 100644 index 0000000..bc5a267 --- /dev/null +++ b/CuraEngine-3.6.7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ead2c8e2eb08a8795678841e22343873f15204c33a91e80cd83dab0dc6e2fc56 +size 4337164 diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index c74ac82..14c6bcd 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.6 +version: 3.6.7 mtime: 1554812612 commit: b79e53d099920f2b0c45af0f7ba90d163d559178 diff --git a/_service b/_service index 1011f21..72dcfb6 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.6.6 - 3.6.6 + v3.6.7 + 3.6.7 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 9081702..ce7dd2d 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index f85f4b7..4f10c09 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.6.6 +Version: 3.6.7 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From 002d5b327c64285ede762642cc1e4bb284a47b2986bcb12ff3d4ef25a5baff95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 6 May 2019 08:26:08 +0000 Subject: [PATCH 3/7] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=57 --- CuraEngine-3.6.7.obscpio | 3 --- CuraEngine-3.6.8.obscpio | 3 +++ CuraEngine.obsinfo | 2 +- _service | 4 ++-- cura-engine-lulzbot.changes | 6 ++++++ cura-engine-lulzbot.spec | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 CuraEngine-3.6.7.obscpio create mode 100644 CuraEngine-3.6.8.obscpio diff --git a/CuraEngine-3.6.7.obscpio b/CuraEngine-3.6.7.obscpio deleted file mode 100644 index bc5a267..0000000 --- a/CuraEngine-3.6.7.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ead2c8e2eb08a8795678841e22343873f15204c33a91e80cd83dab0dc6e2fc56 -size 4337164 diff --git a/CuraEngine-3.6.8.obscpio b/CuraEngine-3.6.8.obscpio new file mode 100644 index 0000000..3774baf --- /dev/null +++ b/CuraEngine-3.6.8.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2242d1129eebcff603f0883aed2712dbd83898e70ff07de0d31b7092e5d8f0e8 +size 4337164 diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index 14c6bcd..655ead4 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.7 +version: 3.6.8 mtime: 1554812612 commit: b79e53d099920f2b0c45af0f7ba90d163d559178 diff --git a/_service b/_service index 72dcfb6..f79dadd 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.6.7 - 3.6.7 + v3.6.8 + 3.6.8 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index ce7dd2d..2b1be3e 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index 4f10c09..05f2cc7 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.6.7 +Version: 3.6.8 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From 2743f7914131f5988008f16e0f30500f1ad85c6943a47b76527a2392aebe9f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 May 2019 14:55:54 +0000 Subject: [PATCH 4/7] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=58 --- CuraEngine-3.6.8.obscpio | 3 --- CuraEngine-3.6.9.obscpio | 3 +++ CuraEngine.obsinfo | 6 +++--- _service | 4 ++-- cura-engine-lulzbot.changes | 6 ++++++ cura-engine-lulzbot.spec | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 CuraEngine-3.6.8.obscpio create mode 100644 CuraEngine-3.6.9.obscpio diff --git a/CuraEngine-3.6.8.obscpio b/CuraEngine-3.6.8.obscpio deleted file mode 100644 index 3774baf..0000000 --- a/CuraEngine-3.6.8.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2242d1129eebcff603f0883aed2712dbd83898e70ff07de0d31b7092e5d8f0e8 -size 4337164 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.obsinfo b/CuraEngine.obsinfo index 655ead4..5cd8937 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.8 -mtime: 1554812612 -commit: b79e53d099920f2b0c45af0f7ba90d163d559178 +version: 3.6.9 +mtime: 1557477977 +commit: 7f2188cb9926802483c745d21573cd130db260cf diff --git a/_service b/_service index f79dadd..7d3a33e 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.6.8 - 3.6.8 + v3.6.9 + 3.6.9 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 2b1be3e..2227e0e 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index 05f2cc7..cba7015 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.6.8 +Version: 3.6.9 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From 4a2d4af9e21567a2c28a237ce2b31496a688756992411a9a6ac39e7487b52bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 14 Jun 2019 07:58:58 +0000 Subject: [PATCH 5/7] fix build OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=59 --- CuraEngine-gcc9.patch | 31 +++++++++++++++++++++++++ cura-engine-lulzbot.changes | 6 +++++ cura-engine-lulzbot.spec | 4 ++++ fix-build.patch | 46 ++++++++++--------------------------- 4 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 CuraEngine-gcc9.patch 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/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 2227e0e..0237a48 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 14 07:57:43 UTC 2019 - Adrian Schröter + +- fix build with current libArcus +- fix build with gcc9 + ------------------------------------------------------------------- Mon May 27 14:54:24 UTC 2019 - Adrian Schröter diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index cba7015..f08f58e 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -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,7 @@ This is the LulzBot variation of the engine. %prep %setup -q -n CuraEngine-%version %patch1 -p1 +%patch2 -p0 %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 From 6cbed1ff6d156a8a9c4cac8cd0c203d99f0ba0d29c37e3f4770e2dd06fd6e2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 14 Jun 2019 08:09:30 +0000 Subject: [PATCH 6/7] and only gcc9 ... OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=60 --- cura-engine-lulzbot.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index f08f58e..c5326a4 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -51,7 +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 From b3e313d7d3056b5b6ddde103b749cc75effb505ddfd63e64a564d595307e8c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 17 Jun 2019 13:48:31 +0000 Subject: [PATCH 7/7] changes OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=61 --- cura-engine-lulzbot.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 0237a48..85f4879 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -2,7 +2,7 @@ Fri Jun 14 07:57:43 UTC 2019 - Adrian Schröter - fix build with current libArcus -- fix build with gcc9 +- fix build with gcc9 (CuraEngine-gcc9.patch) ------------------------------------------------------------------- Mon May 27 14:54:24 UTC 2019 - Adrian Schröter