* [PR PATCH] PrusaSlicer: update to 2.2.0
@ 2020-05-10 20:25 ezag
2020-05-10 21:06 ` [PR PATCH] [Updated] " ezag
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: ezag @ 2020-05-10 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
There is a new pull request by ezag against master on the void-packages repository
https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/21825
PrusaSlicer: update to 2.2.0
A patch file from https://github.com/void-linux/void-packages/pull/21825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-21825.patch --]
[-- Type: text/x-diff, Size: 8423 bytes --]
From 7d7f42b5babef2b6da2871fab680c8e23af6e229 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
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 | 25 ------
...35bcc3ac3f7d5cd65365a2f5944a78c7a250.patch | 84 -------------------
srcpkgs/PrusaSlicer/patches/cross.patch | 14 ++--
srcpkgs/PrusaSlicer/patches/eigen.patch | 14 ++++
srcpkgs/PrusaSlicer/template | 13 +--
5 files changed, 29 insertions(+), 121 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
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
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
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 $<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}
)
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..5d6d004895a 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -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 cereal openvdb-devel cgal-devel
+ gmpxx-devel"
short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
-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
Slic3rPE_package() {
build_style=meta
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
@ 2020-05-10 21:06 ` ezag
2020-05-27 15:10 ` Piraty
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ezag @ 2020-05-10 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by ezag against master on the void-packages repository
https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/21825
PrusaSlicer: update to 2.2.0
A patch file from https://github.com/void-linux/void-packages/pull/21825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-21825.patch --]
[-- Type: text/x-diff, Size: 8466 bytes --]
From 8ffb68e54584baa8522fa072aa4fbf7c48d79f18 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
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 | 25 ------
...35bcc3ac3f7d5cd65365a2f5944a78c7a250.patch | 84 -------------------
srcpkgs/PrusaSlicer/patches/cross.patch | 14 ++--
srcpkgs/PrusaSlicer/patches/eigen.patch | 14 ++++
srcpkgs/PrusaSlicer/template | 17 ++--
5 files changed, 33 insertions(+), 121 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
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
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
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 $<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}
)
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 <jasperchan515@gmail.com>"
-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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
2020-05-10 21:06 ` [PR PATCH] [Updated] " ezag
@ 2020-05-27 15:10 ` Piraty
2020-05-27 17:59 ` [PR PATCH] [Updated] " ezag
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Piraty @ 2020-05-27 15:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21825#issuecomment-634727814
Comment:
please fix cross compilation
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
2020-05-10 21:06 ` [PR PATCH] [Updated] " ezag
2020-05-27 15:10 ` Piraty
@ 2020-05-27 17:59 ` ezag
2020-05-27 19:32 ` ezag
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ezag @ 2020-05-27 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by ezag against master on the void-packages repository
https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/21825
PrusaSlicer: update to 2.2.0
A patch file from https://github.com/void-linux/void-packages/pull/21825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-21825.patch --]
[-- Type: text/x-diff, Size: 7955 bytes --]
From 95d3f2b22ee581a2b39015596a592696e7f55e4b Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
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 | 25 ------
...35bcc3ac3f7d5cd65365a2f5944a78c7a250.patch | 84 -------------------
srcpkgs/PrusaSlicer/patches/cross.patch | 11 ---
srcpkgs/PrusaSlicer/patches/eigen.patch | 14 ++++
srcpkgs/PrusaSlicer/template | 17 ++--
5 files changed, 25 insertions(+), 126 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
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
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/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 <jasperchan515@gmail.com>"
-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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
` (2 preceding siblings ...)
2020-05-27 17:59 ` [PR PATCH] [Updated] " ezag
@ 2020-05-27 19:32 ` ezag
2020-05-27 21:36 ` ezag
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ezag @ 2020-05-27 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by ezag against master on the void-packages repository
https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/21825
PrusaSlicer: update to 2.2.0
A patch file from https://github.com/void-linux/void-packages/pull/21825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-21825.patch --]
[-- Type: text/x-diff, Size: 8644 bytes --]
From 1067145ab4e28e668fe75a9e45cbe4ac93e68500 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
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 | 25 ------
...35bcc3ac3f7d5cd65365a2f5944a78c7a250.patch | 84 -------------------
srcpkgs/PrusaSlicer/patches/cross.patch | 11 ---
srcpkgs/PrusaSlicer/patches/eigen.patch | 14 ++++
srcpkgs/PrusaSlicer/patches/unistd.patch | 13 +++
srcpkgs/PrusaSlicer/template | 17 ++--
6 files changed, 38 insertions(+), 126 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
create mode 100644 srcpkgs/PrusaSlicer/patches/eigen.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/unistd.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/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/patches/unistd.patch b/srcpkgs/PrusaSlicer/patches/unistd.patch
new file mode 100644
index 00000000000..a3cb8fc7217
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/unistd.patch
@@ -0,0 +1,13 @@
+diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
+index 737e76c0b..de7d5d895 100644
+--- src/slic3r/Utils/Serial.cpp
++++ src/slic3r/Utils/Serial.cpp
+@@ -43,7 +43,7 @@
+ #ifndef _WIN32
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+- #include <sys/unistd.h>
++ #include <unistd.h>
+ #include <sys/select.h>
+ #endif
+
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 <jasperchan515@gmail.com>"
-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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
` (3 preceding siblings ...)
2020-05-27 19:32 ` ezag
@ 2020-05-27 21:36 ` ezag
2020-05-27 22:05 ` ezag
2020-05-27 22:44 ` ezag
6 siblings, 0 replies; 8+ messages in thread
From: ezag @ 2020-05-27 21:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by ezag against master on the void-packages repository
https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/21825
PrusaSlicer: update to 2.2.0
A patch file from https://github.com/void-linux/void-packages/pull/21825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-21825.patch --]
[-- Type: text/x-diff, Size: 8474 bytes --]
From 20b63d2a5ae10c39c5b39d3451df1114111bd1ed Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
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 <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
+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 <sys/ioctl.h>
#include <sys/time.h>
@@ -20,6 +11,3 @@ index 601719b50..43dab2390 100644
#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
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 $<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}
)
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 <jasperchan515@gmail.com>"
-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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
` (4 preceding siblings ...)
2020-05-27 21:36 ` ezag
@ 2020-05-27 22:05 ` ezag
2020-05-27 22:44 ` ezag
6 siblings, 0 replies; 8+ messages in thread
From: ezag @ 2020-05-27 22:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by ezag against master on the void-packages repository
https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/21825
PrusaSlicer: update to 2.2.0
A patch file from https://github.com/void-linux/void-packages/pull/21825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-21825.patch --]
[-- Type: text/x-diff, Size: 8501 bytes --]
From dfedb37dafdf8484116cc28cd31eeb72eaa1482f Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
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 | 18 ++--
5 files changed, 36 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 <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
+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 <sys/ioctl.h>
#include <sys/time.h>
@@ -20,6 +11,3 @@ index 601719b50..43dab2390 100644
#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
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 $<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}
)
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..97e31e16304 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,20 +1,26 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.0.0
-revision=3
+version=2.2.0
+revision=1
+archs="~aarch64* ~armv7l"
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 <jasperchan515@gmail.com>"
-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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: PrusaSlicer: update to 2.2.0
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
` (5 preceding siblings ...)
2020-05-27 22:05 ` ezag
@ 2020-05-27 22:44 ` ezag
6 siblings, 0 replies; 8+ messages in thread
From: ezag @ 2020-05-27 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2853 bytes --]
New comment by ezag on void-packages repository
https://github.com/void-linux/void-packages/pull/21825#issuecomment-634982388
Comment:
Unfortunatelly I have no idea how to fix cross compilation for following architectures and have disabled them:
- aarch64
- aarch64-musl
- armv7l
Fixes are welcome if anyone is able & interested, `CMakeError.log` output is similar for all failing builds:
```
Performing C SOURCE FILE Test CMAKE_HAVE_LIBC_PTHREAD failed with the following output:
Change Dir: /builddir/PrusaSlicer-version_2.2.0/build/CMakeFiles/CMakeTmp
Run Build Command(s):/usr/bin/make cmTC_161ac/fast && /usr/bin/make -f CMakeFiles/cmTC_161ac.dir/build.make CMakeFiles/cmTC_161ac.dir/build
make[1]: Entering directory '/builddir/PrusaSlicer-version_2.2.0/build/CMakeFiles/CMakeTmp'
Building C object CMakeFiles/cmTC_161ac.dir/src.c.o
/builddir/.xbps-PrusaSlicer/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a -I/usr/aarch64-linux-gnu/usr/include -DCMAKE_HAVE_LIBC_PTHREAD -fPIE -o CMakeFiles/cmTC_161ac.dir/src.c.o -c /builddir/PrusaSlicer-version_2.2.0/build/CMakeFiles/CMakeTmp/src.c
Linking C executable cmTC_161ac
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_161ac.dir/link.txt --verbose=1
/builddir/.xbps-PrusaSlicer/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a -I/usr/aarch64-linux-gnu/usr/include -DCMAKE_HAVE_LIBC_PTHREAD -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/aarch64-linux-gnu/usr/lib CMakeFiles/cmTC_161ac.dir/src.c.o -o cmTC_161ac
/usr/lib/gcc/aarch64-linux-gnu/9.3.0/../../../../aarch64-linux-gnu/bin/ld: CMakeFiles/cmTC_161ac.dir/src.c.o: in function `main':
src.c:(.text.startup+0x30): undefined reference to `pthread_create'
/usr/lib/gcc/aarch64-linux-gnu/9.3.0/../../../../aarch64-linux-gnu/bin/ld: src.c:(.text.startup+0x38): undefined reference to `pthread_detach'
/usr/lib/gcc/aarch64-linux-gnu/9.3.0/../../../../aarch64-linux-gnu/bin/ld: src.c:(.text.startup+0x40): undefined reference to `pthread_cancel'
/usr/lib/gcc/aarch64-linux-gnu/9.3.0/../../../../aarch64-linux-gnu/bin/ld: src.c:(.text.startup+0x4c): undefined reference to `pthread_join'
collect2: error: ld returned 1 exit status
make[1]: *** [CMakeFiles/cmTC_161ac.dir/build.make:107: cmTC_161ac] Error 1
make[1]: Leaving directory '/builddir/PrusaSlicer-version_2.2.0/build/CMakeFiles/CMakeTmp'
make: *** [Makefile:141: cmTC_161ac/fast] Error 2
Source file was:
#include <pthread.h>
void* test_func(void* data)
{
return data;
}
int main(void)
{
pthread_t thread;
pthread_create(&thread, NULL, test_func, NULL);
pthread_detach(thread);
pthread_cancel(thread);
pthread_join(thread, NULL);
pthread_atfork(NULL, NULL, NULL);
pthread_exit(NULL);
return 0;
}
```
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-27 22:44 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-10 20:25 [PR PATCH] PrusaSlicer: update to 2.2.0 ezag
2020-05-10 21:06 ` [PR PATCH] [Updated] " ezag
2020-05-27 15:10 ` Piraty
2020-05-27 17:59 ` [PR PATCH] [Updated] " ezag
2020-05-27 19:32 ` ezag
2020-05-27 21:36 ` ezag
2020-05-27 22:05 ` ezag
2020-05-27 22:44 ` ezag
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).