mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-19 07:37:01 +02:00
PrusaSlicer: update to 2.2.0.
This commit is contained in:
Enno Boland
Enno Boland
parent
08f2bc6f3b
commit
b56c817f8f
3 changed files with 11 additions and 94 deletions
|
|
@ -1,84 +0,0 @@
|
|||
From bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Kral <vojtech@kral.hk>
|
||||
Date: Fri, 2 Aug 2019 15:11:50 +0200
|
||||
Subject: [PATCH] Comment out stale implementation in Serial, fix #2150
|
||||
|
||||
---
|
||||
src/slic3r/GUI/FirmwareDialog.cpp | 2 +-
|
||||
src/slic3r/Utils/Serial.cpp | 3 +++
|
||||
src/slic3r/Utils/Serial.hpp | 14 +++++++++++++-
|
||||
3 files changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
|
||||
index 7865aecf2..d1f2da040 100644
|
||||
--- src/slic3r/GUI/FirmwareDialog.cpp
|
||||
+++ src/slic3r/GUI/FirmwareDialog.cpp
|
||||
@@ -354,7 +354,7 @@ bool FirmwareDialog::priv::check_model_id()
|
||||
// Therefore, regretably, so far the check cannot be used and we just return true here.
|
||||
// TODO: Rewrite Serial using more platform-native code.
|
||||
return true;
|
||||
-
|
||||
+
|
||||
// if (hex_file.model_id.empty()) {
|
||||
// // No data to check against, assume it's ok
|
||||
// return true;
|
||||
diff --git a/src/slic3r/Utils/Serial.cpp b/src/slic3r/Utils/Serial.cpp
|
||||
index cd2a01cbf..acfd5fafd 100644
|
||||
--- src/slic3r/Utils/Serial.cpp
|
||||
+++ src/slic3r/Utils/Serial.cpp
|
||||
@@ -353,6 +353,8 @@ void Serial::set_baud_rate(unsigned baud_rate)
|
||||
}
|
||||
}
|
||||
|
||||
+
|
||||
+/*
|
||||
void Serial::set_DTR(bool on)
|
||||
{
|
||||
auto handle = native_handle();
|
||||
@@ -495,6 +497,7 @@ std::string Serial::printer_format_line(const std::string &line, unsigned line_n
|
||||
|
||||
return (boost::format("N%1% %2%*%3%\n") % line_num_str % line % checksum).str();
|
||||
}
|
||||
+*/
|
||||
|
||||
|
||||
} // namespace Utils
|
||||
diff --git a/src/slic3r/Utils/Serial.hpp b/src/slic3r/Utils/Serial.hpp
|
||||
index 67d64b4ec..8bad75b31 100644
|
||||
--- src/slic3r/Utils/Serial.hpp
|
||||
+++ src/slic3r/Utils/Serial.hpp
|
||||
@@ -46,6 +46,17 @@ class Serial : public boost::asio::serial_port
|
||||
~Serial();
|
||||
|
||||
void set_baud_rate(unsigned baud_rate);
|
||||
+
|
||||
+ // The Serial implementation is currently in disarray and therefore commented out.
|
||||
+ // The boost implementation seems to have several problems, such as lack of support
|
||||
+ // for custom baud rates, few weird implementation bugs and a history of API breakages.
|
||||
+ // It's questionable whether it solves more problems than causes. Probably not.
|
||||
+ // TODO: Custom implementation not based on asio.
|
||||
+ //
|
||||
+ // As of now, this class is only kept for the purpose of rebooting AVR109,
|
||||
+ // see FirmwareDialog::priv::avr109_reboot()
|
||||
+
|
||||
+/*
|
||||
void set_DTR(bool on);
|
||||
|
||||
// Resets the line number both internally as well as with the firmware using M110
|
||||
@@ -68,7 +79,7 @@ class Serial : public boost::asio::serial_port
|
||||
|
||||
// Same as above, but with internally-managed line number
|
||||
size_t printer_write_line(const std::string &line);
|
||||
-
|
||||
+
|
||||
// Toggles DTR to reset the printer
|
||||
void printer_reset();
|
||||
|
||||
@@ -76,6 +87,7 @@ class Serial : public boost::asio::serial_port
|
||||
static std::string printer_format_line(const std::string &line, unsigned line_num);
|
||||
private:
|
||||
unsigned m_line_num = 0;
|
||||
+*/
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
--- src/avrdude/CMakeLists.txt 2019-05-20 18:49:36.000000000 +0200
|
||||
+++ - 2019-05-31 23:42:15.542838510 +0200
|
||||
@@ -82,7 +82,7 @@
|
||||
--- src/avrdude/CMakeLists.txt.orig 2020-06-04 09:19:26.017251215 +0200
|
||||
+++ src/avrdude/CMakeLists.txt 2020-06-04 09:19:36.468250771 +0200
|
||||
@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen
|
||||
add_custom_command(
|
||||
DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
|
||||
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf.h
|
||||
- COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h
|
||||
+ COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
|
||||
- COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
|
||||
+ COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
# Template file for 'PrusaSlicer'
|
||||
pkgname=PrusaSlicer
|
||||
version=2.0.0
|
||||
revision=3
|
||||
version=2.2.0
|
||||
revision=1
|
||||
wrksrc="PrusaSlicer-version_${version}"
|
||||
build_style=cmake
|
||||
build_helper="qemu"
|
||||
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel
|
||||
wxWidgets-devel glu-devel libpng-devel"
|
||||
wxWidgets-devel glu-devel libpng-devel glew-devel cereal openvdb-devel
|
||||
cgal-devel gmpxx-devel eigen"
|
||||
short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
|
||||
maintainer="Jasper Chan <jasperchan515@gmail.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://www.prusa3d.com/prusaslicer/"
|
||||
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
|
||||
checksum=5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3
|
||||
checksum=e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0
|
||||
|
||||
Slic3rPE_package() {
|
||||
build_style=meta
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue