pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/prusaslicer: Update wip/prusaslicer to 2.3.2

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Fri Jul 16 10:16:30 2021 +1000
Changeset:	fe9d1c6c72b9dc34c68ffa1d5aa71217066b1677

Modified Files:
	prusaslicer/Makefile
	prusaslicer/PLIST
	prusaslicer/distinfo
	prusaslicer/patches/patch-CMakeLists.txt
	prusaslicer/patches/patch-src_PrusaSlicer.cpp
Added Files:
	prusaslicer/patches/patch-src_libslic3r_Platform.cpp
	prusaslicer/patches/patch-src_libslic3r_Platform.hpp

Log Message:
wip/prusaslicer: Update wip/prusaslicer to 2.3.2

Changes in 2.3.2:
- Support of the Original Prusa SL1S SPEED
- Firmware updater for the Original Prusa CW1S
- Support for a new PrusaLink host type
- Installation wizard improvements
- Smoother surface with Monotonic infill
- Support for forward compatibility of configurations
- Bug fixes
- Full release notes:
  https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.3.2

Changes in 2.3.1:
- Universal OSX builds, Apple Silicon support
- Chrome OS support
- New 3rd party printer profiles
- Vulnerability issues fixed
- Bugs fixed with respect to PrusaSlicer 2.3.0
- Full release notes:
  https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.3.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fe9d1c6c72b9dc34c68ffa1d5aa71217066b1677

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/Makefile                               |  2 +-
 prusaslicer/PLIST                                  | 57 ++++++++++++++++++++++
 prusaslicer/distinfo                               | 14 +++---
 prusaslicer/patches/patch-CMakeLists.txt           |  6 +--
 prusaslicer/patches/patch-src_PrusaSlicer.cpp      |  8 +--
 .../patches/patch-src_libslic3r_Platform.cpp       | 17 +++++++
 .../patches/patch-src_libslic3r_Platform.hpp       | 24 +++++++++
 7 files changed, 114 insertions(+), 14 deletions(-)

diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index 10d6fbc590..0cbefd9c75 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 PKGNAME=	${DISTNAME:tl}
-DISTNAME=	PrusaSlicer-2.3.0
+DISTNAME=	PrusaSlicer-2.3.2
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=prusa3d/}
 GITHUB_PROJECT=	PrusaSlicer
diff --git a/prusaslicer/PLIST b/prusaslicer/PLIST
index 42daef28d1..707e9d0eef 100644
--- a/prusaslicer/PLIST
+++ b/prusaslicer/PLIST
@@ -94,6 +94,7 @@ resources/icons/import_config.svg
 resources/icons/import_config_bundle.svg
 resources/icons/import_plater.svg
 resources/icons/infill.svg
+resources/icons/info.svg
 resources/icons/instance_add.svg
 resources/icons/instance_remove.svg
 resources/icons/ironing.svg
@@ -244,6 +245,7 @@ resources/icons/white/import_config_bundle.svg
 resources/icons/white/import_plate.svg
 resources/icons/white/import_plater.svg
 resources/icons/white/infill.svg
+resources/icons/white/info.svg
 resources/icons/white/layers.svg
 resources/icons/white/lock2_closed.svg
 resources/icons/white/lock_closed.svg
@@ -323,6 +325,7 @@ resources/localization/zh_tw/PrusaSlicer_zh_TW.po
 resources/profiles/Anycubic.idx
 resources/profiles/Anycubic.ini
 resources/profiles/Anycubic/AK.png
+resources/profiles/Anycubic/AK.svg
 resources/profiles/Anycubic/AKLP_Bed.stl
 resources/profiles/Anycubic/AKLP_thumbnail.png
 resources/profiles/Anycubic/AK_Bed.stl
@@ -331,8 +334,18 @@ resources/profiles/Anycubic/I3MEGAS_thumbnail.png
 resources/profiles/Anycubic/I3MEGA_thumbnail.png
 resources/profiles/Anycubic/MEGA0_thumbnail.png
 resources/profiles/Anycubic/PREDATOR_thumbnail.png
+resources/profiles/Anycubic/i3megas.svg
+resources/profiles/Anycubic/i3megas_bed.stl
 resources/profiles/Anycubic/mega0.svg
 resources/profiles/Anycubic/mega0_bed.stl
+resources/profiles/Artillery.idx
+resources/profiles/Artillery.ini
+resources/profiles/Artillery/Genius_thumbnail.png
+resources/profiles/Artillery/X1_thumbnail.png
+resources/profiles/Artillery/bed-genius.png
+resources/profiles/Artillery/bed-genius.stl
+resources/profiles/Artillery/bed-x1.png
+resources/profiles/Artillery/bed-x1.stl
 resources/profiles/BIBO.idx
 resources/profiles/BIBO.ini
 resources/profiles/BIBO/BIBO2.svg
@@ -340,39 +353,73 @@ resources/profiles/BIBO/BIBO2_bed.stl
 resources/profiles/BIBO/BIBO2_thumbnail.png
 resources/profiles/Creality.idx
 resources/profiles/Creality.ini
+resources/profiles/Creality/CR10MAX_thumbnail.png
 resources/profiles/Creality/CR10MINI_thumbnail.png
 resources/profiles/Creality/CR10S4_thumbnail.png
 resources/profiles/Creality/CR10S5_thumbnail.png
+resources/profiles/Creality/CR10SMART_thumbnail.png
 resources/profiles/Creality/CR10SPROV2_thumbnail.png
 resources/profiles/Creality/CR10SPRO_thumbnail.png
 resources/profiles/Creality/CR10S_thumbnail.png
 resources/profiles/Creality/CR10V2_thumbnail.png
 resources/profiles/Creality/CR10V3_thumbnail.png
 resources/profiles/Creality/CR10_thumbnail.png
+resources/profiles/Creality/CR200B_thumbnail.png
 resources/profiles/Creality/CR20PRO_thumbnail.png
 resources/profiles/Creality/CR20_thumbnail.png
+resources/profiles/Creality/CR5PROH_thumbnail.png
+resources/profiles/Creality/CR5PRO_thumbnail.png
+resources/profiles/Creality/CR6MAX_thumbnail.png
+resources/profiles/Creality/CR6SE_thumbnail.png
+resources/profiles/Creality/CR8_thumbnail.png
+resources/profiles/Creality/CRXPRO_thumbnail.png
+resources/profiles/Creality/CRX_thumbnail.png
 resources/profiles/Creality/ENDER2_thumbnail.png
 resources/profiles/Creality/ENDER3BLTOUCH_thumbnail.png
+resources/profiles/Creality/ENDER3MAX_thumbnail.png
 resources/profiles/Creality/ENDER3V2_thumbnail.png
 resources/profiles/Creality/ENDER3_thumbnail.png
+resources/profiles/Creality/ENDER4_thumbnail.png
 resources/profiles/Creality/ENDER5PLUS_thumbnail.png
 resources/profiles/Creality/ENDER5_thumbnail.png
+resources/profiles/Creality/ENDER6_thumbnail.png
+resources/profiles/Creality/ENDER7_thumbnail.png
+resources/profiles/Creality/SERMOOND1_thumbnail.png
 resources/profiles/Creality/cr10.svg
 resources/profiles/Creality/cr10_bed.stl
+resources/profiles/Creality/cr10max.svg
+resources/profiles/Creality/cr10max_bed.stl
 resources/profiles/Creality/cr10mini.svg
 resources/profiles/Creality/cr10mini_bed.stl
 resources/profiles/Creality/cr10s4.svg
 resources/profiles/Creality/cr10s4_bed.stl
 resources/profiles/Creality/cr10s5.svg
 resources/profiles/Creality/cr10s5_bed.stl
+resources/profiles/Creality/cr10spro.svg
 resources/profiles/Creality/cr10v2_bed.stl
 resources/profiles/Creality/cr20.svg
+resources/profiles/Creality/cr200b.svg
+resources/profiles/Creality/cr200b_bed.stl
+resources/profiles/Creality/cr5pro.svg
+resources/profiles/Creality/cr5pro_bed.stl
+resources/profiles/Creality/cr6se.svg
+resources/profiles/Creality/cr6se_bed.stl
+resources/profiles/Creality/cr8.svg
+resources/profiles/Creality/cr8_bed.stl
 resources/profiles/Creality/ender2.svg
 resources/profiles/Creality/ender2_bed.stl
 resources/profiles/Creality/ender3.svg
 resources/profiles/Creality/ender3_bed.stl
+resources/profiles/Creality/ender3v2.svg
+resources/profiles/Creality/ender3v2_bed.stl
 resources/profiles/Creality/ender5plus.svg
 resources/profiles/Creality/ender5plus_bed.stl
+resources/profiles/Creality/ender6.svg
+resources/profiles/Creality/ender6_bed.stl
+resources/profiles/Creality/ender7.svg
+resources/profiles/Creality/ender7_bed.stl
+resources/profiles/Creality/sermoond1.svg
+resources/profiles/Creality/sermoond1_bed.stl
 resources/profiles/FLSun.idx
 resources/profiles/FLSun.ini
 resources/profiles/FLSun/Q5.svg
@@ -381,6 +428,10 @@ resources/profiles/FLSun/Q5_thumbnail.png
 resources/profiles/FLSun/QQSP.svg
 resources/profiles/FLSun/QQSP_bed.stl
 resources/profiles/FLSun/QQSP_thumbnail.png
+resources/profiles/INAT.idx
+resources/profiles/INAT.ini
+resources/profiles/INAT/PROTON_X_RAIL_thumbnail.png
+resources/profiles/INAT/PROTON_X_ROD_thumbnail.png
 resources/profiles/LulzBot.idx
 resources/profiles/LulzBot.ini
 resources/profiles/LulzBot/MINI_AERO_thumbnail.png
@@ -398,6 +449,7 @@ resources/profiles/PrusaResearch/MK3MMU2_thumbnail.png
 resources/profiles/PrusaResearch/MK3SMMU2S_thumbnail.png
 resources/profiles/PrusaResearch/MK3S_thumbnail.png
 resources/profiles/PrusaResearch/MK3_thumbnail.png
+resources/profiles/PrusaResearch/SL1S_thumbnail.png
 resources/profiles/PrusaResearch/SL1_thumbnail.png
 resources/profiles/PrusaResearch/mini.svg
 resources/profiles/PrusaResearch/mini_bed.stl
@@ -407,8 +459,11 @@ resources/profiles/PrusaResearch/mk3.svg
 resources/profiles/PrusaResearch/mk3_bed.stl
 resources/profiles/PrusaResearch/sl1.svg
 resources/profiles/PrusaResearch/sl1_bed.stl
+resources/profiles/PrusaResearch/sl1s.svg
+resources/profiles/PrusaResearch/sl1s_bed.stl
 resources/profiles/TriLAB.idx
 resources/profiles/TriLAB.ini
+resources/profiles/TriLAB/AQI_thumbnail.png
 resources/profiles/TriLAB/DQ2+FP2_thumbnail.png
 resources/profiles/TriLAB/DQ2+FP_thumbnail.png
 resources/profiles/TriLAB/DQ2P+FP2_thumbnail.png
@@ -418,6 +473,8 @@ resources/profiles/TriLAB/DQ2_thumbnail.png
 resources/profiles/TriLAB/DQL_thumbnail.png
 resources/profiles/TriLAB/DQM_thumbnail.png
 resources/profiles/TriLAB/DQXL_thumbnail.png
