mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-20 20:43:09 -04:00
media-gfx/superslicer: drop 2.3.57.7-r1
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
@@ -5,7 +5,5 @@ DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2
|
||||
DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
|
||||
DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
|
||||
DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59
|
||||
DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
|
||||
DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65
|
||||
DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
|
||||
DIST superslicer-2.3.57.9.tar.gz 32406027 BLAKE2B 66c6c5cfb044165dd8cce3030fc9e6c29df078aaca94dfecef4c5943a21667fc9dd12d88e821952382e7556775119daf221030b2bb25fc1e52071c4f367fe041 SHA512 bf421afa55ad7d1c3eafa8dc15efb20ab463e21b78f5e03d188f68d018a7b32cd24c2163974d90eff80e1ebb39a669b3e877a614e1040bc31c7160cca7ffc554
|
||||
|
||||
@@ -1,188 +0,0 @@
|
||||
--- a/src/libslic3r/GCode.cpp
|
||||
+++ b/src/libslic3r/GCode.cpp
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <math.h>
|
||||
#include <string_view>
|
||||
#include <map>
|
||||
+#include <unordered_set>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/find.hpp>
|
||||
--- a/src/libslic3r/GCodeWriter.cpp
|
||||
+++ b/src/libslic3r/GCodeWriter.cpp
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <assert.h>
|
||||
+#include <boost/lexical_cast.hpp>
|
||||
|
||||
#define FLAVOR_IS(val) this->config.gcode_flavor.value == val
|
||||
#define FLAVOR_IS_NOT(val) this->config.gcode_flavor.value != val
|
||||
--- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
|
||||
+++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
|
||||
@@ -11,5 +11,6 @@
|
||||
|
||||
#include <numeric>
|
||||
#include <unordered_set>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
--- a/src/libslic3r/MedialAxis.cpp
|
||||
+++ b/src/libslic3r/MedialAxis.cpp
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <list>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
int count_error = 0;
|
||||
--- a/src/libslic3r/Format/CWS.cpp
|
||||
+++ b/src/libslic3r/Format/CWS.cpp
|
||||
@@ -1,5 +1,7 @@
|
||||
#include "libslic3r/Format/CWS.hpp"
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
#include "libslic3r/Time.hpp"
|
||||
+#include <boost/filesystem.hpp>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
--- a/src/libslic3r/PrintBase.cpp
|
||||
+++ b/src/libslic3r/PrintBase.cpp
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "Exception.hpp"
|
||||
#include "PrintBase.hpp"
|
||||
|
||||
+#include <regex>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
--- a/src/libslic3r/PrintObject.cpp
|
||||
+++ b/src/libslic3r/PrintObject.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "Fill/FillAdaptive.hpp"
|
||||
#include "Format/STL.hpp"
|
||||
|
||||
+#include <chrono>
|
||||
#include <utility>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <float.h>
|
||||
--- a/src/libslic3r/AppConfig.cpp
|
||||
+++ b/src/libslic3r/AppConfig.cpp
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
+#include <boost/locale/generator.hpp>
|
||||
#include <boost/nowide/cenv.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
#include <boost/property_tree/ini_parser.hpp>
|
||||
--- a/src/libslic3r/PlaceholderParser.cpp
|
||||
+++ b/src/libslic3r/PlaceholderParser.cpp
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <map>
|
||||
+#include <regex>
|
||||
#ifdef _MSC_VER
|
||||
#include <stdlib.h> // provides **_environ
|
||||
#else
|
||||
@@ -26,6 +27,7 @@
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/nowide/convert.hpp>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
|
||||
// Spirit v2.5 allows you to suppress automatic generation
|
||||
// of predefined terminals to speed up complation. With
|
||||
--- a/src/slic3r/GUI/Preferences.cpp
|
||||
+++ b/src/slic3r/GUI/Preferences.cpp
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "Plater.hpp"
|
||||
#include "I18N.hpp"
|
||||
#include "libslic3r/AppConfig.hpp"
|
||||
+#include <boost/filesystem.hpp>
|
||||
#include <wx/notebook.h>
|
||||
|
||||
namespace Slic3r {
|
||||
--- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp
|
||||
+++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "GUI.hpp"
|
||||
#include "GUI_ObjectList.hpp"
|
||||
#include "Tab.hpp"
|
||||
+#include <boost/filesystem.hpp>
|
||||
#include <wx/scrolwin.h>
|
||||
#include <wx/display.h>
|
||||
#include <wx/file.h>
|
||||
--- a/src/slic3r/GUI/Tab.cpp
|
||||
+++ b/src/slic3r/GUI/Tab.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <wx/bmpcbox.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
+#include <wx/collpane.h>
|
||||
#include <wx/treectrl.h>
|
||||
#include <wx/imaglist.h>
|
||||
#include <wx/settings.h>
|
||||
@@ -33,6 +34,7 @@
|
||||
#include <boost/algorithm/string/replace.hpp>#include <boost/algorithm/string/trim.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
+#include <boost/lexical_cast.hpp>
|
||||
#include "wxExtensions.hpp"
|
||||
#include "PresetComboBoxes.hpp"
|
||||
#include <wx/wupdlock.h>
|
||||
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
|
||||
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
|
||||
@@ -15,4 +15,5 @@
|
||||
#include "Selection.hpp"
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
#include "slic3r/Utils/FixModelByWin10.hpp"
|
||||
|
||||
#ifdef __WXMSW__
|
||||
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/stattext.h>
|
||||
--- a/src/slic3r/GUI/3DBed.cpp
|
||||
+++ b/src/slic3r/GUI/3DBed.cpp
|
||||
@@ -16,6 +16,10 @@
|
||||
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
+#include <boost/locale/generator.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
+#include <boost/property_tree/ini_parser.hpp>
|
||||
+#include <boost/property_tree/ptree.hpp>
|
||||
+#include <boost/nowide/fstream.hpp>
|
||||
|
||||
static const float GROUND_Z = -0.02f;
|
||||
--- a/src/slic3r/Utils/PresetUpdater.cpp
|
||||
+++ b/src/slic3r/Utils/PresetUpdater.cpp
|
||||
@@ -12,6 +12,8 @@
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
+#include <boost/property_tree/ptree.hpp>
|
||||
+#include <boost/property_tree/json_parser.hpp>
|
||||
|
||||
#include <wx/app.h>
|
||||
#include <wx/msgdlg.h>
|
||||
--- a/src/slic3r/GUI/Search.cpp
|
||||
+++ b/src/slic3r/GUI/Search.cpp
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
+#include <regex>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <boost/nowide/convert.hpp>
|
||||
@@ -1,38 +0,0 @@
|
||||
--- a/version.inc
|
||||
+++ b/version.inc
|
||||
@@ -4,9 +4,9 @@
|
||||
# name of the slicer
|
||||
set(SLIC3R_APP_NAME "SuperSlicer")
|
||||
# Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
|
||||
-set(SLIC3R_APP_KEY "SuperSlicer")
|
||||
+set(SLIC3R_APP_KEY "SuperSlicer2.3")
|
||||
# exe name of the slicer, should be lowercase and valid in all os
|
||||
-set(SLIC3R_APP_CMD "superslicer")
|
||||
+set(SLIC3R_APP_CMD "superslicer-2.3")
|
||||
# versions
|
||||
set(SLIC3R_VERSION "2.3.57")
|
||||
set(SLIC3R_VERSION_FULL "2.3.57.7")
|
||||
--- a/src/platform/unix/Gcodeviewer.desktop.in
|
||||
+++ b/src/platform/unix/Gcodeviewer.desktop.in
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-Name=@GCODEVIEWER_APP_NAME@
|
||||
+Name=@GCODEVIEWER_APP_KEY@
|
||||
Comment=G-code viewer of Slic3r
|
||||
Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
|
||||
Icon=@GCODEVIEWER_APP_KEY@
|
||||
--- a/src/platform/unix/Slic3r.desktop.in
|
||||
+++ b/src/platform/unix/Slic3r.desktop.in
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-Name=@SLIC3R_APP_NAME@
|
||||
+Name=@SLIC3R_APP_KEY@
|
||||
GenericName=3D Printing Software
|
||||
Comment=G-code generator for 3D printers
|
||||
Icon=@SLIC3R_APP_KEY@
|
||||
@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
|
||||
Categories=Graphics;3DGraphics;Engineering;
|
||||
Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
|
||||
StartupNotify=false
|
||||
-StartupWMClass=@SLIC3R_APP_KEY@
|
||||
+StartupWMClass=@SLIC3R_APP_NAME@
|
||||
@@ -1,109 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
inherit xdg cmake desktop wxwidgets
|
||||
|
||||
MY_PN="SuperSlicer"
|
||||
DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
|
||||
HOMEPAGE="https://github.com/supermerill/SuperSlicer"
|
||||
SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||
profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.zip -> ${P}-profiles.zip )"
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="23"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="gui test profiles"
|
||||
|
||||
# tests fail to link with USE=-gui, bug #760096
|
||||
REQUIRED_USE="test? ( gui )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="profiles? ( app-arch/unzip )"
|
||||
RDEPEND="
|
||||
dev-cpp/eigen:3
|
||||
dev-cpp/tbb
|
||||
>=dev-libs/boost-1.73.0:=[nls,threads(+)]
|
||||
dev-libs/cereal
|
||||
dev-libs/expat
|
||||
dev-libs/c-blosc
|
||||
dev-libs/gmp:=
|
||||
>=dev-libs/miniz-2.1.0-r2
|
||||
dev-libs/mpfr:=
|
||||
>=media-gfx/openvdb-5.0.0
|
||||
media-libs/ilmbase:=
|
||||
media-libs/libpng:0=
|
||||
media-libs/openexr:0=
|
||||
media-libs/qhull:=
|
||||
sci-libs/libigl
|
||||
sci-libs/nlopt
|
||||
>=sci-mathematics/cgal-5.0:=
|
||||
sys-apps/dbus
|
||||
sys-libs/zlib:=
|
||||
gui? (
|
||||
dev-libs/glib:2
|
||||
media-libs/glew:0=
|
||||
net-misc/curl
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
x11-libs/gtk+:3
|
||||
>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
media-libs/qhull[static-libs]
|
||||
test? ( dev-cpp/gtest )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
|
||||
"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
|
||||
"${FILESDIR}/missing-imports-${PV}.patch"
|
||||
"${FILESDIR}/string-to-char-conversion-2.3.56.9.patch"
|
||||
"${FILESDIR}/version-suffix-${PV}.patch"
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.gz
|
||||
mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
|
||||
mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
|
||||
mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
|
||||
mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
|
||||
mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
|
||||
cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
|
||||
|
||||
use profiles && unpack ${P}-profiles.zip &&
|
||||
if use profiles ; then
|
||||
cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use gui && setup-wxwidgets
|
||||
|
||||
CMAKE_BUILD_TYPE=Release
|
||||
local mycmakeargs=(
|
||||
-DSLIC3R_BUILD_TESTS=$(usex test)
|
||||
-DSLIC3R_FHS=ON
|
||||
-DSLIC3R_GTK=3
|
||||
-DSLIC3R_GUI=$(usex gui)
|
||||
-DSLIC3R_PCH=OFF
|
||||
-DSLIC3R_WX_STABLE=ON
|
||||
-Wno-dev
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use gui; then
|
||||
newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
|
||||
dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user