pool/PrusaSlicer
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1105329 from home:bnavigator:branches:science

Browse Source 
- Limit to CGAL < 5.6 as it introduced breaking changes which
  PrusaSlicer is not compatible yet
- Disable failing ix86 build

OBS-URL: https://build.opensuse.org/request/show/1105329
OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=63
This commit is contained in:
Benjamin Greiner 2023-08-22 19:25:23 +00:00 committed by Git OBS Bridge
parent 4758396167
commit 13512f0571
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PrusaSlicer.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Aug 20 16:01:37 UTC 2023 - Ben Greiner <code@bnavigator.de>
- Limit to CGAL < 5.6 as it introduced breaking changes which
PrusaSlicer is not compatible yet
- Disable failing ix86 build
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 21 10:32:11 UTC 2023 - Ben Greiner <code@bnavigator.de> Fri Jul 21 10:32:11 UTC 2023 - Ben Greiner <code@bnavigator.de>

12
PrusaSlicer.spec
View File

@ -34,11 +34,11 @@ Patch2: PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch
Patch3: PrusaSlicer-drop-wx3.0.patch Patch3: PrusaSlicer-drop-wx3.0.patch
BuildRequires: blosc-devel BuildRequires: blosc-devel
BuildRequires: cereal-devel BuildRequires: cereal-devel
BuildRequires: cgal-devel >= 4.13.2
BuildRequires: cmake BuildRequires: cmake
BuildRequires: eigen3-devel >= 3 BuildRequires: eigen3-devel >= 3
BuildRequires: expat BuildRequires: expat
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: (cgal-devel >= 4.13.2 with cgal-devel < 5.6)
# gcc v8 is required as least for charconv header. version 10 exists on 15.4 and tumbleweed # gcc v8 is required as least for charconv header. version 10 exists on 15.4 and tumbleweed
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%define gcc_ver %{gcc_version} %define gcc_ver %{gcc_version}
@ -80,6 +80,8 @@ BuildRequires: pkgconfig(qhullcpp)
BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-egl)
Requires: noto-sans-fonts Requires: noto-sans-fonts
# Cannot allocate memory to build
ExcludeArch: %{ix86}
%description %description
PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
@ -112,15 +114,7 @@ sed -i 's|slic3r_jobs_tests.cpp||' tests/slic3rutils/CMakeLists.txt
# https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.build_job_constraints.html # https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.build_job_constraints.html
# https://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make # https://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make
%limit_build -m 3072 %limit_build -m 3072
# sse2 flags for 32-bit: see gh#prusa3d/PrusaSlicer#3781
%ifarch %ix86
export CFLAGS="%optflags -mfpmath=sse -msse2"
export CXXFLAGS="$CFLAGS"
%endif
export CC=gcc-%gcc_ver CXX=g++-%gcc_ver export CC=gcc-%gcc_ver CXX=g++-%gcc_ver
# rh#2059646
#sed -i tests/libslic3r/CMakeLists.txt -e '\@test_voronoi.cpp@d'
%cmake \ %cmake \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17 \
-DSLIC3R_FHS=1 \ -DSLIC3R_FHS=1 \