PrusaSlicer: remove package.
Unusable, immediately SIGSEGV. Unpackageable, depends on a spaghetti mess of vendored dependencies and dependencies downloaded by cmake at build time. Considering that the package straight up does not work, I doubt that anyone will be affected by this. Available as a flatpak, so there's an easy alternative.
This commit is contained in:
Daniel Martinez
Andrew J. Hesford
parent
d1d9aa54fb
commit
20b3bfce58
|
|
@ -1,4 +0,0 @@
|
||||||
Slic3rPE has been renamed to PrusaSlicer
|
|
||||||
|
|
||||||
The binary executable has been renamed from
|
|
||||||
/usr/bin/slic3r-pe to /usr/bin/prusa-slicer
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jasper Chan <jasperchan515@gmail.com>
|
|
||||||
Date: Mon, 27 May 2019 18:54:59 -0700
|
|
||||||
Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
|
|
||||||
|
|
||||||
---
|
|
||||||
src/slic3r/Utils/Serial.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
|
|
||||||
index 601719b50..43dab2390 100644
|
|
||||||
--- a/src/slic3r/Utils/Serial.cpp
|
|
||||||
+++ b/src/slic3r/Utils/Serial.cpp
|
|
||||||
@@ -42,7 +42,7 @@
|
|
||||||
#ifndef _WIN32
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
- #include <sys/unistd.h>
|
|
||||||
+ #include <unistd.h>
|
|
||||||
#include <sys/select.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
--- a/src/libslic3r/Thread.cpp 2021-01-24 13:50:00.469444149 +0100
|
|
||||||
+++ b/src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100
|
|
||||||
@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef __GLIBC__
|
|
||||||
+thread_local char current_thread_name[16] = { 0 };
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
bool set_current_thread_name(const char *thread_name)
|
|
||||||
{
|
|
||||||
+#ifndef __GLIBC__
|
|
||||||
+ strncpy(current_thread_name, thread_name, 15);
|
|
||||||
+#endif
|
|
||||||
pthread_setname_np(pthread_self(), thread_name);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::optional<std::string> get_current_thread_name()
|
|
||||||
{
|
|
||||||
+#ifdef __GLIBC__
|
|
||||||
char buf[16];
|
|
||||||
return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
|
|
||||||
+#else
|
|
||||||
+ return std::string(current_thread_name);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
||||||
index 2364c5624..c977bee4c 100644
|
|
||||||
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
||||||
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
||||||
@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
|
|
||||||
// Always fill in the "printhost_port" combo box from the config and select it.
|
|
||||||
{
|
|
||||||
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
|
|
||||||
- choice->set_values({ m_config->opt_string("printhost_port") });
|
|
||||||
+ const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
|
|
||||||
+ choice->set_values(printhost_port);
|
|
||||||
choice->set_selection();
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
|
|
||||||
index 2d00674c0..011ef7cfd 100644
|
|
||||||
--- a/src/slic3r/GUI/Plater.cpp
|
|
||||||
+++ b/src/slic3r/GUI/Plater.cpp
|
|
||||||
@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
|
|
||||||
|
|
||||||
p->reset();
|
|
||||||
|
|
||||||
- if (! load_files({ into_path(filename) }).empty()) {
|
|
||||||
+ boost::filesystem::path full_path = into_path(filename);
|
|
||||||
+ if (! load_files({ full_path }, true, true).empty()) {
|
|
||||||
// At least one file was loaded.
|
|
||||||
p->set_project_filename(filename);
|
|
||||||
// Save the names of active presets and project specific config into ProjectDirtyStateManager.
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
Index: PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-2.4.2.orig/src/slic3r/GUI/PrintHostDialogs.cpp
|
|
||||||
+++ PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
|
|
||||||
@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
|
|
||||||
if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos)
|
|
||||||
m_valid_suffix = recent_path.substr(extension_start);
|
|
||||||
// .gcode suffix control
|
|
||||||
- auto validate_path = [this](const wxString &path) -> bool {
|
|
||||||
- if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
|
|
||||||
+ auto validate_path = [this](const wxString &apath) -> bool {
|
|
||||||
+ if (! apath.Lower().EndsWith(m_valid_suffix.Lower())) {
|
|
||||||
MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
|
|
||||||
if (msg_wingow.ShowModal() == wxID_NO)
|
|
||||||
return false;
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
|
|
||||||
+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
|
|
||||||
@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
|
|
||||||
target_link_libraries(libslic3r
|
|
||||||
libnest2d
|
|
||||||
admesh
|
|
||||||
- cereal
|
|
||||||
libigl
|
|
||||||
miniz
|
|
||||||
boost_libs
|
|
||||||
Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
|
|
||||||
+++ PrusaSlicer-2.4.2/src/CMakeLists.txt
|
|
||||||
@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE)
|
|
||||||
set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
-target_link_libraries(PrusaSlicer libslic3r cereal)
|
|
||||||
+target_link_libraries(PrusaSlicer libslic3r)
|
|
||||||
|
|
||||||
if (APPLE)
|
|
||||||
# add_compile_options(-stdlib=libc++)
|
|
||||||
Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
|
|
||||||
+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
|
|
||||||
@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
|
|
||||||
|
|
||||||
encoding_check(libslic3r_gui)
|
|
||||||
|
|
||||||
-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
|
|
||||||
+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
|
|
||||||
|
|
||||||
if (MSVC)
|
|
||||||
target_link_libraries(libslic3r_gui Setupapi.lib)
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
get_prerequisites will go straight to run ldd on the libraries.
|
|
||||||
|
|
||||||
get_prerequisites supports objdump, but only on Windows
|
|
||||||
--- a/cmake/modules/FindOpenVDB.cmake
|
|
||||||
+++ b/cmake/modules/FindOpenVDB.cmake
|
|
||||||
@@ -381,19 +381,6 @@ set(_EXCLUDE_SYSTEM_PREREQUISITES 1)
|
|
||||||
set(_RECURSE_PREREQUISITES 0)
|
|
||||||
set(_OPENVDB_PREREQUISITE_LIST)
|
|
||||||
|
|
||||||
-if(NOT OPENVDB_USE_STATIC_LIBS)
|
|
||||||
-get_prerequisites(${OpenVDB_openvdb_LIBRARY}
|
|
||||||
- _OPENVDB_PREREQUISITE_LIST
|
|
||||||
- ${_EXCLUDE_SYSTEM_PREREQUISITES}
|
|
||||||
- ${_RECURSE_PREREQUISITES}
|
|
||||||
- ""
|
|
||||||
- "${SYSTEM_LIBRARY_PATHS}"
|
|
||||||
-)
|
|
||||||
-endif()
|
|
||||||
-
|
|
||||||
-unset(_EXCLUDE_SYSTEM_PREREQUISITES)
|
|
||||||
-unset(_RECURSE_PREREQUISITES)
|
|
||||||
-
|
|
||||||
# As the way we resolve optional libraries relies on library file names, use
|
|
||||||
# the configuration options from the main CMakeLists.txt to allow users
|
|
||||||
# to manually identify the requirements of OpenVDB builds if they know them.
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
|
|
||||||
+++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
|
|
||||||
@@ -19,7 +19,7 @@ include(GenerateExportHeader)
|
|
||||||
|
|
||||||
generate_export_header(OCCTWrapper)
|
|
||||||
|
|
||||||
-find_package(OpenCASCADE 7.6.2 REQUIRED)
|
|
||||||
+find_package(OpenCASCADE REQUIRED)
|
|
||||||
|
|
||||||
set(OCCT_LIBS
|
|
||||||
TKXDESTEP
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Robert Schiele <rschiele@gmail.com>
|
|
||||||
Date: Fri, 5 May 2023 20:39:46 +0200
|
|
||||||
Subject: [PATCH] add missing includes of <cstdint> (PR #10499)
|
|
||||||
|
|
||||||
---
|
|
||||||
deps/OpenEXR/OpenEXR.cmake | 3 ++-
|
|
||||||
deps/OpenEXR/OpenEXR.patch | 36 +++++++++++++++++++++++++++++++++
|
|
||||||
src/libslic3r/PNGReadWrite.hpp | 1 +
|
|
||||||
4 files changed, 40 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 deps/OpenEXR/OpenEXR.patch
|
|
||||||
|
|
||||||
diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
|
|
||||||
index 046223fed9e..094965d0421 100644
|
|
||||||
--- a/deps/OpenEXR/OpenEXR.cmake
|
|
||||||
+++ b/deps/OpenEXR/OpenEXR.cmake
|
|
||||||
@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
|
|
||||||
URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
|
|
||||||
DEPENDS ${ZLIB_PKG}
|
|
||||||
GIT_TAG v2.5.5
|
|
||||||
+ PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
|
|
||||||
CMAKE_ARGS
|
|
||||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
|
||||||
-DBUILD_TESTING=OFF
|
|
||||||
@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
|
|
||||||
|
|
||||||
if (MSVC)
|
|
||||||
add_debug_dep(dep_OpenEXR)
|
|
||||||
-endif ()
|
|
||||||
\ No newline at end of file
|
|
||||||
+endif ()
|
|
||||||
diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..22adbd27784
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/deps/OpenEXR/OpenEXR.patch
|
|
||||||
@@ -0,0 +1,36 @@
|
|
||||||
+diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
|
||||||
+index 59d1d5d1..585a3e65 100644
|
|
||||||
+--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
|
||||||
++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
|
||||||
+@@ -159,6 +159,7 @@
|
|
||||||
+ #include <limits>
|
|
||||||
+
|
|
||||||
+ #include <cstddef>
|
|
||||||
++#include <cstdint>
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ // Windows specific addition to prevent the indirect import of the redefined min/max macros
|
|
||||||
+diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
|
|
||||||
+index 271849b7..165fac58 100644
|
|
||||||
+--- a/OpenEXR/IlmImf/ImfHuf.cpp
|
|
||||||
++++ b/OpenEXR/IlmImf/ImfHuf.cpp
|
|
||||||
+@@ -53,6 +53,7 @@
|
|
||||||
+ #include <cstring>
|
|
||||||
+ #include <cassert>
|
|
||||||
+ #include <algorithm>
|
|
||||||
++#include <cstdint>
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ using namespace std;
|
|
||||||
+diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
|
|
||||||
+index d2c84787..4b487940 100644
|
|
||||||
+--- a/OpenEXR/IlmImf/ImfMisc.cpp
|
|
||||||
++++ b/OpenEXR/IlmImf/ImfMisc.cpp
|
|
||||||
+@@ -40,6 +40,7 @@
|
|
||||||
+ //
|
|
||||||
+ //-----------------------------------------------------------------------------
|
|
||||||
+
|
|
||||||
++#include <cstdint>
|
|
||||||
+ #include <ImfMisc.h>
|
|
||||||
+ #include <ImfHeader.h>
|
|
||||||
+ #include <ImfAttribute.h>
|
|
||||||
diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
|
|
||||||
index 01e1f474500..399c6224382 100644
|
|
||||||
--- a/src/libslic3r/PNGReadWrite.hpp
|
|
||||||
+++ b/src/libslic3r/PNGReadWrite.hpp
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include <istream>
|
|
||||||
+#include <cstdint>
|
|
||||||
|
|
||||||
namespace Slic3r { namespace png {
|
|
||||||
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
--- a/src/hints/HintsToPot.cpp
|
|
||||||
+++ b/src/hints/HintsToPot.cpp
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
+#include <boost/filesystem/fstream.hpp>
|
|
||||||
#include <boost/dll.hpp>
|
|
||||||
#include <boost/property_tree/ini_parser.hpp>
|
|
||||||
#include <boost/nowide/fstream.hpp>
|
|
||||||
--- a/tests/fff_print/test_data.cpp
|
|
||||||
+++ b/tests/fff_print/test_data.cpp
|
|
||||||
@@ -8,6 +8,7 @@
|
|
||||||
#include "libslic3r/Format/STL.hpp"
|
|
||||||
|
|
||||||
#include <cstdlib>
|
|
||||||
+#include <fstream>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#include <boost/nowide/cstdio.hpp>
|
|
||||||
--- a/src/slic3r/GUI/GUI_App.cpp
|
|
||||||
+++ b/src/slic3r/GUI/GUI_App.cpp
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
#include <algorithm>
|
|
||||||
#include <iterator>
|
|
||||||
#include <exception>
|
|
||||||
+#include <fstream>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <regex>
|
|
||||||
#include <string_view>
|
|
||||||
--- a/src/slic3r/GUI/HintNotification.cpp
|
|
||||||
+++ b/src/slic3r/GUI/HintNotification.cpp
|
|
||||||
@@ -16,6 +16,7 @@
|
|
||||||
|
|
||||||
#include <boost/algorithm/string/replace.hpp>
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
+#include <boost/filesystem/fstream.hpp>
|
|
||||||
#include <boost/nowide/fstream.hpp>
|
|
||||||
#include <boost/log/trivial.hpp>
|
|
||||||
#include <boost/property_tree/ini_parser.hpp>
|
|
||||||
--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
|
|
||||||
+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
#include "libslic3r/Platform.hpp"
|
|
||||||
#include "libslic3r/Config.hpp"
|
|
||||||
|
|
||||||
+#include <fstream>
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
#include <boost/log/trivial.hpp>
|
|
||||||
#include <boost/dll/runtime_symbol_info.hpp>
|
|
||||||
@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
|
|
||||||
|
|
||||||
} // namespace GUI
|
|
||||||
} // namespace Slic3r
|
|
||||||
-#endif // __linux__
|
|
||||||
\ No newline at end of file
|
|
||||||
+#endif // __linux__
|
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
|
|
||||||
--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 2021-12-21 15:57:35.000000000 +0000
|
|
||||||
+++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake 2022-02-11 19:27:12.105404186 +0000
|
|
||||||
@@ -347,28 +347,10 @@ macro(just_fail msg)
|
|
||||||
return()
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
-find_package(IlmBase QUIET)
|
|
||||||
-if(NOT IlmBase_FOUND)
|
|
||||||
- pkg_check_modules(IlmBase QUIET IlmBase)
|
|
||||||
-endif()
|
|
||||||
-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
|
|
||||||
- message(STATUS "Falling back to IlmBase found by pkg-config...")
|
|
||||||
-
|
|
||||||
- find_library(IlmHalf_LIBRARY NAMES Half)
|
|
||||||
- if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
|
|
||||||
- just_fail("IlmBase::Half can not be found!")
|
|
||||||
- endif()
|
|
||||||
-
|
|
||||||
- add_library(IlmBase::Half UNKNOWN IMPORTED)
|
|
||||||
- set_target_properties(IlmBase::Half PROPERTIES
|
|
||||||
- IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
|
|
||||||
- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
|
|
||||||
-elseif(NOT IlmBase_FOUND)
|
|
||||||
- just_fail("IlmBase::Half can not be found!")
|
|
||||||
-endif()
|
|
||||||
find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
|
|
||||||
find_package(ZLIB ${_quiet} ${_required})
|
|
||||||
find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
|
|
||||||
+find_package(Imath CONFIG)
|
|
||||||
|
|
||||||
# Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
|
|
||||||
# which we can query for optional deps. This basically runs ldd/otoll/objdump
|
|
||||||
@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
|
|
||||||
set(OpenVDB_USES_LOG4CPLUS ON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
- string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
|
|
||||||
+ string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
|
|
||||||
if(NOT ${_HAS_DEP} EQUAL -1)
|
|
||||||
set(OpenVDB_USES_ILM ON)
|
|
||||||
endif()
|
|
||||||
@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
|
|
||||||
find_package(Log4cplus ${_quiet} ${_required})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-if(OpenVDB_USES_ILM)
|
|
||||||
- find_package(IlmBase ${_quiet} ${_required})
|
|
||||||
-endif()
|
|
||||||
-
|
|
||||||
-if(OpenVDB_USES_EXR)
|
|
||||||
+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
|
|
||||||
find_package(OpenEXR ${_quiet} ${_required})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
@@ -471,7 +449,7 @@ endif()
|
|
||||||
set(_OPENVDB_VISIBLE_DEPENDENCIES
|
|
||||||
Boost::iostreams
|
|
||||||
Boost::system
|
|
||||||
- IlmBase::Half
|
|
||||||
+ Imath::Imath
|
|
||||||
)
|
|
||||||
|
|
||||||
set(_OPENVDB_DEFINITIONS)
|
|
||||||
@@ -481,10 +459,7 @@ endif()
|
|
||||||
|
|
||||||
if(OpenVDB_USES_EXR)
|
|
||||||
list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
|
|
||||||
- IlmBase::IlmThread
|
|
||||||
- IlmBase::Iex
|
|
||||||
- IlmBase::Imath
|
|
||||||
- OpenEXR::IlmImf
|
|
||||||
+ OpenEXR::OpenEXR
|
|
||||||
)
|
|
||||||
list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
|
|
||||||
endif()
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
# Template file for 'PrusaSlicer'
|
|
||||||
pkgname=PrusaSlicer
|
|
||||||
version=2.5.2
|
|
||||||
revision=5
|
|
||||||
build_style=cmake
|
|
||||||
build_helper="qemu cmake-wxWidgets-gtk3"
|
|
||||||
# Pre-Compiled Headers seems to be slower
|
|
||||||
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
|
|
||||||
-DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
|
|
||||||
hostmakedepends="pkg-config"
|
|
||||||
makedepends="boost-devel cereal cgal-devel dbus-devel eigen glew-devel
|
|
||||||
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
|
|
||||||
libpng-devel nlopt-devel openvdb-devel tbb-devel mpfr-devel c-blosc-devel
|
|
||||||
libopenexr-devel wxWidgets-gtk3-devel occt-devel"
|
|
||||||
short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
|
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
|
||||||
license="GPL-3.0-or-later"
|
|
||||||
homepage="https://www.prusa3d.com/prusaslicer/"
|
|
||||||
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
|
|
||||||
checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
|
|
||||||
|
|
||||||
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
|
||||||
|
|
||||||
if [ -z "${XBPS_CHECK_PKGS}" ]; then
|
|
||||||
configure_args+=" -DSLIC3R_BUILD_TESTS=OFF"
|
|
||||||
fi
|
|
||||||
|
|
||||||
post_extract() {
|
|
||||||
# Mark tests that fail on certain targets
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
|
||||||
*-musl)
|
|
||||||
vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \
|
|
||||||
-e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/'
|
|
||||||
;;
|
|
||||||
i686*)
|
|
||||||
vsed -i tests/libslic3r/test_voronoi.cpp \
|
|
||||||
-e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/'
|
|
||||||
vsed -i tests/fff_print/test_trianglemesh.cpp \
|
|
||||||
-e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
# rm -rf src/boost
|
|
||||||
}
|
|
||||||
|
|
||||||
Slic3rPE_package() {
|
|
||||||
build_style=meta
|
|
||||||
short_desc+=" (transitional dummy package)"
|
|
||||||
depends="${sourcepkg}>=${version}_${revision}"
|
|
||||||
pkg_install() {
|
|
||||||
vdoc ${FILESDIR}/README.voidlinux
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
PrusaSlicer
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'removed-packages'
|
# Template file for 'removed-packages'
|
||||||
pkgname=removed-packages
|
pkgname=removed-packages
|
||||||
version=0.1.20241122
|
version=0.1.20241124
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meta
|
build_style=meta
|
||||||
short_desc="Uninstalls packages removed from repository"
|
short_desc="Uninstalls packages removed from repository"
|
||||||
|
|
@ -21,8 +21,10 @@ replaces="
|
||||||
MultiMC<=0.6.13_1
|
MultiMC<=0.6.13_1
|
||||||
Platinum9-theme<=0.0.0.20170720_3
|
Platinum9-theme<=0.0.0.20170720_3
|
||||||
PolyMC<=7.2_1
|
PolyMC<=7.2_1
|
||||||
|
PrusaSlicer<=2.5.2_5
|
||||||
Pyrex<=0.9.9_5
|
Pyrex<=0.9.9_5
|
||||||
SMC<=1.9_9
|
SMC<=1.9_9
|
||||||
|
Slic3rPE<=2.5.2_5
|
||||||
Twisted<=17.9.0_2
|
Twisted<=17.9.0_2
|
||||||
Venom<=0.5.5_1
|
Venom<=0.5.5_1
|
||||||
XorCurses<=0.2.2_1
|
XorCurses<=0.2.2_1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue