rpms
/
prusa-slicer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.3.1-rc

This commit is contained in:
Tom spot Callaway 2021-04-17 20:29:57 -04:00
parent 8192d5d35b
commit 62cb51b96e
3 changed files with 12 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
atomic.patch
View File

@ -1,25 +0,0 @@
From 19d28524e76ff9c5b7fa4ff1a8373bfbacad9775 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Sun, 13 Dec 2020 19:41:47 +0100
Subject: [PATCH] Include <atomic> for std::atomic where needed
Fixes build on linux using clang 11
---
src/slic3r/GUI/Mouse3DController.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp
index eb1425b..4e0c8e6 100644
--- a/src/slic3r/GUI/Mouse3DController.hpp
+++ b/src/slic3r/GUI/Mouse3DController.hpp
@@ -8,6 +8,7 @@
#include "hidapi.h"
+#include <atomic>
#include <queue>
#include <thread>
#include <vector>
--
2.30.0

50
endian.patch
View File

@ -1,50 +0,0 @@
diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
index 390fe56..7ac2704 100644
--- a/src/admesh/stlinit.cpp
+++ b/src/admesh/stlinit.cpp
@@ -28,7 +28,6 @@
#include <boost/log/trivial.hpp>
#include <boost/nowide/cstdio.hpp>
-#include <boost/detail/endian.hpp>
#include "stl.h"
@@ -36,9 +35,9 @@
#error "SEEK_SET not defined"
#endif
-#ifndef BOOST_LITTLE_ENDIAN
+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
extern void stl_internal_reverse_quads(char *buf, size_t cnt);
-#endif /* BOOST_LITTLE_ENDIAN */
+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
static FILE* stl_open_count_facets(stl_file *stl, const char *file)
{
@@ -89,10 +88,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
// Read the int following the header. This should contain # of facets.
uint32_t header_num_facets;
bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
-#ifndef BOOST_LITTLE_ENDIAN
+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
// Convert from little endian to big endian.
stl_internal_reverse_quads((char*)&header_num_facets, 4);
-#endif /* BOOST_LITTLE_ENDIAN */
+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
if (! header_num_faces_read || num_facets != header_num_facets)
BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
}
@@ -158,10 +157,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first)
// Read a single facet from a binary .STL file. We assume little-endian architecture!
if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
return false;
-#ifndef BOOST_LITTLE_ENDIAN
+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
// Convert the loaded little endian data to big endian.
stl_internal_reverse_quads((char*)&facet, 48);
-#endif /* BOOST_LITTLE_ENDIAN */
+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
} else {
// Read a single facet from an ASCII .STL file
// skip solid/endsolid

29
prusa-slicer.spec
View File

@ -6,9 +6,11 @@
%bcond_without perltests
%endif
%global prever rc
Name: prusa-slicer
Version: 2.2.0
Release: 11%{?dist}
Version: 2.3.1
Release: 0.1.%{prever}%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@ -21,21 +23,10 @@ Summary: 3D printing slicer optimized for Prusa printers
# that here.
License: AGPLv3
URL: https://github.com/prusa3d/PrusaSlicer/
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.tar.gz
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version%{?prever:-%prever}.tar.gz
Source1: %name.desktop
Source2: %name.appdata.xml
# Boost 1.73 support
# https://bugzilla.redhat.com/show_bug.cgi?id=1842011
# https://github.com/prusa3d/PrusaSlicer/issues/4264
# https://github.com/prusa3d/PrusaSlicer/pull/4340
Patch1: endian.patch
# Include <atomic> for std::atomic where needed
# Fixes build with Boost 1.75
# https://github.com/prusa3d/PrusaSlicer/commit/44f71f0ed1
Patch2: atomic.patch
# Highly-parallel uild can run out of memory on PPC64le
%ifarch ppc64le
%global _smp_ncpus_max 8
@ -148,7 +139,7 @@ Provides: bundled(boost-nowide)
# Not packaged in Fedora, but could be.
# License: MIT
# Upstream: https://github.com/ocornut/imgui
Provides: bundled(imgui) = 1.66
Provides: bundled(imgui) = 1.75
# Some old code extracted from mesa libGLU that was last changed upstream in
# 2010 and last substantially changed before things were imported to git.
@ -240,7 +231,7 @@ community.
%prep
%autosetup -S git -n PrusaSlicer-version_%version
%autosetup -S git -n PrusaSlicer-version_%version%{?prever:-%prever}
commit () { git commit -q -a -m "$1" --author "%{__scm_author}"; }
@ -402,14 +393,18 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
%doc README.md
%_bindir/%name
%_bindir/%name.wrapped
%_bindir/prusa-gcodeviewer
%_datadir/icons/hicolor/*/apps/%name.png
%_datadir/applications/%name.desktop
%_datadir/appdata/%name.appdata.xml
%dir %_datadir/PrusaSlicer
%_datadir/PrusaSlicer/{icons,models,profiles,shaders,udev}/
%_datadir/PrusaSlicer/{applications,data,icons,models,profiles,shaders,udev}/
%changelog
* Sat Apr 17 2021 Tom Callaway <spot@fedoraproject.org> - 2.3.1-0.1.rc
- update to 2.3.1-rc
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild