From 1dbb823e1778a2ce6b30df7843acf2bdb13b8c2cbd0a17e509461121a59d77d6 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 16 Jun 2020 12:22:23 +0000 Subject: [PATCH] Accepting request 815236 from home:bnavigator:branches:openSUSE:Factory - This is mainly a cosmetic update so that the package gets rebuilt in Factory. Rebuild is needed because of wxWidgets - boo#1172750 - Add openvdb-tools package for better cmake reporting. - Make the 32-bit floating point workaround more readable. gh#prusa3d/PrusaSlicer#3781 OBS-URL: https://build.opensuse.org/request/show/815236 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=8 --- PrusaSlicer.changes | 9 +++++++++ PrusaSlicer.spec | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 4b556a9..c6d3519 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 16 12:09:13 UTC 2020 - Benjamin Greiner + +- This is mainly a cosmetic update so that the package gets rebuilt + in Factory. Rebuild is needed because of wxWidgets - boo#1172750 +- Add openvdb-tools package for better cmake reporting. +- Make the 32-bit floating point workaround more readable. + gh#prusa3d/PrusaSlicer#3781 + ------------------------------------------------------------------- Fri Apr 24 07:24:26 UTC 2020 - Dominique Leuenberger diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index c4dc8c2..337fd91 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -48,6 +48,7 @@ BuildRequires: libexpat-devel BuildRequires: memory-constraints BuildRequires: nlopt-devel BuildRequires: openvdb-devel >= 5 +BuildRequires: openvdb-tools BuildRequires: tbb-devel BuildRequires: update-desktop-files BuildRequires: wxWidgets-devel >= 3.1 @@ -67,13 +68,12 @@ sed -i 's/UNKNOWN/OpenSUSE/' version.inc %build %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" +# sse2 flags for 32-bit: see gh#prusa3d/PrusaSlicer#3781 +%ifarch %ix86 + export CFLAGS="%optflags -mfpmath=sse -msse2" + export CXXFLAGS="$CFLAGS" %endif - +%cmake -DSLIC3R_FHS=1 %cmake_build %install