Non functioning superslicer / orcaslicer WIP
This commit is contained in:
Torsten Kurbad
@@ -0,0 +1,5 @@
|
||||
AUX orcaslicer-2.0.0-additional-imports-fixes.patch 1449 BLAKE2B 139e68e56db3ce2dafb8719629f518e8636c9e7c217e0921a22e3bea2e952754376bb32ac4e483c4b353ac539f96a9f89e1a7fa2513b9c3da3cd8801b3083964 SHA512 941d6fc312cfe19d8478da4e2890eb6e7d8921d7c03139dc46466a99a8fa3d0c9603383c660d7370b1e832c9ee4f43d1e7bb5a72b51be3d3885694f186bb969f
|
||||
AUX orcaslicer-2.0.0-boost.patch 5808 BLAKE2B 03c24c3427bfd2beed4d7de22357654f509ea0cfff1ed0edec8b5707883c410eee4fd297804774d524e5f3b71e84670d7af99704047c86f331a57f5867906ef1 SHA512 7d0f4f0ee63281c3c9e9b7999f5235048ee70e78193662f83045131dda2ac8e2dd1e536e2216b6a781d9ecc17b3f1c6d150445c8cefd0d4d3b4e27cdda70645b
|
||||
DIST orcaslicer-2.0.0.tar.gz 98242411 BLAKE2B 08ad6246c23a3109f9afc4972e1bef250cf12422c336196ee2d5ed5a723486be45fe727f25c5e64fc300480d8ad091590b0343f96219d005e7d0a370f336cc37 SHA512 fe24e6f601bec31fc99d805cc00ab20f61bb91c2ec299cf1f3de46bfe7f7592e83c5e320f95fba35d434f3e6b22773e940e785e83ef1e52c32a8bb83191056d9
|
||||
EBUILD orcaslicer-2.0.0.ebuild 2598 BLAKE2B 1a2ba35f9d5dd928f6eb8eccd472dc31d6ef9c5eb28abbd9baa3412ce303b7864d7b454a84cb393ae32b89e115d6836ac00d2b46d19230e7f2872355e76a5f7c SHA512 5c5f497b64e10d223cccd71aad4b0868499e9363da4ebb607c3f79bd55dc4227e2c3f9aaca2a4ad4a4c7b27b4cb48b77759dead8b42d1cd42c70bd1881a7c239
|
||||
MISC metadata.xml 407 BLAKE2B ab190b5924a411b963da85b5eae38ede8b54d9adb155e560b55e5cddd6640e04d23af943f0ed9ce1aa43d78cb423a0e2e96e35c8d32be34272a37befa4904fe4 SHA512 8a8833b58d2b948d20761af8474daf10041edbd5c8aa46d6b68405bfc609396c96c8adb0a38aa6e04e51c3416adc98b28af48461b5408954a79b571ee594d0ee
|
||||
@@ -0,0 +1,37 @@
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/GUI_App.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/GUI_App.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/GUI_App.hpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/GUI_App.hpp 2024-06-25 17:45:53.236056766 +0200
|
||||
@@ -10,6 +10,9 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <iostream>
|
||||
+#include <chrono>
|
||||
+#include <thread>
|
||||
#include "ImGuiWrapper.hpp"
|
||||
#include "ConfigWizard.hpp"
|
||||
#include "OpenGLManager.hpp"
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/HttpServer.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/HttpServer.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/HttpServer.hpp 2024-06-25 17:36:59.994325145 +0200
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/HttpServer.hpp 2024-06-25 17:46:28.676171292 +0200
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
+#include <set>
|
||||
|
||||
#define LOCALHOST_PORT 13618
|
||||
#define LOCALHOST_URL "http://localhost:"
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/Job.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/Job.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/Job.hpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/Job.hpp 2024-06-25 17:50:48.193655304 +0200
|
||||
@@ -8,6 +8,9 @@
|
||||
#include <atomic>
|
||||
#include <exception>
|
||||
#include <future>
|
||||
+#include <iostream>
|
||||
+#include <chrono>
|
||||
+#include <thread>
|
||||
|
||||
#include <wx/window.h>
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/libslic3r/PrintBase.cpp OrcaSlicer-2.0.0/src/libslic3r/PrintBase.cpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/libslic3r/PrintBase.cpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/libslic3r/PrintBase.cpp 2024-06-26 12:47:29.755499011 +0200
|
||||
@@ -79,7 +79,7 @@
|
||||
cfg.opt_string("input_filename_base") + default_ext :
|
||||
this->placeholder_parser().process(format, 0, &cfg);
|
||||
if (filename.extension().empty())
|
||||
- filename = boost::filesystem::change_extension(filename, default_ext);
|
||||
+ filename.replace_extension(default_ext);
|
||||
return filename.string();
|
||||
} catch (std::runtime_error &err) {
|
||||
throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what());
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/libslic3r/Utils.hpp OrcaSlicer-2.0.0/src/libslic3r/Utils.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/libslic3r/Utils.hpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/libslic3r/Utils.hpp 2024-06-26 12:48:46.302368118 +0200
|
||||
@@ -15,7 +15,10 @@
|
||||
|
||||
#include <boost/system/error_code.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
+#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
+#include <boost/nowide/cstdio.hpp>
|
||||
+#include <boost/nowide/fstream.hpp>
|
||||
#include <boost/date_time.hpp>
|
||||
#include "boost/date_time/posix_time/ptime.hpp"
|
||||
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/Config/Version.cpp OrcaSlicer-2.0.0/src/slic3r/Config/Version.cpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/Config/Version.cpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/Config/Version.cpp 2024-06-26 12:47:29.755499011 +0200
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <cctype>
|
||||
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
+#include <boost/filesystem/directory.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
|
||||
#include "libslic3r/libslic3r.h"
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/AuxiliaryDataViewModel.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/AuxiliaryDataViewModel.cpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/AuxiliaryDataViewModel.cpp 2024-06-26 12:47:29.758832352 +0200
|
||||
@@ -337,7 +337,7 @@
|
||||
dir_path += "\\" + src_bfs_path.filename().generic_wstring();
|
||||
|
||||
boost::system::error_code ec;
|
||||
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec))
|
||||
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec))
|
||||
continue;
|
||||
|
||||
// Update model data
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/HttpServer.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/HttpServer.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/HttpServer.hpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/HttpServer.hpp 2024-06-26 12:47:29.758832352 +0200
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <boost/beast/version.hpp>
|
||||
#include <boost/asio.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
+#include <boost/log/trivial.hpp>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.cpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.cpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.cpp 2024-06-26 12:47:29.758832352 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
// Setup auth server to receive OAuth code from callback url
|
||||
local_authorization_server.set_request_handler([this, queue](const std::string& url) -> std::shared_ptr<HttpServer::Response> {
|
||||
- if (boost::contains(url, "/callback")) {
|
||||
+ if (boost::algorithm::contains(url, "/callback")) {
|
||||
const auto code = url_get_param(url, "code");
|
||||
const auto state = url_get_param(url, "state");
|
||||
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/Jobs/OAuthJob.hpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/Jobs/OAuthJob.hpp 2024-06-26 12:47:29.758832352 +0200
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "Job.hpp"
|
||||
#include "slic3r/GUI/HttpServer.hpp"
|
||||
+#include <boost/algorithm/string.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
namespace GUI {
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/OAuthDialog.hpp OrcaSlicer-2.0.0/src/slic3r/GUI/OAuthDialog.hpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/OAuthDialog.hpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/OAuthDialog.hpp 2024-06-26 12:47:29.758832352 +0200
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "GUI_Utils.hpp"
|
||||
#include "Jobs/OAuthJob.hpp"
|
||||
#include "Jobs/Worker.hpp"
|
||||
+#include <boost/log/trivial.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
namespace GUI {
|
||||
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/RemovableDriveManager.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/RemovableDriveManager.cpp
|
||||
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/RemovableDriveManager.cpp 2024-03-30 03:10:30.000000000 +0100
|
||||
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/RemovableDriveManager.cpp 2024-06-26 12:47:29.758832352 +0200
|
||||
@@ -21,8 +21,8 @@
|
||||
#include <glob.h>
|
||||
#include <pwd.h>
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/path.hpp>
|
||||
#include <boost/system/error_code.hpp>
|
||||
-#include <boost/filesystem/convenience.hpp>
|
||||
#include <boost/process.hpp>
|
||||
#endif
|
||||
|
||||
@@ -202,7 +202,7 @@
|
||||
stat(path.c_str(), &buf);
|
||||
uid_t uid = buf.st_uid;
|
||||
if (getuid() == uid)
|
||||
- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
|
||||
+ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>3dprint@gentoo.org</email>
|
||||
<name>Gentoo 3D Printer Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/SoftFever/OrcaSlicer</bugs-to>
|
||||
<remote-id type="github">SoftFever/OrcaSlicer</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -0,0 +1,111 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
WX_GTK_VER="3.2-gtk3"
|
||||
MY_PN="OrcaSlicer"
|
||||
#SLICER_PROFILES_COMMIT="8f3bb94a9c60be9a3b40d88a36ff05ba5cf2d6a8"
|
||||
|
||||
inherit cmake wxwidgets xdg flag-o-matic
|
||||
|
||||
DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
|
||||
HOMEPAGE="https://github.com/SoftFever/OrcaSlicer/tree/main"
|
||||
SRC_URI="
|
||||
https://github.com/SoftFever/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# No dep on sci-libs/libigl, in-tree version cannot build
|
||||
# static library currently. Using bundled one.
|
||||
RDEPEND="
|
||||
dev-cpp/eigen:3
|
||||
dev-cpp/tbb:=
|
||||
dev-libs/boost:=[nls]
|
||||
dev-libs/cereal
|
||||
dev-libs/expat
|
||||
dev-libs/glib:2
|
||||
dev-libs/gmp:=
|
||||
dev-libs/mpfr:=
|
||||
dev-libs/imath:=
|
||||
>=media-gfx/openvdb-8.2:=
|
||||
net-misc/curl[adns]
|
||||
media-libs/glew:0=
|
||||
>=media-libs/glfw-3
|
||||
media-libs/libpng:0=
|
||||
media-libs/qhull:=
|
||||
sci-libs/nlopt
|
||||
sci-libs/opencascade:=
|
||||
>=sci-mathematics/cgal-5.0:=
|
||||
sys-apps/dbus
|
||||
sys-libs/zlib:=
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
media-libs/qhull[static-libs]
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-boost.patch"
|
||||
"${FILESDIR}/${P}-additional-imports-fixes.patch"
|
||||
)
|
||||
# "${FILESDIR}/${P}-cereal.patch"
|
||||
# "${FILESDIR}/${P}-dont-install-angelscript.patch"
|
||||
# "${FILESDIR}/${P}-missing-includes-fix.patch"
|
||||
# "${FILESDIR}/${P}-openexr3.patch"
|
||||
# "${FILESDIR}/${P}-wxgtk3-wayland-fix.patch"
|
||||
# "${FILESDIR}/${P}-relax-OpenCASCADE-dep.patch"
|
||||
# "${FILESDIR}/${P}-link-occtwrapper-statically.patch"
|
||||
# "${FILESDIR}/${P}-fix-compilation-error-gnu17.patch"
|
||||
# "${FILESDIR}/${P}-libnest2d-link-xcb.patch"
|
||||
# "${FILESDIR}/${P}-boost-replace-load-string-file.patch"
|
||||
#)
|
||||
# "${FILESDIR}/${P}-gcodeviewer-symlink-fix.patch"
|
||||
# "${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
#src_unpack() {
|
||||
# default
|
||||
#
|
||||
# mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
|
||||
#}
|
||||
|
||||
src_configure() {
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
setup-wxwidgets
|
||||
|
||||
local mycmakeargs=(
|
||||
-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
|
||||
|
||||
-DSLIC3R_BUILD_TESTS=$(usex test)
|
||||
-DSLIC3R_FHS=ON
|
||||
-DSLIC3R_GTK=3
|
||||
-DSLIC3R_GUI=ON
|
||||
-DSLIC3R_PCH=OFF
|
||||
-DSLIC3R_STATIC=OFF
|
||||
-DORCA_TOOLS=ON
|
||||
-Wno-dev
|
||||
)
|
||||
# -DSLIC3R_WX_STABLE=ON
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
# rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
|
||||
}
|
||||
Reference in New Issue
Block a user