forked from pool/cura-engine
Accepting request 737381 from science
version update OBS-URL: https://build.opensuse.org/request/show/737381 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cura-engine?expand=0&rev=6
This commit is contained in:
commit
9530992aea
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0517ca25cf3446a8dfc974698f69aa3fcb669abfa3654b9f36206ec7620fa44c
|
|
||||||
size 4433932
|
|
3
CuraEngine-4.3.0.obscpio
Normal file
3
CuraEngine-4.3.0.obscpio
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:57ad1020f6eb7eca26d54d9214b98e465596d74a9baeb14cc3a58840a81519d4
|
||||||
|
size 5309453
|
@ -1,31 +0,0 @@
|
|||||||
--- src/layerPart.cpp.orig 2019-06-13 09:15:37.518080499 +0200
|
|
||||||
+++ src/layerPart.cpp 2019-06-13 09:16:33.375602117 +0200
|
|
||||||
@@ -52,7 +52,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)
|
|
||||||
// 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<int>(total_layers); layer_nr++)
|
|
||||||
{
|
|
||||||
--- ./src/support.cpp.orig 2019-06-13 09:15:37.518080499 +0200
|
|
||||||
+++ ./src/support.cpp 2019-06-13 09:18:54.823456474 +0200
|
|
||||||
@@ -868,7 +868,7 @@
|
|
||||||
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)
|
|
||||||
// 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<int>(layer_count); layer_idx++)
|
|
||||||
{
|
|
||||||
@@ -1065,7 +1065,7 @@
|
|
||||||
const int max_checking_layer_idx = std::max(0,
|
|
||||||
std::min(static_cast<int>(storage.support.supportLayers.size()),
|
|
||||||
static_cast<int>(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_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++)
|
|
||||||
{
|
|
@ -1,5 +1,5 @@
|
|||||||
name: CuraEngine
|
name: CuraEngine
|
||||||
version: 4.1.0
|
version: 4.3.0
|
||||||
mtime: 1558453724
|
mtime: 1568115634
|
||||||
commit: 354efa4a4507e46993021e5b5a690a5a3139d5ba
|
commit: 673ce81c5bab7231644e4fe96fb51cc7b9cf9a8e
|
||||||
|
|
||||||
|
4
_service
4
_service
@ -2,8 +2,8 @@
|
|||||||
<service name="obs_scm" mode="disabled">
|
<service name="obs_scm" mode="disabled">
|
||||||
<param name="url">https://github.com/Ultimaker/CuraEngine.git</param>
|
<param name="url">https://github.com/Ultimaker/CuraEngine.git</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="revision">4.1.0</param>
|
<param name="revision">4.3.0</param>
|
||||||
<param name="version">4.1.0</param>
|
<param name="version">4.3.0</param>
|
||||||
</service>
|
</service>
|
||||||
<service mode="disabled" name="set_version" />
|
<service mode="disabled" name="set_version" />
|
||||||
|
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 27 06:27:13 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
- update to version 4.3.0
|
||||||
|
Release notes:
|
||||||
|
* https://github.com/Ultimaker/Cura/releases/tag/4.3.0
|
||||||
|
- obsoletes CuraEngine-gcc9.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 12 06:46:19 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
- update to version 4.2.0
|
||||||
|
* https://ultimaker.com/en/blog/52912-ultimaker-cura-42-first-choice-for-3d-printing-professionals-worldwide
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jun 13 06:53:55 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
Thu Jun 13 06:53:55 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: cura-engine
|
Name: cura-engine
|
||||||
Version: 4.1.0
|
Version: 4.3.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: 3D printer control software
|
Summary: 3D printer control software
|
||||||
License: AGPL-3.0-only
|
License: AGPL-3.0-only
|
||||||
@ -27,8 +27,6 @@ Source0: CuraEngine-%{version}.tar.xz
|
|||||||
Source1: CuraEngine.1
|
Source1: CuraEngine.1
|
||||||
# X-OPENSUSE-PATCH fix-build.patch follow openSUSE policies
|
# X-OPENSUSE-PATCH fix-build.patch follow openSUSE policies
|
||||||
Patch1: fix-build.patch
|
Patch1: fix-build.patch
|
||||||
# PATCH-FIX-OPENSUSE CuraEngine-gcc9.patch based on a patch from fedora, submitted upstream, but not merged yet
|
|
||||||
Patch2: CuraEngine-gcc9.patch
|
|
||||||
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise
|
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise
|
||||||
%if 0%{?suse_version} < 1500
|
%if 0%{?suse_version} < 1500
|
||||||
BuildRequires: gcc6-c++
|
BuildRequires: gcc6-c++
|
||||||
@ -52,7 +50,6 @@ It is part of the larger project called "Cura".
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n CuraEngine-%version
|
%setup -q -n CuraEngine-%version
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p0
|
|
||||||
# the test is hardcoding the version number
|
# the test is hardcoding the version number
|
||||||
sed -i -e 's,"master","%{version}",' tests/GCodeExportTest.cpp
|
sed -i -e 's,"master","%{version}",' tests/GCodeExportTest.cpp
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user