From 4e4cd055fa48a03af49f4a1bfff416ea717cf406a92eb5f47089998b5b13ea61 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 25 Mar 2020 16:54:58 +0000 Subject: [PATCH] Accepting request 787172 from home:bnavigator:branches:science - update to version 2.2.0 introducing SLA hollowing and hole drilling, support for 3rd party printer vendors, 3Dconnexion support, automatic variable layer height, macOS dark mode support, greatly improved ColorPrint feature and much, much more. See https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.2.0 and the changelogs for the release candidates, betas and alphas since 2.1.1 for a complete list of changes. - reactivate parallel builds, but need strong enough workers and reserve 4G of memory per thread (memory-constraints, %limit_build) - new build dependencies: cgal, ilmbase, more of boost, libudev, openvdb OBS-URL: https://build.opensuse.org/request/show/787172 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=4 --- PrusaSlicer-2.2.0.tar.gz | 3 +++ PrusaSlicer.changes | 16 ++++++++++++++++ PrusaSlicer.spec | 27 ++++++++++++++++++++------- _constraints | 10 ++++++++++ _service | 3 --- version_2.1.1.tar.gz | 3 --- 6 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 PrusaSlicer-2.2.0.tar.gz create mode 100644 _constraints delete mode 100644 _service delete mode 100644 version_2.1.1.tar.gz diff --git a/PrusaSlicer-2.2.0.tar.gz b/PrusaSlicer-2.2.0.tar.gz new file mode 100644 index 0000000..b2655cc --- /dev/null +++ b/PrusaSlicer-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0 +size 30811929 diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 924ee47..160c6c6 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Mar 21 22:08:07 UTC 2020 - Benjamin Greiner + +- update to version 2.2.0 + introducing SLA hollowing and hole drilling, support for 3rd party + printer vendors, 3Dconnexion support, automatic variable layer height, + macOS dark mode support, greatly improved ColorPrint feature and much, + much more. + See https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.2.0 + and the changelogs for the release candidates, betas and alphas since + 2.1.1 for a complete list of changes. +- reactivate parallel builds, but need strong enough workers and reserve + 4G of memory per thread (memory-constraints, %limit_build) +- new build dependencies: cgal, ilmbase, more of boost, libudev, openvdb + + ------------------------------------------------------------------- Wed Dec 11 10:24:01 UTC 2019 - Benjamin Greiner diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index 57bdcea..21bf1a9 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -1,7 +1,7 @@ # # spec file for package PrusaSlicer # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ Name: PrusaSlicer -Version: 2.1.1 +Version: 2.2.0 Release: 0 Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) License: AGPL-3.0-only Group: Hardware/Printing URL: https://www.prusa3d.com/prusaslicer/ -Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz +Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRequires: cereal-devel +BuildRequires: cgal-devel >= 4.13.2 BuildRequires: cmake BuildRequires: eigen3-devel >= 3 BuildRequires: expat @@ -33,8 +34,10 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: gtest >= 1.7 +BuildRequires: ilmbase-devel BuildRequires: libboost_atomic-devel BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_iostreams-devel BuildRequires: libboost_locale-devel BuildRequires: libboost_log-devel BuildRequires: libboost_regex-devel @@ -42,7 +45,10 @@ BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: libcurl-devel BuildRequires: libexpat-devel +BuildRequires: libudev-devel +BuildRequires: memory-constraints BuildRequires: nlopt-devel +BuildRequires: openvdb-devel >= 5 BuildRequires: tbb-devel BuildRequires: update-desktop-files BuildRequires: wxWidgets-devel >= 3.1 @@ -60,8 +66,15 @@ It also works with Mach3, LinuxCNC and Machinekit controllers. sed -i 's/UNKNOWN/OpenSUSE/' version.inc %build -%cmake -DSLIC3R_FHS=1 -%cmake_build -j1 # parallel builds get stuck for x86_64 on OBS +%limit_build -m 4096 +# sse2 flags: see upstream github issue#3781 +%cmake -DSLIC3R_FHS=1 \ +%ifarch i686 i586 i386 + -DCMAKE_C_FLAGS:STRING="%optflags -mfpmath=sse -msse2" \ + -DCMAKE_CXX_FLAGS:STRING="%optflags -mfpmath=sse -msse2" +%endif + +%cmake_build %install %cmake_install @@ -113,12 +126,12 @@ find %{buildroot}%{_datadir}/%{name}/localization -type d | sed ' %fdupes %{buildroot}%{_datadir} %check -%ctest +%ctest --timeout 600 %files -f lang-files %{_bindir}/prusa-slicer %dir %{_datadir}/%{name}/ -%{_datadir}/%{name}/{icons,models,profiles,shaders}/ +%{_datadir}/%{name}/{icons,models,profiles,shaders,udev}/ %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/192x192/apps/%{name}.png diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..cbb4c6b --- /dev/null +++ b/_constraints @@ -0,0 +1,10 @@ + + + + 12 + + + 8 + + + diff --git a/_service b/_service deleted file mode 100644 index 413b85c..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/version_2.1.1.tar.gz b/version_2.1.1.tar.gz deleted file mode 100644 index 22a577a..0000000 --- a/version_2.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79d0681fbf3f4158cac25595522dcea330e0fa960934053ac929a15fa13c1072 -size 27551136