From 13512f05716ab5c4e96334554831391efab6a6ae627836c1efcb82b6125f9b9f Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 22 Aug 2023 19:25:23 +0000 Subject: [PATCH] Accepting request 1105329 from home:bnavigator:branches:science - 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 --- PrusaSlicer.changes | 7 +++++++ PrusaSlicer.spec | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index dec7da4..271e7c7 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 20 16:01:37 UTC 2023 - Ben Greiner + +- 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 diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index f16ec68..884cc08 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -34,11 +34,11 @@ Patch2: PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch Patch3: PrusaSlicer-drop-wx3.0.patch BuildRequires: blosc-devel BuildRequires: cereal-devel -BuildRequires: cgal-devel >= 4.13.2 BuildRequires: cmake BuildRequires: eigen3-devel >= 3 BuildRequires: expat 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 %if 0%{?suse_version} >= 1550 %define gcc_ver %{gcc_version} @@ -80,6 +80,8 @@ BuildRequires: pkgconfig(qhullcpp) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) Requires: noto-sans-fonts +# Cannot allocate memory to build +ExcludeArch: %{ix86} %description 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://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make %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 -# rh#2059646 -#sed -i tests/libslic3r/CMakeLists.txt -e '\@test_voronoi.cpp@d' - %cmake \ -DCMAKE_CXX_STANDARD=17 \ -DSLIC3R_FHS=1 \