+resources/profiles/TriLAB/aq_bed.stl
+resources/profiles/TriLAB/aqp_bed.stl
 resources/profiles/TriLAB/dq2_bed.stl
 resources/resources
 resources/shaders/gouraud.fs
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index a28a3fd3d0..f20b5d046a 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -1,14 +1,16 @@
 $NetBSD$
 
-SHA1 (PrusaSlicer-2.3.0.tar.gz) = a7fa94868bdd5d65c3b109d724be509faa5126ef
-RMD160 (PrusaSlicer-2.3.0.tar.gz) = 7a8b48fd89ae1e4fca2da089edf2696050ae380e
-SHA512 (PrusaSlicer-2.3.0.tar.gz) = 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
-Size (PrusaSlicer-2.3.0.tar.gz) = 34785471 bytes
-SHA1 (patch-CMakeLists.txt) = 0cf76b347d1a75bc50474674cf5e968fe325263b
+SHA1 (PrusaSlicer-2.3.2.tar.gz) = 0770e6f85cc38a72f1b2c53aae806ebd8a031f94
+RMD160 (PrusaSlicer-2.3.2.tar.gz) = 0fdcc2c63f0965ee9fdc8e9f7c74824d2e52fbe9
+SHA512 (PrusaSlicer-2.3.2.tar.gz) = dc9a0b91ed0cd9c6dba07dbf4634be505a801e35134b39303a3ed9c3f16fecf2ebf6a171b746d953cd1183885cf9b65449ef0d57663613ff8d96f3a04c5705e7
+Size (PrusaSlicer-2.3.2.tar.gz) = 40659637 bytes
+SHA1 (patch-CMakeLists.txt) = bea477c9b88165a3debc6a77888aae9ee039aeb3
 SHA1 (patch-src_CMakeLists_txt) = 1ec421e911ef96ae412643216080e1f26e5282c4
-SHA1 (patch-src_PrusaSlicer.cpp) = 50c517a9e6f2b7a6c639a0fd81811d087bb15e86
+SHA1 (patch-src_PrusaSlicer.cpp) = 5bc384fd938b335598b0327f543d15c1a831c5bf
 SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
 SHA1 (patch-src_avrdude_libavrdude.h) = 414cf7c6c23f7eed61319f8580c1dd7218ac4337
+SHA1 (patch-src_libslic3r_Platform.cpp) = 94c8a76268ad6ff92bb152b005e1c6b4b0eac6ca
+SHA1 (patch-src_libslic3r_Platform.hpp) = a378233693d035bc3bbd508573d5d61e93840787
 SHA1 (patch-src_libslic3r_Thread.cpp) = 6cc8b5ab370d82fdc245e3a666dc0b6f1200a4eb
 SHA1 (patch-src_slic3r_GUI_InstanceCheck.cpp) = c9ae1ec2db2b493578cc128383fa4cf0b3e2ae6a
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 98de31b8d470b850aa2b098fd4e914a86631c668
diff --git a/prusaslicer/patches/patch-CMakeLists.txt b/prusaslicer/patches/patch-CMakeLists.txt
index 932f7a50da..f4b7f93b48 100644
--- a/prusaslicer/patches/patch-CMakeLists.txt
+++ b/prusaslicer/patches/patch-CMakeLists.txt
@@ -2,7 +2,7 @@ $NetBSD$
 
 Use GTK3, since that's how we build wxWidgets.
 
