gentoo resync : 18.12.2020

4 files changed, 91 insertions, 0 deletions

diff --git a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop b/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
new file mode 100644
index 000000000000..4b73cc905c6c
--- /dev/null
+++ b/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Prusa GCode viewer
+Exec=prusa-slicer --gcodeviewer %F
+Icon=PrusaSlicer
+Terminal=false
+Type=Application
+MimeType=text/x.gcode;
+Categories=Graphics;3DGraphics;
+Keywords=3D;Printing;Slicer;
diff --git a/media-gfx/prusaslicer/files/PrusaSlicer.desktop b/media-gfx/prusaslicer/files/PrusaSlicer.desktop
new file mode 100644
index 000000000000..dae507b54abb
--- /dev/null
+++ b/media-gfx/prusaslicer/files/PrusaSlicer.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=PrusaSlicer
+GenericName=3D Printing Software
+Icon=PrusaSlicer
+Exec=prusa-slicer %F
+Terminal=false
+Type=Application
+MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
+Categories=Graphics;3DGraphics;Engineering;
+Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
+StartupNotify=false
+StartupWMClass=prusa-slicer
\ No newline at end of file
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
new file mode 100644
index 000000000000..4319ad0f1463
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
@@ -0,0 +1,10 @@
+--- 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>
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
new file mode 100644
index 000000000000..50abea11b328
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
@@ -0,0 +1,60 @@
+--- 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 @@
+     	// 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 @@
+       		// 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
+
+--- a/CMakeLists.txt	(revision 3b2c51fd5ab04a72592bfdba1cd39cd6298b66c2)
++++ b/CMakeLists.txt	(date 1607811414000)
+@@ -260,7 +260,7 @@
+ # set(Boost_COMPILER "-mgw81")
+ if(NOT WIN32)
+     # boost::process was introduced first in version 1.64.0
+-    set(MINIMUM_BOOST_VERSION "1.64.0")
++    set(MINIMUM_BOOST_VERSION "1.72.0")
+ endif()
+ set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time")
+ find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})