From 20b63d2a5ae10c39c5b39d3451df1114111bd1ed Mon Sep 17 00:00:00 2001 From: Eugen Zagorodniy Date: Sun, 10 May 2020 20:43:55 +0300 Subject: [PATCH] PrusaSlicer: update to 2.2.0 --- ...-sys-unistd.h-with-unistd.h-for-musl.patch | 16 +--- ...35bcc3ac3f7d5cd65365a2f5944a78c7a250.patch | 84 ------------------- srcpkgs/PrusaSlicer/patches/cross.patch | 14 ++-- srcpkgs/PrusaSlicer/patches/eigen.patch | 14 ++++ srcpkgs/PrusaSlicer/template | 17 ++-- 5 files changed, 35 insertions(+), 110 deletions(-) delete mode 100644 srcpkgs/PrusaSlicer/patches/bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250.patch create mode 100644 srcpkgs/PrusaSlicer/patches/eigen.patch diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch index 4abae3ef38a..a3cb8fc7217 100644 --- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch +++ b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch @@ -1,17 +1,8 @@ -From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001 -From: Jasper Chan -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 +index 737e76c0b..de7d5d895 100644 --- src/slic3r/Utils/Serial.cpp +++ src/slic3r/Utils/Serial.cpp -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #ifndef _WIN32 #include #include @@ -20,6 +11,3 @@ index 601719b50..43dab2390 100644 #include #endif --- -2.21.0 - diff --git a/srcpkgs/PrusaSlicer/patches/bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250.patch b/srcpkgs/PrusaSlicer/patches/bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250.patch deleted file mode 100644 index fef18cf3ec8..00000000000 --- a/srcpkgs/PrusaSlicer/patches/bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250.patch +++ /dev/null @@ -1,84 +0,0 @@ -From bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250 Mon Sep 17 00:00:00 2001 -From: Vojtech Kral -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; -+*/ - }; - - diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch index 2c82d96dcde..33e30513ce3 100644 --- a/srcpkgs/PrusaSlicer/patches/cross.patch +++ b/srcpkgs/PrusaSlicer/patches/cross.patch @@ -1,11 +1,13 @@ ---- src/avrdude/CMakeLists.txt 2019-05-20 18:49:36.000000000 +0200 -+++ - 2019-05-31 23:42:15.542838510 +0200 -@@ -82,7 +82,7 @@ +diff --git src/avrdude/CMakeLists.txt src/avrdude/CMakeLists.txt +index fc01b7d8d..be730c43e 100644 +--- src/avrdude/CMakeLists.txt ++++ src/avrdude/CMakeLists.txt +@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-generate.cpp) add_custom_command( DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf.h -- COMMAND $ 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 $ 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} ) diff --git a/srcpkgs/PrusaSlicer/patches/eigen.patch b/srcpkgs/PrusaSlicer/patches/eigen.patch new file mode 100644 index 00000000000..4740a2c84b9 --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/eigen.patch @@ -0,0 +1,14 @@ +diff --git CMakeLists.txt CMakeLists.txt +index 52be8e847..6340b9d31 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -363,8 +363,8 @@ if (NOT SLIC3R_STATIC) + endif () + if (NOT EIGEN3_FOUND) + set(EIGEN3_FOUND 1) +- set(EIGEN3_INCLUDE_DIR ${LIBDIR}/eigen/) + endif () ++set(EIGEN3_INCLUDE_DIR ${LIBDIR}/eigen/) + include_directories(BEFORE SYSTEM ${EIGEN3_INCLUDE_DIR}) + + # Find expat or use bundled version diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index fcae498faf2..5e17880de31 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,20 +1,25 @@ # 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 cereal openvdb-devel cgal-devel + gmpxx-devel" short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" maintainer="Jasper Chan " -license="GPL-3.0-or-later" +license="AGPL-3.0-or-later" homepage="https://www.prusa3d.com/prusaslicer/" -distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" -checksum=5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3 +distfiles="https://github.com/prusa3d/PrusaSlicer/archive/version_${version}.tar.gz" +checksum=e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0 + +post_install() { + vlicense LICENSE +} Slic3rPE_package() { build_style=meta