---- CMakeLists.txt.orig	2021-01-11 13:01:51.000000000 +0000
+--- CMakeLists.txt.orig	2021-07-08 06:46:36.000000000 +0000
 +++ CMakeLists.txt
 @@ -33,7 +33,7 @@ option(SLIC3R_MSVC_PDB          "Generat
  option(SLIC3R_PERL_XS           "Compile XS Perl module and enable Perl unit and integration tests" 0)
@@ -11,5 +11,5 @@ Use GTK3, since that's how we build wxWidgets.
 -set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
 +set(SLIC3R_GTK "3" CACHE STRING "GTK version to use with wxWidgets on Linux")
  
- if (APPLE)
-     set(CMAKE_FIND_FRAMEWORK LAST)
+ set(IS_CROSS_COMPILE FALSE)
+ 
diff --git a/prusaslicer/patches/patch-src_PrusaSlicer.cpp b/prusaslicer/patches/patch-src_PrusaSlicer.cpp
index 7875d38588..1ec418192e 100644
--- a/prusaslicer/patches/patch-src_PrusaSlicer.cpp
+++ b/prusaslicer/patches/patch-src_PrusaSlicer.cpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Use more portable boost routine for finding running executable path.
 
---- src/PrusaSlicer.cpp.orig	2021-01-11 13:01:51.000000000 +0000
+--- src/PrusaSlicer.cpp.orig	2021-07-08 06:46:36.000000000 +0000
 +++ src/PrusaSlicer.cpp
 @@ -23,6 +23,7 @@
  #include <iostream>
@@ -12,9 +12,9 @@ Use more portable boost routine for finding running executable path.
  #include <boost/filesystem.hpp>
  #include <boost/nowide/args.hpp>
  #include <boost/nowide/cenv.hpp>
-@@ -594,7 +595,7 @@ bool CLI::setup(int argc, char **argv)
-         }
-     }
+@@ -612,7 +613,7 @@ bool CLI::setup(int argc, char **argv)
+     // Detect the operating system flavor after SLIC3R_LOGLEVEL is set.
+     detect_platform();
  
 -    boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]);
 +    boost::filesystem::path path_to_binary = boost::dll::program_location();
diff --git a/prusaslicer/patches/patch-src_libslic3r_Platform.cpp b/prusaslicer/patches/patch-src_libslic3r_Platform.cpp
new file mode 100644
index 0000000000..77fe85b8fd
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_Platform.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Add platform flavour NetBSD.
+
+--- src/libslic3r/Platform.cpp.orig	2021-07-08 06:46:36.000000000 +0000
++++ src/libslic3r/Platform.cpp
+@@ -49,6 +49,10 @@ void detect_platform()
+     BOOST_LOG_TRIVIAL(info) << "Platform: OpenBSD";
+ 	s_platform 		  = Platform::BSDUnix;
+ 	s_platform_flavor = PlatformFlavor::OpenBSD;
++#elif defined(__NetBSD__)
++    BOOST_LOG_TRIVIAL(info) << "Platform: NetBSD";
++	s_platform 		  = Platform::BSDUnix;
++	s_platform_flavor = PlatformFlavor::NetBSD;
+ #else
+ 	// This should not happen.
+     BOOST_LOG_TRIVIAL(info) << "Platform: Unknown";
diff --git a/prusaslicer/patches/patch-src_libslic3r_Platform.hpp b/prusaslicer/patches/patch-src_libslic3r_Platform.hpp
new file mode 100644
index 0000000000..72e9571c1c
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_Platform.hpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Add a NetBSD entry to the Platform enum.
+Undef a NetBSD macro that's coming in from somewhere.
+
+--- src/libslic3r/Platform.hpp.orig	2021-07-08 06:46:36.000000000 +0000
++++ src/libslic3r/Platform.hpp
+@@ -1,6 +1,8 @@
+ #ifndef SLIC3R_Platform_HPP
+ #define SLIC3R_Platform_HPP
+ 
++#undef NetBSD
++
+ namespace Slic3r {
+ 
+ enum class Platform
+@@ -28,6 +30,7 @@ enum class PlatformFlavor
+ 	WSL2,
+ 	// For Platform::BSDUnix
+ 	OpenBSD,
++	NetBSD,
+ };
+ 
+ // To be called on program start-up.
Home | Main Index | Thread Index | Old Index