Hello community, here is the log from the commit of package cura-engine for openSUSE:Factory checked in at 2019-06-26 16:04:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cura-engine (Old) and /work/SRC/openSUSE:Factory/.cura-engine.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cura-engine" Wed Jun 26 16:04:38 2019 rev:5 rq:712064 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cura-engine/cura-engine.changes 2019-02-25 17:53:57.894513055 +0100 +++ /work/SRC/openSUSE:Factory/.cura-engine.new.4615/cura-engine.changes 2019-06-26 16:05:20.991741105 +0200 @@ -1,0 +2,23 @@ +Thu Jun 13 06:53:55 UTC 2019 - Adrian Schröter <[email protected]> + +- update to version 4.1.0 + * https://ultimaker.com/en/products/ultimaker-cura-software/release-notes +- enable tests +- some build fixes needed: + fix-build.patch + CuraEngine-gcc9.patch +- 32bit platform is unsupported on Linux + (builds, but testcases are failing) + +------------------------------------------------------------------- +Thu Apr 18 07:40:39 UTC 2019 - Adrian Schröter <[email protected]> + +- sync spec file with -lulzbot variant +- enable test suite (requires fix-build.patch for libArcus interface) + +------------------------------------------------------------------- +Sat Mar 9 14:58:16 UTC 2019 - Stefan Brüns <[email protected]> + +- Update URL to use https + +------------------------------------------------------------------- Old: ---- CuraEngine-3.6.0.obscpio New: ---- CuraEngine-4.1.0.obscpio CuraEngine-gcc9.patch fix-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cura-engine.spec ++++++ --- /var/tmp/diff_new_pack.3kowep/_old 2019-06-26 16:05:22.071742633 +0200 +++ /var/tmp/diff_new_pack.3kowep/_new 2019-06-26 16:05:22.075742639 +0200 @@ -17,23 +17,32 @@ Name: cura-engine -Version: 3.6.0 +Version: 4.1.0 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only Group: Hardware/Printing -Url: http://github.com/Ultimaker/CuraEngine +Url: https://github.com/Ultimaker/CuraEngine Source0: CuraEngine-%{version}.tar.xz Source1: CuraEngine.1 +# X-OPENSUSE-PATCH fix-build.patch follow openSUSE policies +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 -%if 0%{?suse_version} >= 1500 -BuildRequires: gcc-c++ >= 5 -%else +%if 0%{?suse_version} < 1500 BuildRequires: gcc6-c++ +#!BuildIgnore: libgcc_s1 +%else +BuildRequires: gcc-c++ %endif BuildRequires: cmake +BuildRequires: gmock +BuildRequires: gtest BuildRequires: libArcus-devel BuildRequires: stb-devel +# No 32bit support anymore +ExcludeArch: %ix86 %arm %description CuraEngine is an engine for processing 3D models into 3D printing @@ -42,6 +51,10 @@ %prep %setup -q -n CuraEngine-%version +%patch1 -p1 +%patch2 -p0 +# the test is hardcoding the version number +sed -i -e 's,"master","%{version}",' tests/GCodeExportTest.cpp %build %if 0%{?suse_version} < 1500 @@ -49,7 +62,11 @@ export CXX=g++-6 %endif # make sure lib_CuraEngine is statically build and linked -%cmake -DCURA_ENGINE_VERSION=%version -DCMAKE_POSITION_INDEPENDENT_CODE="true" -DBUILD_SHARED_LIBS="false" +%cmake -DCURA_ENGINE_VERSION=%version \ + -DCMAKE_POSITION_INDEPENDENT_CODE="true" \ + -DBUILD_SHARED_LIBS="false" \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTS=ON %make_jobs %install @@ -58,6 +75,11 @@ install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/CuraEngine.1 +%check +cd build +# we don't use "make test" to get the output on failure +/usr/bin/ctest --force-new-ctest-process --output-on-failure + %files %license LICENSE %doc README.md ++++++ CuraEngine-3.6.0.obscpio -> CuraEngine-4.1.0.obscpio ++++++ ++++ 15208 lines of diff (skipped) ++++++ CuraEngine-gcc9.patch ++++++ --- 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++) { ++++++ CuraEngine.obsinfo ++++++ --- /var/tmp/diff_new_pack.3kowep/_old 2019-06-26 16:05:22.283742933 +0200 +++ /var/tmp/diff_new_pack.3kowep/_new 2019-06-26 16:05:22.283742933 +0200 @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.0 -mtime: 1541499779 -commit: ad5f91d432c7629bf29bd07817d45ee555b12a77 +version: 4.1.0 +mtime: 1558453724 +commit: 354efa4a4507e46993021e5b5a690a5a3139d5ba ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3kowep/_old 2019-06-26 16:05:22.303742962 +0200 +++ /var/tmp/diff_new_pack.3kowep/_new 2019-06-26 16:05:22.303742962 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/Ultimaker/CuraEngine.git</param> <param name="scm">git</param> - <param name="revision">3.6.0</param> - <param name="version">3.6.0</param> + <param name="revision">4.1.0</param> + <param name="version">4.1.0</param> </service> <service mode="disabled" name="set_version" /> ++++++ fix-build.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2717e987..edd2a93c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,6 @@ endif() if(NOT DEFINED LIB_SUFFIX) set(LIB_SUFFIX "") endif() -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") set(CURA_ENGINE_VERSION "master" CACHE STRING "Version name of Cura") @@ -101,10 +100,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() - if (WIN32) add_definitions(-DNOMINMAX) endif()
