* [PR PATCH] PrusaSlicer 2.1.1 update
@ 2020-01-12 23:54 voidlinux-github
2020-05-19 14:15 ` PrusaSlicer: update to 2.1.1 Piraty
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: voidlinux-github @ 2020-01-12 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages PrusaSlicer_2_1_1
https://github.com/void-linux/void-packages/pull/18280
PrusaSlicer 2.1.1 update
depends on cereal PR
https://github.com/void-linux/void-packages/pull/18279
A patch file from https://github.com/void-linux/void-packages/pull/18280.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer_2_1_1-18280.patch --]
[-- Type: text/x-diff, Size: 3540 bytes --]
From 31fc16e23ed0145bc924ec4b9e2d1cf2c642aaa8 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 12 Jan 2020 18:52:48 -0500
Subject: [PATCH] PrusaSlicer 2.1.1 update
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 -------------------
srcpkgs/PrusaSlicer/patches/cross.patch | 11 --------
srcpkgs/PrusaSlicer/template | 8 +++---
3 files changed, 4 insertions(+), 40 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.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
deleted file mode 100644
index 4abae3ef38a..00000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -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
---- src/slic3r/Utils/Serial.cpp
-+++ 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
-
diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index 2c82d96dcde..00000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/avrdude/CMakeLists.txt 2019-05-20 18:49:36.000000000 +0200
-+++ - 2019-05-31 23:42:15.542838510 +0200
-@@ -82,7 +82,7 @@
- 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
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b517d825b4f..e5ea63c7fd6 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,20 +1,20 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.0.0
-revision=2
+version=2.1.1
+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"
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=79d0681fbf3f4158cac25595522dcea330e0fa960934053ac929a15fa13c1072
Slic3rPE_package() {
build_style=meta
^ permalink raw reply [flat|nested] 9+ messages in thread* [PR PATCH] PrusaSlicer: update to 2.1.1
@ 2020-05-19 16:55 zlice
2020-05-19 16:56 ` zlice
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: zlice @ 2020-05-19 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages PrusaSlicer211
https://github.com/void-linux/void-packages/pull/22138
PrusaSlicer: update to 2.1.1
A patch file from https://github.com/void-linux/void-packages/pull/22138.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer211-22138.patch --]
[-- Type: text/x-diff, Size: 6977 bytes --]
From 714e20b152ae0e3ef89be9f8b5509d7dc470f092 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 19 May 2020 12:52:41 -0400
Subject: [PATCH] PrusaSlicer: update to 2.1.1
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
...35bcc3ac3f7d5cd65365a2f5944a78c7a250.patch | 84 -------------------
srcpkgs/PrusaSlicer/patches/cross.patch | 11 ---
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 4 insertions(+), 124 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
delete mode 100644 srcpkgs/PrusaSlicer/patches/bfb135bcc3ac3f7d5cd65365a2f5944a78c7a250.patch
delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.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
deleted file mode 100644
index 4abae3ef38a..00000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -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
---- src/slic3r/Utils/Serial.cpp
-+++ 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
-
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 <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;
-+*/
- };
-
-
diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index 2c82d96dcde..00000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/avrdude/CMakeLists.txt 2019-05-20 18:49:36.000000000 +0200
-+++ - 2019-05-31 23:42:15.542838510 +0200
-@@ -82,7 +82,7 @@
- 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
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index fcae498faf2..e5ea63c7fd6 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,20 +1,20 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.0.0
-revision=3
+version=2.1.1
+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"
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=79d0681fbf3f4158cac25595522dcea330e0fa960934053ac929a15fa13c1072
Slic3rPE_package() {
build_style=meta
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-05-27 10:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-12 23:54 [PR PATCH] PrusaSlicer 2.1.1 update voidlinux-github
2020-05-19 14:15 ` PrusaSlicer: update to 2.1.1 Piraty
2020-05-19 16:44 ` [PR PATCH] [Closed]: " zlice
2020-05-19 16:56 ` zlice
2020-05-20 7:31 ` Piraty
2020-05-19 16:55 [PR PATCH] " zlice
2020-05-19 16:56 ` zlice
2020-05-20 14:43 ` Piraty
2020-05-20 15:04 ` zlice
2020-05-27 10:58 ` Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).