mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-18 19:43:24 -04:00
media-gfx/superslicer: drop superslicer-2.3.56.9 version
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
|
||||
DIST superslicer-2.3.56.9-profiles.tar.gz 12157428 BLAKE2B 2ce1a98987c601fc979f895e6902b7e43db336eb0d44bb1f38370969d9c514a29430d5db32fe2766f6887a20970f49aa74a573862eefeeaab63cfff482bdd729 SHA512 87fbd56a104d205f2d32f9e71e6c679fb63a48aa74387c87fd551dad47709e5491e7ce597d0b0f8bc448191674a8f9e71d240a8f7ade35cf359e3bf1d5059213
|
||||
DIST superslicer-2.3.56.9.tar.gz 32260311 BLAKE2B 2da3201d789dd66a4a26c365b020f67dd5f43a71b9616681eb5dfed1ec759943398ce82fa2c8d5fd9a4f66a6887c25f0f86286ec4f52364a97a29cee548c3f0c SHA512 05c57765770889dc365eb721a2e6491f16de5a03c03493a682c49b769435d6db6e0ad52c0cfced7aa402dc751e4fdcbfc0623fa82d8431e45a590e64b12b6769
|
||||
DIST superslicer-2.3.57.7-profiles.tar.gz 12157428 BLAKE2B 2ce1a98987c601fc979f895e6902b7e43db336eb0d44bb1f38370969d9c514a29430d5db32fe2766f6887a20970f49aa74a573862eefeeaab63cfff482bdd729 SHA512 87fbd56a104d205f2d32f9e71e6c679fb63a48aa74387c87fd551dad47709e5491e7ce597d0b0f8bc448191674a8f9e71d240a8f7ade35cf359e3bf1d5059213
|
||||
DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65
|
||||
|
||||
@@ -1,118 +0,0 @@
|
||||
--- 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/Format/CWS.cpp
|
||||
+++ b/src/libslic3r/Format/CWS.cpp
|
||||
@@ -1,6 +1,8 @@
|
||||
#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/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/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/GUI_ObjectList.cpp
|
||||
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "Selection.hpp"
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
#include "slic3r/Utils/FixModelByWin10.hpp"
|
||||
|
||||
#ifdef __WXMSW__
|
||||
--- 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>
|
||||
--- a/src/slic3r/GUI/3DBed.cpp
|
||||
+++ b/src/slic3r/GUI/3DBed.cpp
|
||||
@@ -16,7 +16,11 @@
|
||||
|
||||
#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/NotificationManager.hpp
|
||||
+++ b/src/slic3r/GUI/NotificationManager.hpp
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include <libslic3r/ObjectID.hpp>
|
||||
#include <libslic3r/Technologies.hpp>
|
||||
+#include "libslic3r_version.h"
|
||||
|
||||
#include <wx/time.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>
|
||||
--- a/src/libslic3r/Optimize/Optimizer.hpp
|
||||
+++ b/src/libslic3r/Optimize/Optimizer.hpp
|
||||
@@ -8,5 +8,6 @@
|
||||
#include <functional>
|
||||
#include <limits>
|
||||
#include <cassert>
|
||||
+#include <optional>
|
||||
|
||||
namespace Slic3r { namespace opt {
|
||||
@@ -1,17 +0,0 @@
|
||||
--- a/version.inc
|
||||
+++ b/version.inc
|
||||
@@ -2,11 +2,11 @@
|
||||
# (the version numbers are generated by the build script from the git current label)
|
||||
|
||||
# name of the slicer
|
||||
-set(SLIC3R_APP_NAME "SuperSlicer")
|
||||
+set(SLIC3R_APP_NAME "SuperSlicer2.3")
|
||||
# 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.56")
|
||||
set(SLIC3R_VERSION_FULL "2.3.56.7")
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/slic3r/GUI/GLCanvas3D.cpp
|
||||
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
|
||||
@@ -4834,5 +4833,5 @@ bool GLCanvas3D::_init_collapse_toolbar()
|
||||
|
||||
bool GLCanvas3D::_set_current()
|
||||
{
|
||||
- return m_context != nullptr && m_canvas->SetCurrent(*m_context);
|
||||
+ return m_context != nullptr && _is_shown_on_screen() && m_canvas->SetCurrent(*m_context);
|
||||
}
|
||||
|
||||
void GLCanvas3D::_resize(unsigned int w, unsigned int h)
|
||||
@@ -1,112 +0,0 @@
|
||||
# Copyright 2021 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.tar.gz -> ${P}-profiles.tar.gz )"
|
||||
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 )"
|
||||
|
||||
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-${PV}.patch"
|
||||
"${FILESDIR}/version-suffix-${PV}.patch"
|
||||
"${FILESDIR}/wxwidget-canvas-set-context-2.3.56.9.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_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.tar.gz &&
|
||||
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/Slic3r_128px.png SuperSli3er_2.3.png
|
||||
dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
|
||||
make_desktop_entry superslicer "SuperSlicer 2.3" "SuperSli3er_2.3" "Graphics;3DGraphics;Engineering;" \
|
||||
"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
|
||||
"GenericName=3D Printing Software" \
|
||||
"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user