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

- support boost >= 1.73 PrusaSlicer-pr4340-boots-1-73.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=19
This commit is contained in:
Benjamin Greiner 2020-09-01 21:21:51 +00:00 committed by Git OBS Bridge
parent 062229dc08
commit 23cd57662a
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
PrusaSlicer-pr4340-boost-1-73.patch Normal file
View File

@ -0,0 +1,63 @@
From 13abc305a1344cde55e5616cc877f4a3e2f8a2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 3 Jun 2020 01:32:44 +0200
Subject: [PATCH] Remove deprecated boost/detail/endian.hpp usage
boost/detail/endian.hpp is removed in Boost 1.73
boost/endian/endian.hpp is deprecated in Boost 1.73
Fixes https://github.com/prusa3d/PrusaSlicer/issues/4264
---
src/admesh/stlinit.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
index 390fe56a40..7ac27044b1 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

5
PrusaSlicer.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 1 21:20:26 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- support boost >= 1.73 PrusaSlicer-pr4340-boots-1-73.patch
-------------------------------------------------------------------
Tue Sep 1 11:46:30 UTC 2020 - Benjamin Greiner <code@bnavigator.de>

3
PrusaSlicer.spec
View File

@ -25,6 +25,8 @@ Group: Hardware/Printing
URL: https://www.prusa3d.com/prusaslicer/
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
# PATCH-FIX-UPSTREAM https://github.com/prusa3d/PrusaSlicer/pull/4340
Patch0: PrusaSlicer-pr4340-boost-1-73.patch
BuildRequires: cereal-devel
BuildRequires: cgal-devel >= 4.13.2
BuildRequires: cmake
@ -64,6 +66,7 @@ It also works with Mach3, LinuxCNC and Machinekit controllers.
%prep
%setup -q -n %{name}-version_%{version}
%patch0 -p1
sed -i 's/UNKNOWN/%{release}-%{?is_opensuse:open}SUSE-%{suse_version}/' version.inc
%build