Gentoo Archives: gentoo-commits

From: Yahor Berdnikau <egorr.berd@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
Date: Sat, 04 Dec 2021 20:15:36
Message-Id: 1638648919.62b321a0809520d9454e284736301b19f12b273d.egorr.berd@gentoo
1 commit: 62b321a0809520d9454e284736301b19f12b273d
2 Author: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
3 AuthorDate: Sat Dec 4 19:57:06 2021 +0000
4 Commit: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
5 CommitDate: Sat Dec 4 20:15:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=62b321a0
7
8 media-gfx/superslicer: new package
9
10 Added slotted ebuilds for 2.2.53.4 and 2.3.56.9 SuperSlicer versions.
11
12 Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>
13
14 media-gfx/superslicer/Manifest | 16 +++
15 ...or-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch | 64 +++++++++++
16 .../superslicer/files/boost-endian-2.2.53.4.patch | 49 +++++++++
17 .../files/boost-mouse-atomic-2.2.53.4.patch | 9 ++
18 .../files/freecad-dialog-2.2.53.4.patch | 9 ++
19 .../files/miniz-zip-header-2.2.53.4.patch | 20 ++++
20 .../files/missing-imports-2.3.56.9.patch | 118 +++++++++++++++++++++
21 .../files/string-to-char-conversion-2.3.56.9.patch | 10 ++
22 .../files/version-suffix-2.2.53.4.patch | 13 +++
23 .../files/version-suffix-2.3.56.9.patch | 17 +++
24 .../wxwidget-canvas-set-context-2.3.56.9.patch | 11 ++
25 media-gfx/superslicer/metadata.xml | 14 +++
26 media-gfx/superslicer/superslicer-2.2.53.4.ebuild | 88 +++++++++++++++
27 media-gfx/superslicer/superslicer-2.3.56.9.ebuild | 112 +++++++++++++++++++
28 14 files changed, 550 insertions(+)
29
30 diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
31 new file mode 100644
32 index 000000000..db834aeb2
33 --- /dev/null
34 +++ b/media-gfx/superslicer/Manifest
35 @@ -0,0 +1,16 @@
36 +AUX Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch 2485 BLAKE2B 3dbb842ec582212b91c3938750d42afb32e790e2f3f0e42ee11ed7bff0e8b5c3c8deb8968d3e3b8fd5fcf12767c06361489c24c780121681991a29d9435d38b3 SHA512 6412b8492ef8581b412f8e35d88f2a78a00a317db2aa3a9a35a85881b4b71b62c54982bc2aa1a74c022a7aaa31611687457e3f00adcb1f619a2ff7b54bcecd1c
37 +AUX boost-endian-2.2.53.4.patch 1789 BLAKE2B b436e2e15edcee8e1713231e18a4973764ee20c7d142248a71b2ff6f9deabab7e7540f5043db8d60732eea07c8eac77d2086356a6875f0c475e0d1c0db0a3517 SHA512 a31808a54232fa68e09f737981cae75e785ae20d07dd8b1b885431532bb6d2c11aea81bb625f90a84bbd34d66d0d0922556c17feab75f624bb1df44a52df22b1
38 +AUX boost-mouse-atomic-2.2.53.4.patch 201 BLAKE2B 51de568b16301cd0ffb4b8645b29b74c791b532815fcc53291f87a7eaf1077169996cd6a8d4ef0bad990774e27931c522441980ac7e8b4e0b598e016dfc7d751 SHA512 84292f447a88e35b3046c6ed838af1297cc5ba340768adacaf000de0a2d2f7f5d97ac30e54eafce93d8007524cd245b2d6700ff095ba5d0c8ceb08a3515f5a0f
39 +AUX freecad-dialog-2.2.53.4.patch 481 BLAKE2B 1ad2d3e195c5c5bada1200133f702e0072e67b93f0ba56c5971bff52416f44e05ccba5eb3e47a240c76306b333884c4e1e0104052f9ade58265cb56b230e078b SHA512 a42806fe4fd64fea888cdb45b70ad9846022b6acf80ce6a8cc5cac758bbec161fd70379be95d2f62a3197f961fbccdd408eb2d6895d920748d14c134d22efac4
40 +AUX miniz-zip-header-2.2.53.4.patch 627 BLAKE2B f75874226b8e3b42080fb9adabc7b0bc73cc62f01839925f7d5c565df4eb9368c8ea5396760d8ff917f22766da0a60cfa1bb48a9b2c428a03ab0221de1cd796b SHA512 4b668d32fa66c192c6130b678061b6c63388971a950a9610d03041983972b7ce3f49405f2d7b4e2b41bb8146ab3b8ed95c009ef8be5c5f8c57067c7887adb306
41 +AUX missing-imports-2.3.56.9.patch 3114 BLAKE2B ff21f476f0e04df3c694a4962cfb3b588c9799ffe4a60df2d1149800dc81edd734110eb06841dd0da3118b6d4174e58ab581021b826779f221c66b46af4448b9 SHA512 0f30957f28140de61a10adcf625358d0df7ea6c0a4ef48061a31a324d9487496792f72506ac5f235d749402ad049cea9e418f9fd8814e641f5815f43c6c295ce
42 +AUX string-to-char-conversion-2.3.56.9.patch 713 BLAKE2B 726166a605a711350bc436bd31a69211750e3e9cc459a03091c4e857ae600b6d0b5c3ed8528334eed09ff0453c39f381cc4aef7391a9e310f5ffdee55225cb89 SHA512 1156f1cdbc8d27d5b24cce0cecbfa26479e5e340e8895d20bbd0d4588068011d12e3a57a536c4ac7d4c5a3105d4c8d6b7274df9cf1b7c45c33642401ab3f3985
43 +AUX version-suffix-2.2.53.4.patch 468 BLAKE2B 9b698a981bf0101d8ce39c32afe3b1e9559fe1fcb00cbd45bec95d56d222736abd79394b181d9eb164aa67096542bfcc61a8d031b8f82bda41a48a7aa5235968 SHA512 5bd96eb4b4ae6b1050a8843868479a3cead2fa214476170c05305a98b48e8d3bb3d3c57cfc1e5993a33fa95989b07a83ae117820de3e1892cfd7b95a819ea079
44 +AUX version-suffix-2.3.56.9.patch 628 BLAKE2B 0890f85e487b33012a498845319042faf653e50a9a7857a5792fc5ee4c273a45954db7e228ccdbbfb3d95f46a59c3c737447a8de44e44dc833b55c80685a7eff SHA512 3a457236422b9124ee405d5e97432419da8a2fff2b1d1e88de109670218d9456c26d613aa05341db973e283e0bc6d8ef27a756398726f6d546eb44fc8f16c948
45 +AUX wxwidget-canvas-set-context-2.3.56.9.patch 404 BLAKE2B 443e6a78147d002e54c552ebd217c494125d092a3c241a5407b3df2198ef0be4ab25bd074ca213d3bf75c8459d3c15772d4de44b71d2bd94af14513765eed573 SHA512 0ad5754c82d6e4273d6860aacaa05a26b84f876d7eb34703f506fe97e9f916ffc735ec203fe2d5da1aa16eee3918e26594364fca0d54984f4988256f980a0dba
46 +DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
47 +DIST superslicer-2.3.56.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
48 +DIST superslicer-2.3.56.9.tar.gz 32260311 BLAKE2B 2da3201d789dd66a4a26c365b020f67dd5f43a71b9616681eb5dfed1ec759943398ce82fa2c8d5fd9a4f66a6887c25f0f86286ec4f52364a97a29cee548c3f0c SHA512 05c57765770889dc365eb721a2e6491f16de5a03c03493a682c49b769435d6db6e0ad52c0cfced7aa402dc751e4fdcbfc0623fa82d8431e45a590e64b12b6769
49 +EBUILD superslicer-2.2.53.4.ebuild 2170 BLAKE2B 24d707ffe3d2feb9ba625411755056337df14b6cd540ca64551d0fe32b080c597604fe404b0239ac0e13eca54b1622f90f4ebcb201ac627acbc2f7e4bdc4a0f4 SHA512 bbc8bf3a2b66dd7ae5fa3749c7ab123a1983f9842966ea5bf3024dfc75ccd57c5dc2fc45b2cabc9dd0a5e01af97716603fbdab9052e19728a2b1f8b94264037d
50 +EBUILD superslicer-2.3.56.9.ebuild 3374 BLAKE2B 40f8173e21a5fd676a5f674d362669740d9a3b35c070218c0d674254c2bd9cf615b29c1a181129d937e1d877aefa54129839af26927ed4b50068c24a9a498a11 SHA512 fd785be9d565132f7709399ae6247d792036ec7cbb4cd961b6dfde6bcb99fcd8f168004a9a4ccb1d3ea3f936066311ebaebf74806252657d6b920677cc6fa742
51 +MISC metadata.xml 469 BLAKE2B 542259ec3961e5fbeae4a0fd894f2a289278a86039a9a7862e6ec2c745b32433ed9b6dbf6659a171f2decddea2018dc7e608404f4b7c99aa94d236a86fdc5b2d SHA512 28a53bfcfc4ab83cf071f2d7e5ec939251b569d1a657bc725ee5530a7a1d18c67926fabb911dc48912a0bb43a2058fad84622f04e4fe3dd9838935d8cd3e4fb6
52
53 diff --git a/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch b/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
54 new file mode 100644
55 index 000000000..214395524
56 --- /dev/null
57 +++ b/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
58 @@ -0,0 +1,64 @@
59 +From a13b35ce92efed202ef43f02debb83dfb533d9b0 Mon Sep 17 00:00:00 2001
60 +From: Vojtech Bubnik <bubnikv@×××××.com>
61 +Date: Tue, 15 Dec 2020 12:14:30 +0100
62 +Subject: [PATCH] Support for HiDPI in OpenGL on Linux / GTK3. wxGTK3 HiDPI
63 + support seems to emulate what OSX does quite closely, thus the changes are
64 + relatively minimal.
65 +
66 +Also fixed an ugly rounding issue when populating the ImGUI font map
67 +with image thumbnails.
68 +
69 +Fixes Gtk3 issue on 4k+ screens #4135
70 +Fixes HiDPI screens with Wayland on Fedora 30 cause Plater view to be too small. #3245
71 +
72 +Signed-off-by: Yahor Berdnikau <egorr.berd@×××××.com>
73 +---
74 + src/slic3r/GUI/GLCanvas3D.cpp | 10 +++++++++-
75 + src/slic3r/GUI/GLCanvas3D.hpp | 5 +++--
76 + src/slic3r/GUI/ImGuiWrapper.cpp | 8 ++++++--
77 + src/slic3r/GUI/MainFrame.cpp | 3 ++-
78 + 4 files changed, 20 insertions(+), 6 deletions(-)
79 +
80 +diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
81 +index e778de879..c2e442431 100644
82 +--- a/src/slic3r/GUI/GLCanvas3D.cpp
83 ++++ b/src/slic3r/GUI/GLCanvas3D.cpp
84 +@@ -86,6 +86,13 @@ static const size_t VERTEX_BUFFER_RESERVE_SIZE_SUM_MAX = 1024 * 1024 * 128 / 4;
85 + namespace Slic3r {
86 + namespace GUI {
87 +
88 ++#ifdef __WXGTK3__
89 ++// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support.
90 ++RetinaHelper::RetinaHelper(wxWindow* window) : m_window(window), m_self(nullptr) {}
91 ++RetinaHelper::~RetinaHelper() {}
92 ++float RetinaHelper::get_scale_factor() { return float(m_window->GetContentScaleFactor()); }
93 ++#endif // __WXGTK3__
94 ++
95 + Size::Size()
96 + : m_width(0)
97 + , m_height(0)
98 +@@ -3732,7 +3739,8 @@ void GLCanvas3D::update_ui_from_settings()
99 + {
100 + m_dirty = true;
101 +
102 +-#if ENABLE_RETINA_GL
103 ++#if __APPLE__
104 ++ // Update OpenGL scaling on OSX after the user toggled the "use_retina_opengl" settings in Preferences dialog.
105 + const float orig_scaling = m_retina_helper->get_scale_factor();
106 +
107 + const bool use_retina = wxGetApp().app_config->get("use_retina_opengl") == "1";
108 +diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
109 +index 9c80aa236..e64e65d1b 100644
110 +--- a/src/slic3r/GUI/GLCanvas3D.hpp
111 ++++ b/src/slic3r/GUI/GLCanvas3D.hpp
112 +@@ -31,7 +31,8 @@ class wxPaintEvent;
113 + class wxGLCanvas;
114 + class wxGLContext;
115 +
116 +-// Support for Retina OpenGL on Mac OS
117 +-#define ENABLE_RETINA_GL __APPLE__
118 ++// Support for Retina OpenGL on Mac OS.
119 ++// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support, enable it as well.
120 ++#define ENABLE_RETINA_GL (__APPLE__ || __WXGTK3__)
121 +
122 + namespace Slic3r {
123
124 diff --git a/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch b/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
125 new file mode 100644
126 index 000000000..226ad261a
127 --- /dev/null
128 +++ b/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
129 @@ -0,0 +1,49 @@
130 +--- a/src/admesh/stlinit.cpp
131 ++++ b/src/admesh/stlinit.cpp
132 +@@ -28,7 +28,7 @@
133 +
134 + #include <boost/log/trivial.hpp>
135 + #include <boost/nowide/cstdio.hpp>
136 +-#include <boost/detail/endian.hpp>
137 ++#include <boost/predef/other/endian.h>
138 +
139 + #include "stl.h"
140 +
141 +@@ -36,9 +36,9 @@
142 + #error "SEEK_SET not defined"
143 + #endif
144 +
145 +-#ifndef BOOST_LITTLE_ENDIAN
146 ++#if BOOST_ENDIAN_BIG_BYTE
147 + extern void stl_internal_reverse_quads(char *buf, size_t cnt);
148 +-#endif /* BOOST_LITTLE_ENDIAN */
149 ++#endif /* BOOST_ENDIAN_BIG_BYTE */
150 +
151 + static FILE* stl_open_count_facets(stl_file *stl, const char *file)
152 + {
153 +@@ -89,10 +89,10 @@
154 + // Read the int following the header. This should contain # of facets.
155 + uint32_t header_num_facets;
156 + bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
157 +-#ifndef BOOST_LITTLE_ENDIAN
158 ++#if BOOST_ENDIAN_BIG_BYTE
159 + // Convert from little endian to big endian.
160 + stl_internal_reverse_quads((char*)&header_num_facets, 4);
161 +-#endif /* BOOST_LITTLE_ENDIAN */
162 ++#endif /* BOOST_ENDIAN_BIG_BYTE */
163 + if (! header_num_faces_read || num_facets != header_num_facets)
164 + BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
165 + }
166 +@@ -158,10 +158,10 @@
167 + // Read a single facet from a binary .STL file. We assume little-endian architecture!
168 + if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
169 + return false;
170 +-#ifndef BOOST_LITTLE_ENDIAN
171 ++#if BOOST_ENDIAN_BIG_BYTE
172 + // Convert the loaded little endian data to big endian.
173 + stl_internal_reverse_quads((char*)&facet, 48);
174 +-#endif /* BOOST_LITTLE_ENDIAN */
175 ++#endif /* BOOST_ENDIAN_BIG_BYTE */
176 + } else {
177 + // Read a single facet from an ASCII .STL file
178 + // skip solid/endsolid
179
180 diff --git a/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch b/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
181 new file mode 100644
182 index 000000000..e7556e0aa
183 --- /dev/null
184 +++ b/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
185 @@ -0,0 +1,9 @@
186 +--- a/src/slic3r/GUI/Mouse3DController.hpp
187 ++++ b/src/slic3r/GUI/Mouse3DController.hpp
188 +@@ -11,5 +11,6 @@
189 + #include "hidapi.h"
190 +
191 + #include <queue>
192 ++#include <atomic>
193 + #include <thread>
194 + #include <vector>
195
196 diff --git a/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch b/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
197 new file mode 100644
198 index 000000000..880ef6b1f
199 --- /dev/null
200 +++ b/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
201 @@ -0,0 +1,9 @@
202 +--- a/src/slic3r/GUI/FreeCADDialog.cpp
203 ++++ b/src/slic3r/GUI/FreeCADDialog.cpp
204 +@@ -706,5 +706,5 @@
205 + m_text->Bind(wxEVT_KEY_DOWN, &FreeCADDialog::on_key_type, this);
206 + m_text->Bind(wxEVT_CHAR, &FreeCADDialog::on_char_type, this);
207 +- m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
208 ++ //m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
209 + m_text->Connect(wxID_ANY,
210 + wxEVT_KEY_DOWN,
211
212 diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch b/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
213 new file mode 100644
214 index 000000000..2294ba0b5
215 --- /dev/null
216 +++ b/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
217 @@ -0,0 +1,20 @@
218 +https://bugs.gentoo.org/761541
219 +--- a/src/libslic3r/miniz_extension.hpp 2021-01-11 08:01:51.000000000 -0500
220 ++++ b/src/libslic3r/miniz_extension.hpp 2021-01-12 01:16:10.503404521 -0500
221 +@@ -4,4 +4,5 @@
222 + #include <string>
223 + #include <miniz.h>
224 ++#include <miniz_zip.h>
225 +
226 + namespace Slic3r {
227 +
228 +--- a/src/libslic3r/Format/3mf.cpp
229 ++++ b/src/libslic3r/Format/3mf.cpp
230 +@@ -30,6 +30,7 @@ namespace pt = boost::property_tree;
231 + #include <expat.h>
232 + #include <Eigen/Dense>
233 + #include "miniz_extension.hpp"
234 ++#include <miniz_zip.h>
235 +
236 + // VERSION NUMBERS
237 + // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
238
239 diff --git a/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch b/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch
240 new file mode 100644
241 index 000000000..200f1663c
242 --- /dev/null
243 +++ b/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch
244 @@ -0,0 +1,118 @@
245 +--- a/src/libslic3r/AppConfig.cpp
246 ++++ b/src/libslic3r/AppConfig.cpp
247 +@@ -10,6 +10,7 @@
248 +
249 + #include <boost/filesystem/path.hpp>
250 + #include <boost/filesystem/operations.hpp>
251 ++#include <boost/locale/generator.hpp>
252 + #include <boost/nowide/cenv.hpp>
253 + #include <boost/nowide/fstream.hpp>
254 + #include <boost/property_tree/ini_parser.hpp>
255 +
256 +--- a/src/libslic3r/Format/CWS.cpp
257 ++++ b/src/libslic3r/Format/CWS.cpp
258 +@@ -1,6 +1,8 @@
259 + #include "libslic3r/Format/CWS.hpp"
260 + #include "libslic3r/PrintConfig.hpp"
261 + #include "libslic3r/Time.hpp"
262 ++#include <boost/filesystem.hpp>
263 ++#include <boost/log/trivial.hpp>
264 +
265 + namespace Slic3r {
266 +
267 +--- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp
268 ++++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp
269 +@@ -5,6 +5,7 @@
270 + #include "GUI.hpp"
271 + #include "GUI_ObjectList.hpp"
272 + #include "Tab.hpp"
273 ++#include <boost/filesystem.hpp>
274 + #include <wx/scrolwin.h>
275 + #include <wx/display.h>
276 + #include <wx/file.h>
277 +
278 +--- a/src/slic3r/GUI/Preferences.cpp
279 ++++ b/src/slic3r/GUI/Preferences.cpp
280 +@@ -4,6 +4,7 @@
281 + #include "Plater.hpp"
282 + #include "I18N.hpp"
283 + #include "libslic3r/AppConfig.hpp"
284 ++#include <boost/filesystem.hpp>
285 + #include <wx/notebook.h>
286 +
287 + namespace Slic3r {
288 +
289 +--- a/src/slic3r/GUI/GUI_ObjectList.cpp
290 ++++ b/src/slic3r/GUI/GUI_ObjectList.cpp
291 +@@ -15,6 +15,7 @@
292 + #include "Selection.hpp"
293 +
294 + #include <boost/algorithm/string.hpp>
295 ++#include <boost/log/trivial.hpp>
296 + #include "slic3r/Utils/FixModelByWin10.hpp"
297 +
298 + #ifdef __WXMSW__
299 +--- a/src/slic3r/GUI/Tab.cpp
300 ++++ b/src/slic3r/GUI/Tab.cpp
301 +@@ -22,6 +22,7 @@
302 +
303 + #include <wx/bmpcbox.h>
304 + #include <wx/bmpbuttn.h>
305 ++#include <wx/collpane.h>
306 + #include <wx/treectrl.h>
307 + #include <wx/imaglist.h>
308 + #include <wx/settings.h>
309 +--- a/src/slic3r/GUI/3DBed.cpp
310 ++++ b/src/slic3r/GUI/3DBed.cpp
311 +@@ -16,7 +16,11 @@
312 +
313 + #include <boost/algorithm/string/predicate.hpp>
314 + #include <boost/filesystem/operations.hpp>
315 ++#include <boost/locale/generator.hpp>
316 + #include <boost/log/trivial.hpp>
317 ++#include <boost/property_tree/ini_parser.hpp>
318 ++#include <boost/property_tree/ptree.hpp>
319 ++#include <boost/nowide/fstream.hpp>
320 +
321 + static const float GROUND_Z = -0.02f;
322 +
323 +--- a/src/slic3r/Utils/PresetUpdater.cpp
324 ++++ b/src/slic3r/Utils/PresetUpdater.cpp
325 +@@ -12,6 +12,8 @@
326 + #include <boost/filesystem/fstream.hpp>
327 + #include <boost/lexical_cast.hpp>
328 + #include <boost/log/trivial.hpp>
329 ++#include <boost/property_tree/ptree.hpp>
330 ++#include <boost/property_tree/json_parser.hpp>
331 +
332 + #include <wx/app.h>
333 + #include <wx/msgdlg.h>
334 +--- a/src/slic3r/GUI/NotificationManager.hpp
335 ++++ b/src/slic3r/GUI/NotificationManager.hpp
336 +@@ -6,6 +6,7 @@
337 +
338 + #include <libslic3r/ObjectID.hpp>
339 + #include <libslic3r/Technologies.hpp>
340 ++#include "libslic3r_version.h"
341 +
342 + #include <wx/time.h>
343 +
344 +--- a/src/slic3r/GUI/Search.cpp
345 ++++ b/src/slic3r/GUI/Search.cpp
346 +@@ -2,6 +2,7 @@
347 +
348 + #include <cstddef>
349 + #include <string>
350 ++#include <regex>
351 + #include <boost/algorithm/string.hpp>
352 + #include <boost/optional.hpp>
353 + #include <boost/nowide/convert.hpp>
354 +--- a/src/libslic3r/Optimize/Optimizer.hpp
355 ++++ b/src/libslic3r/Optimize/Optimizer.hpp
356 +@@ -8,5 +8,6 @@
357 + #include <functional>
358 + #include <limits>
359 + #include <cassert>
360 ++#include <optional>
361 +
362 + namespace Slic3r { namespace opt {
363
364 diff --git a/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch b/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch
365 new file mode 100644
366 index 000000000..6cb596bf0
367 --- /dev/null
368 +++ b/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch
369 @@ -0,0 +1,10 @@
370 +--- a/src/slic3r/GUI/GUI_App.cpp
371 ++++ b/src/slic3r/GUI/GUI_App.cpp
372 +@@ -837,7 +837,7 @@ bool GUI_App::on_init_inner()
373 + }
374 + wxString artist;
375 + if (!file_name.empty() && file_name != (std::string(SLIC3R_APP_NAME) + L(" icon"))) {
376 +- wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).string());
377 ++ wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).c_str());
378 + // make a bitmap with dark grey banner on the left side
379 + bmp = SplashScreen::MakeBitmap(wxBitmap(splash_screen_path, wxBITMAP_TYPE_JPEG));
380
381 diff --git a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
382 new file mode 100644
383 index 000000000..d7408fe5d
384 --- /dev/null
385 +++ b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
386 @@ -0,0 +1,13 @@
387 +--- a/version.inc
388 ++++ b/version.inc
389 +@@ -1,8 +1,8 @@
390 + # Included by CMakeLists, edited by the build script
391 + # (the version numbers are generated by the build script from the git current label)
392 +
393 +-set(SLIC3R_APP_NAME "SuperSlicer")
394 +-set(SLIC3R_APP_KEY "SuperSlicer")
395 ++set(SLIC3R_APP_NAME "SuperSlicer2.2")
396 ++set(SLIC3R_APP_KEY "SuperSlicer2.2")
397 + set(SLIC3R_VERSION "2.2.53")
398 + set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN")
399 + set(SLIC3R_RC_VERSION "2,2,53,0")
400
401 diff --git a/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch b/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch
402 new file mode 100644
403 index 000000000..74e982cad
404 --- /dev/null
405 +++ b/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch
406 @@ -0,0 +1,17 @@
407 +--- a/version.inc
408 ++++ b/version.inc
409 +@@ -2,11 +2,11 @@
410 + # (the version numbers are generated by the build script from the git current label)
411 +
412 + # name of the slicer
413 +-set(SLIC3R_APP_NAME "SuperSlicer")
414 ++set(SLIC3R_APP_NAME "SuperSlicer2.3")
415 + # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
416 +-set(SLIC3R_APP_KEY "SuperSlicer")
417 ++set(SLIC3R_APP_KEY "SuperSlicer2.3")
418 + # exe name of the slicer, should be lowercase and valid in all os
419 +-set(SLIC3R_APP_CMD "superslicer")
420 ++set(SLIC3R_APP_CMD "superslicer-2.3")
421 + # versions
422 + set(SLIC3R_VERSION "2.3.56")
423 + set(SLIC3R_VERSION_FULL "2.3.56.7")
424
425 diff --git a/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch b/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch
426 new file mode 100644
427 index 000000000..598780949
428 --- /dev/null
429 +++ b/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch
430 @@ -0,0 +1,11 @@
431 +--- a/src/slic3r/GUI/GLCanvas3D.cpp
432 ++++ b/src/slic3r/GUI/GLCanvas3D.cpp
433 +@@ -4834,5 +4833,5 @@ bool GLCanvas3D::_init_collapse_toolbar()
434 +
435 + bool GLCanvas3D::_set_current()
436 + {
437 +- return m_context != nullptr && m_canvas->SetCurrent(*m_context);
438 ++ return m_context != nullptr && _is_shown_on_screen() && m_canvas->SetCurrent(*m_context);
439 + }
440 +
441 + void GLCanvas3D::_resize(unsigned int w, unsigned int h)
442
443 diff --git a/media-gfx/superslicer/metadata.xml b/media-gfx/superslicer/metadata.xml
444 new file mode 100644
445 index 000000000..7b63c69a8
446 --- /dev/null
447 +++ b/media-gfx/superslicer/metadata.xml
448 @@ -0,0 +1,14 @@
449 +<?xml version="1.0" encoding="UTF-8"?>
450 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
451 +<pkgmetadata>
452 +<maintainer type="person">
453 + <email>egorr.berd@×××××.com</email>
454 + <name>Yahor Berdnikau</name>
455 +</maintainer>
456 +<longdescription lang="en">
457 + A mesh slicer to generated G-Code for fused-filament fabrication based on PrusaSlicer.
458 +</longdescription>
459 +<use>
460 + <flag name="profiles">Install additional 3d printer profiles.</flag>
461 +</use>
462 +</pkgmetadata>
463
464 diff --git a/media-gfx/superslicer/superslicer-2.2.53.4.ebuild b/media-gfx/superslicer/superslicer-2.2.53.4.ebuild
465 new file mode 100644
466 index 000000000..a985d7c65
467 --- /dev/null
468 +++ b/media-gfx/superslicer/superslicer-2.2.53.4.ebuild
469 @@ -0,0 +1,88 @@
470 +# Copyright 2021 Gentoo Authors
471 +# Distributed under the terms of the GNU General Public License v2
472 +
473 +EAPI=7
474 +
475 +WX_GTK_VER="3.0-gtk3"
476 +
477 +inherit xdg cmake desktop wxwidgets
478 +
479 +MY_PN="SuperSlicer"
480 +DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
481 +HOMEPAGE="https://github.com/supermerill/SuperSlicer"
482 +SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz"
483 +S="${WORKDIR}/${MY_PN}-${PV}"
484 +
485 +LICENSE="AGPL-3"
486 +SLOT="22"
487 +KEYWORDS="~amd64"
488 +IUSE="gui test"
489 +
490 +# tests fail to link with USE=-gui, bug #760096
491 +REQUIRED_USE="test? ( gui )"
492 +RESTRICT="!test? ( test )"
493 +
494 +RDEPEND="
495 + dev-cpp/tbb
496 + >=dev-libs/boost-1.73.0:=[nls,threads(+)]
497 + dev-libs/c-blosc
498 + dev-libs/cereal
499 + dev-libs/openssl
500 + >=dev-libs/miniz-2.1.0-r2
501 + >=media-gfx/openvdb-5.0.0
502 + media-libs/qhull:=
503 + media-libs/openexr:=
504 + sci-libs/libigl
505 + sci-libs/nlopt
506 + >=sci-mathematics/cgal-5.0:=
507 + sys-libs/zlib:=
508 + gui? (
509 + dev-libs/glib:2
510 + media-libs/glew:0=
511 + net-misc/curl
512 + virtual/glu
513 + virtual/opengl
514 + x11-libs/gtk+:3
515 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
516 + )
517 +"
518 +DEPEND="${RDEPEND}
519 + media-libs/qhull[static-libs]
520 + test? ( dev-cpp/gtest )
521 +"
522 +
523 +PATCHES=(
524 + "${FILESDIR}/boost-endian-${PV}.patch"
525 + "${FILESDIR}/miniz-zip-header-${PV}.patch"
526 + "${FILESDIR}/freecad-dialog-${PV}.patch"
527 + "${FILESDIR}/boost-mouse-atomic-${PV}.patch"
528 + "${FILESDIR}/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-${PV}.patch"
529 + "${FILESDIR}/version-suffix-${PV}.patch"
530 +)
531 +
532 +src_configure() {
533 + use gui && setup-wxwidgets
534 +
535 + CMAKE_BUILD_TYPE=Release
536 + local mycmakeargs=(
537 + -DSLIC3R_BUILD_TESTS=$(usex test)
538 + -DSLIC3R_FHS=1
539 + -DSLIC3R_GUI=$(usex gui)
540 + -DSLIC3R_PCH=0
541 + -DSLIC3R_WX_STABLE=1
542 + )
543 +
544 + cmake_src_configure
545 +}
546 +
547 +src_install() {
548 + cmake_src_install
549 +
550 + if use gui; then
551 + newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.2.png
552 + make_desktop_entry superslicer "SuperSlicer 2.2" "SuperSli3er_2.2" "Graphics;3DGraphics;Engineering;" \
553 + "MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
554 + "GenericName=3D Printing Software" \
555 + "Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
556 + fi
557 +}
558
559 diff --git a/media-gfx/superslicer/superslicer-2.3.56.9.ebuild b/media-gfx/superslicer/superslicer-2.3.56.9.ebuild
560 new file mode 100644
561 index 000000000..5bef37976
562 --- /dev/null
563 +++ b/media-gfx/superslicer/superslicer-2.3.56.9.ebuild
564 @@ -0,0 +1,112 @@
565 +# Copyright 2021 Gentoo Authors
566 +# Distributed under the terms of the GNU General Public License v2
567 +
568 +EAPI=7
569 +
570 +WX_GTK_VER="3.0-gtk3"
571 +
572 +inherit xdg cmake desktop wxwidgets
573 +
574 +MY_PN="SuperSlicer"
575 +DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
576 +HOMEPAGE="https://github.com/supermerill/SuperSlicer"
577 +SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
578 + profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.zip -> ${P}-profiles.zip )"
579 +S="${WORKDIR}/${MY_PN}-${PV}"
580 +
581 +LICENSE="AGPL-3"
582 +SLOT="23"
583 +KEYWORDS="~amd64"
584 +IUSE="gui test profiles"
585 +
586 +# tests fail to link with USE=-gui, bug #760096
587 +REQUIRED_USE="test? ( gui )"
588 +RESTRICT="!test? ( test )"
589 +
590 +BDEPEND="profiles? ( app-arch/unzip )"
591 +RDEPEND="
592 + dev-cpp/eigen:3
593 + dev-cpp/tbb
594 + >=dev-libs/boost-1.73.0:=[nls,threads(+)]
595 + dev-libs/cereal
596 + dev-libs/expat
597 + dev-libs/c-blosc
598 + dev-libs/gmp:=
599 + >=dev-libs/miniz-2.1.0-r2
600 + dev-libs/mpfr:=
601 + >=media-gfx/openvdb-5.0.0
602 + media-libs/ilmbase:=
603 + media-libs/libpng:0=
604 + media-libs/openexr:0=
605 + media-libs/qhull:=
606 + sci-libs/libigl
607 + sci-libs/nlopt
608 + >=sci-mathematics/cgal-5.0:=
609 + sys-apps/dbus
610 + sys-libs/zlib:=
611 + gui? (
612 + dev-libs/glib:2
613 + media-libs/glew:0=
614 + net-misc/curl
615 + virtual/glu
616 + virtual/opengl
617 + x11-libs/gtk+:3
618 + >=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
619 + )
620 +"
621 +DEPEND="${RDEPEND}
622 + media-libs/qhull[static-libs]
623 + test? ( dev-cpp/gtest )
624 +"
625 +
626 +PATCHES=(
627 + "${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
628 + "${FILESDIR}/freecad-dialog-2.2.53.4.patch"
629 + "${FILESDIR}/missing-imports-${PV}.patch"
630 + "${FILESDIR}/string-to-char-conversion-${PV}.patch"
631 + "${FILESDIR}/version-suffix-${PV}.patch"
632 + "${FILESDIR}/wxwidget-canvas-set-context-2.3.56.9.patch"
633 +)
634 +
635 +src_unpack() {
636 + unpack ${P}.tar.gz
637 + mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
638 + mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
639 + mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
640 + mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
641 +
642 + use profiles && unpack ${P}-profiles.zip &&
643 + if use profiles ; then
644 + cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles"
645 + fi
646 +}
647 +
648 +src_configure() {
649 + use gui && setup-wxwidgets
650 +
651 + CMAKE_BUILD_TYPE=Release
652 + local mycmakeargs=(
653 + -DSLIC3R_BUILD_TESTS=$(usex test)
654 + -DSLIC3R_FHS=ON
655 + -DSLIC3R_GTK=3
656 + -DSLIC3R_GUI=$(usex gui)
657 + -DSLIC3R_PCH=OFF
658 + -DSLIC3R_WX_STABLE=ON
659 + -Wno-dev
660 + )
661 +
662 + cmake_src_configure
663 +}
664 +
665 +src_install() {
666 + cmake_src_install
667 +
668 + if use gui; then
669 + newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.3.png
670 + dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
671 + make_desktop_entry superslicer "SuperSlicer 2.3" "SuperSli3er_2.3" "Graphics;3DGraphics;Engineering;" \
672 + "MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
673 + "GenericName=3D Printing Software" \
674 + "Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
675 + fi
676 +}