From 82046e02df66d4a130ea1b955c04bf1d04dd3150 Mon Sep 17 00:00:00 2001 From: Gabriel Féron Date: Jul 08 2019 11:29:19 +0000 Subject: Update to 4.1.0 Signed-off-by: Gabriel Féron --- diff --git a/.gitignore b/.gitignore index 5e870a9..3c3d653 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,2 @@ -/13.06.3.tar.gz -/13.11.2.tar.gz -/14.01.tar.gz -/14.03.tar.gz -/14.12.1.tar.gz -/15.04.tar.gz -/CuraEngine-2.5.0.tar.gz -/CuraEngine-2.6.0.tar.gz -/CuraEngine-2.6.1.tar.gz -/CuraEngine-2.7.0.tar.gz -/CuraEngine-3.0.3.tar.gz -/CuraEngine-3.1.0.tar.gz -/CuraEngine-3.2.1.tar.gz -/CuraEngine-3.3.0.tar.gz -/CuraEngine-3.4.1.tar.gz +/CuraEngine-*.tar.gz /e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz -/CuraEngine-3.5.1.tar.gz -/CuraEngine-3.6.0.tar.gz -/CuraEngine-4.0.0.tar.gz diff --git a/CuraEngine-gcc9.patch b/CuraEngine-gcc9.patch index 67f704f..9a7fb63 100644 --- a/CuraEngine-gcc9.patch +++ b/CuraEngine-gcc9.patch @@ -1,36 +1,48 @@ +From 9fd93712220aa2754e077bf89f165c7a9b795abd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= +Date: Tue, 18 Jun 2019 22:58:47 +0200 +Subject: [PATCH] [PATCH 3/3] GCC 9 patches + +--- + src/layerPart.cpp | 2 +- + src/support.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + diff --git a/src/layerPart.cpp b/src/layerPart.cpp -index 80370fed..616c831d 100644 +index ba3e7157..6cf0919a 100644 --- a/src/layerPart.cpp +++ b/src/layerPart.cpp -@@ -49,7 +49,7 @@ void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer) +@@ -52,7 +52,7 @@ void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer) { 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++) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_nr = 0; layer_nr < static_cast(total_layers); layer_nr++) { - SliceLayer& layer_storage = mesh.layers[layer_nr]; diff --git a/src/support.cpp b/src/support.cpp -index dc39a8fe..13c69862 100644 +index 9bd531a6..bb7a741d 100644 --- a/src/support.cpp +++ b/src/support.cpp -@@ -860,7 +860,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S +@@ -875,7 +875,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S constexpr bool no_prime_tower = false; xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, no_support, no_prime_tower).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, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) schedule(dynamic) - for (size_t layer_idx = 1; layer_idx < layer_count; layer_idx++) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_idx = 1; layer_idx < static_cast(layer_count); layer_idx++) { - Polygons outlines = storage.getLayerOutlines(layer_idx, no_support, no_prime_tower); -@@ -1056,7 +1056,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S - 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); +@@ -1070,7 +1070,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S + const int max_checking_layer_idx = std::max(0, + std::min(static_cast(storage.support.supportLayers.size()), + static_cast(layer_count - (layer_z_distance_top - 1)))); -#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) -+#pragma omp parallel for default(none) shared(support_areas, storage, max_checking_idx_size_t, layer_z_distance_top) schedule(dynamic) - for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++) ++#pragma omp parallel for default(none) shared(support_areas, storage, max_checking_layer_idx, layer_z_distance_top) schedule(dynamic) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_idx = 0; layer_idx < max_checking_layer_idx; layer_idx++) { - constexpr bool no_support = false; +-- +2.21.0 diff --git a/CuraEngine-static-libstdcpp.patch b/CuraEngine-static-libstdcpp.patch index 219f11e..664d76f 100644 --- a/CuraEngine-static-libstdcpp.patch +++ b/CuraEngine-static-libstdcpp.patch @@ -1,24 +1,27 @@ -From d79be0eb0e0e27e70b709b043b4085cda007beed Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Wed, 3 May 2017 14:02:04 +0200 -Subject: [PATCH 2/3] Don't use -static-libstdc++ +From 4b9f0fed275eca87525142ed2911c7072f6a5f80 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= +Date: Tue, 18 Jun 2019 22:54:59 +0200 +Subject: [PATCH] [PATCH 2/3] Don't use -static-libstdc++ --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2907bd..4b45997 100644 +index 99d234ec..ae9c3ece 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -47,10 +47,6 @@ if (ENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -Ofast -funroll-loops") +@@ -101,10 +101,6 @@ if (ENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS AND NOT (CMAKE_BUILD_TYPE_UPPER MATC + endif() endif () -if(NOT APPLE AND NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++") -endif() - - option (ENABLE_OPENMP - "Use OpenMP for parallel code" ON) - + if (WIN32) + add_definitions(-DNOMINMAX) + endif() +-- +2.21.0 + diff --git a/CuraEngine.spec b/CuraEngine.spec index c766746..ed98156 100644 --- a/CuraEngine.spec +++ b/CuraEngine.spec @@ -1,6 +1,6 @@ Name: CuraEngine Epoch: 1 -Version: 4.0.0 +Version: 4.1.0 Release: 1%{?dist} Summary: Engine for processing 3D models into G-code instructions for 3D printers License: AGPLv3+ @@ -64,6 +64,9 @@ make install DESTDIR=%{buildroot} %{_bindir}/%{name} %changelog +* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 +- Update to 4.1.0 + * Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 - Update to 4.0.0 diff --git a/sources b/sources index 0b79428..276c0d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (CuraEngine-4.0.0.tar.gz) = 478dc2554abea24baeec18e2b2d65a790dd6d31a3b11c87d839a9e928679f40bab9703e86e473bba36f72355485d66bf63515692ac75bceae5881e6537f48c46 +SHA512 (CuraEngine-4.1.0.tar.gz) = 49a3d3943c0767ceba2b94d061e11f43a428401941032cb1cbc578acf95495ba2db48307a9e28056f5a641be7ba581b53264a3d32abbbeeb00b978c8203ca79f SHA512 (e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz) = 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b