pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

prusaslicer: Update wip/prusaslicer to 2.3.0



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Tue Jan 26 00:12:19 2021 +1100
Changeset:	675e09b9795b728ec892ded6df4bc70a32da426f

Modified Files:
	prusaslicer/Makefile
	prusaslicer/PLIST
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_PrusaSlicer.cpp
	prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
Added Files:
	prusaslicer/patches/patch-CMakeLists.txt
	prusaslicer/patches/patch-src_libslic3r_Thread.cpp
	prusaslicer/patches/patch-src_slic3r_GUI_InstanceCheck.cpp
Removed Files:
	prusaslicer/patches/patch-src_admesh_stlinit.cpp

Log Message:
prusaslicer: Update wip/prusaslicer to 2.3.0

Changes:
- FDM custom supports by painting
- FDM seam placement by painting
- Ironing over top surfaces, Monotonic infill
- Adaptive Cubic / Adaptive Support Cubic infill
- Stand-alone G-code viewer, print simulation in time
- Single vs. multiple instances, sending arguments to an existing instance
- Unsaved Changes dialog
- Improved filament installation
- Physical Printers settings
- Various SLA improvements
- Collapsible side bar, floating presets dialog etc
- Support for imperial units

Full release notes available at:
https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.3.0

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

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

diffstat:
 prusaslicer/Makefile                               |   4 +-
 prusaslicer/PLIST                                  | 126 +++++++++++++++++++++
 prusaslicer/distinfo                               |  16 +--
 prusaslicer/patches/patch-CMakeLists.txt           |  15 +++
 prusaslicer/patches/patch-src_PrusaSlicer.cpp      |   8 +-
 prusaslicer/patches/patch-src_admesh_stlinit.cpp   |  44 -------
 prusaslicer/patches/patch-src_libslic3r_Thread.cpp |  29 +++++
 .../patches/patch-src_slic3r_GUI_InstanceCheck.cpp |  33 ++++++
 .../patch-src_slic3r_GUI_Mouse3DController.hpp     |   4 +-
 9 files changed, 221 insertions(+), 58 deletions(-)

diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index 5892d4c5a9..99429abd22 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 PKGNAME=	${DISTNAME:tl}
-DISTNAME=	PrusaSlicer-2.2.0
+DISTNAME=	PrusaSlicer-2.3.0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=prusa3d/}
 GITHUB_PROJECT=	PrusaSlicer
@@ -36,11 +36,13 @@ CMAKE_ARGS+=	-DSLIC3R_WX_STABLE=1
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/cgal/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../wip/cereal/buildlink3.mk"
 .include "../../wip/nlopt/buildlink3.mk"
 .include "../../wip/openvdb/buildlink3.mk"
 .include "../../wip/threadingbuildingblocks/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/prusaslicer/PLIST b/prusaslicer/PLIST
index bf52b61d0b..42daef28d1 100644
--- a/prusaslicer/PLIST
+++ b/prusaslicer/PLIST
@@ -1,8 +1,18 @@
 @comment $NetBSD$
+bin/prusa-gcodeviewer
 bin/prusa-slicer
+resources/applications/PrusaGcodeviewer.desktop
+resources/applications/PrusaSlicer.desktop
+resources/data/flatpak/com.prusa3d.PrusaSlicer.desktop
+resources/data/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml
 resources/fonts/NotoSans-Regular.ttf
 resources/fonts/NotoSansCJK-Regular.ttc
 resources/fonts/README.txt
+resources/icons/Pmetal_001.png
+resources/icons/PrusaSlicer-gcodeviewer.ico
+resources/icons/PrusaSlicer-gcodeviewer_128px.png
+resources/icons/PrusaSlicer-gcodeviewer_192px.png
+resources/icons/PrusaSlicer-gcodeviewer_32px.png
 resources/icons/PrusaSlicer.icns
 resources/icons/PrusaSlicer.ico
 resources/icons/PrusaSlicer.png
@@ -18,13 +28,17 @@ resources/icons/add_modifier.svg
 resources/icons/add_part.svg
 resources/icons/advanced_plus.svg
 resources/icons/arrange.svg
+resources/icons/attention.svg
 resources/icons/browse.svg
 resources/icons/bullet_black.png
 resources/icons/bullet_blue.png
 resources/icons/bullet_white.png
+resources/icons/cancel.svg
 resources/icons/change_extruder.svg
 resources/icons/cog.svg
+resources/icons/cog_.svg
 resources/icons/cog_go.png
+resources/icons/collapse.svg
 resources/icons/colorchange_add.svg
 resources/icons/colorchange_add_f.svg
 resources/icons/colorchange_add_m.svg
@@ -39,11 +53,13 @@ resources/icons/copy.svg
 resources/icons/copy_menu.svg
 resources/icons/cross.svg
 resources/icons/cross_focus.svg
+resources/icons/cross_focus_large.svg
 resources/icons/cut.svg
 resources/icons/delete.svg
 resources/icons/delete_all.svg
 resources/icons/delete_all_menu.svg
 resources/icons/dot.svg
+resources/icons/dot_small.svg
 resources/icons/dot_white.svg
 resources/icons/down_half_circle.png
 resources/icons/drop_to_bed.svg
@@ -55,9 +71,11 @@ resources/icons/edit_uni.svg
 resources/icons/editor.svg
 resources/icons/editor_menu.svg
 resources/icons/eject_sd.svg
+resources/icons/empty.svg
 resources/icons/error_tick.svg
 resources/icons/error_tick_f.svg
 resources/icons/exclamation.svg
+resources/icons/exit.svg
 resources/icons/export_config.svg
 resources/icons/export_config_bundle.svg
 resources/icons/export_gcode.svg
@@ -65,6 +83,7 @@ resources/icons/export_plater.svg
 resources/icons/export_to_sd.svg
 resources/icons/eye_closed.svg
 resources/icons/eye_open.svg
+resources/icons/fdm_supports.svg
 resources/icons/flag_green.svg
 resources/icons/flag_red.svg
 resources/icons/funnel.svg
@@ -77,6 +96,7 @@ resources/icons/import_plater.svg
 resources/icons/infill.svg
 resources/icons/instance_add.svg
 resources/icons/instance_remove.svg
+resources/icons/ironing.svg
 resources/icons/layers.svg
 resources/icons/layers_white.svg
 resources/icons/left_half_circle.png
@@ -103,6 +123,14 @@ resources/icons/mode_simple_.png
 resources/icons/mode_simple_sq.png
 resources/icons/move.svg
 resources/icons/note.svg
+resources/icons/notification_close.svg
+resources/icons/notification_close_hover.svg
+resources/icons/notification_eject_sd.svg
+resources/icons/notification_eject_sd_hover.svg
+resources/icons/notification_error.svg
+resources/icons/notification_minimalize.svg
+resources/icons/notification_minimalize_hover.svg
+resources/icons/notification_warning.svg
 resources/icons/number_of_copies.svg
 resources/icons/one_layer_lock_off.png
 resources/icons/one_layer_lock_on.png
@@ -123,6 +151,7 @@ resources/icons/preview_menu.svg
 resources/icons/printer.svg
 resources/icons/printer_placeholder.png
 resources/icons/printer_white.svg
+resources/icons/prusa_slicer_logo.svg
 resources/icons/question.svg
 resources/icons/re_slice.svg
 resources/icons/redo.svg
@@ -138,11 +167,19 @@ resources/icons/rotate.svg
 resources/icons/row.png
 resources/icons/save.svg
 resources/icons/scale.svg
+resources/icons/seam.svg
+resources/icons/search.svg
+resources/icons/search_.svg
+resources/icons/search_blink.svg
+resources/icons/search_gray.svg
 resources/icons/set_separate_obj.svg
+resources/icons/settings.svg
 resources/icons/shape_ungroup.png
 resources/icons/skirt+brim.svg
 resources/icons/sla_printer.svg
 resources/icons/sla_supports.svg
+resources/icons/splashscreen-gcodepreview.jpg
+resources/icons/splashscreen.jpg
 resources/icons/split_object_SMALL.svg
 resources/icons/split_objects.svg
 resources/icons/split_parts.svg
@@ -152,11 +189,17 @@ resources/icons/stl.icns
 resources/icons/support.svg
 resources/icons/support_blocker.svg
 resources/icons/support_enforcer.svg
+resources/icons/switch_presets.svg
 resources/icons/table.png
 resources/icons/test.svg
 resources/icons/thumb_down.svg
+resources/icons/thumb_left.svg
+resources/icons/thumb_right.svg
 resources/icons/thumb_up.svg
+resources/icons/tick_mark.svg
 resources/icons/time.svg
+resources/icons/timer_dot.svg
+resources/icons/timer_dot_empty.svg
 resources/icons/toolbar_background.png
 resources/icons/undo.svg
 resources/icons/undo_menu.svg
@@ -175,9 +218,14 @@ resources/icons/white/cooling.svg
 resources/icons/white/copy_menu.svg
 resources/icons/white/delete.svg
 resources/icons/white/delete_all_menu.svg
+resources/icons/white/dot.svg
+resources/icons/white/dot_small.svg
+resources/icons/white/drop_to_bed.svg
 resources/icons/white/edit_layers_all.svg
 resources/icons/white/edit_layers_some.svg
+resources/icons/white/edit_uni.svg
 resources/icons/white/editor_menu.svg
+resources/icons/white/exit.svg
 resources/icons/white/export_config.svg
 resources/icons/white/export_config_bundle.svg
 resources/icons/white/export_gcode.svg
@@ -185,6 +233,8 @@ resources/icons/white/export_plate.svg
 resources/icons/white/export_plater.svg
 resources/icons/white/export_to_sd.svg
 resources/icons/white/extruder+funnel.svg
+resources/icons/white/eye_closed.svg
+resources/icons/white/eye_open.svg
 resources/icons/white/flag_green.svg
 resources/icons/white/flag_red.svg
 resources/icons/white/funnel.svg
@@ -197,6 +247,7 @@ resources/icons/white/infill.svg
 resources/icons/white/layers.svg
 resources/icons/white/lock2_closed.svg
 resources/icons/white/lock_closed.svg
+resources/icons/white/lock_closed_f.svg
 resources/icons/white/lock_open_sys.svg
 resources/icons/white/machine+cog.svg
 resources/icons/white/mirroring_off.svg
@@ -217,6 +268,7 @@ resources/icons/white/remove_copies.svg
 resources/icons/white/remove_menu.svg
 resources/icons/white/resin.svg
 resources/icons/white/save.svg
+resources/icons/white/search.svg
 resources/icons/white/set_separate_obj.svg
 resources/icons/white/skirt+brim.svg
 resources/icons/white/sla_printer.svg
@@ -226,6 +278,7 @@ resources/icons/white/spool.svg
 resources/icons/white/support.svg
 resources/icons/white/support_blocker.svg
 resources/icons/white/support_enforcer.svg
+resources/icons/white/switch_presets.svg
 resources/icons/white/test.svg
 resources/icons/white/time.svg
 resources/icons/white/undo_menu.svg
@@ -257,6 +310,8 @@ resources/localization/pl/PrusaSlicer.mo
 resources/localization/pl/PrusaSlicer_pl.po
 resources/localization/pt_br/PrusaSlicer.mo
 resources/localization/pt_br/PrusaSlicer_pt_br.po
+resources/localization/ru/PrusaSlicer.mo
+resources/localization/ru/PrusaSlicer_ru.po
 resources/localization/tr/PrusaSlicer.mo
 resources/localization/tr/PrusaSlicer_tr.po
 resources/localization/uk/PrusaSlicer.mo
@@ -265,6 +320,19 @@ resources/localization/zh_cn/PrusaSlicer.mo
 resources/localization/zh_cn/PrusaSlicer_zh_CN.po
 resources/localization/zh_tw/PrusaSlicer.mo
 resources/localization/zh_tw/PrusaSlicer_zh_TW.po
+resources/profiles/Anycubic.idx
+resources/profiles/Anycubic.ini
+resources/profiles/Anycubic/AK.png
+resources/profiles/Anycubic/AKLP_Bed.stl
+resources/profiles/Anycubic/AKLP_thumbnail.png
+resources/profiles/Anycubic/AK_Bed.stl
+resources/profiles/Anycubic/AK_thumbnail.png
+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/mega0.svg
+resources/profiles/Anycubic/mega0_bed.stl
 resources/profiles/BIBO.idx
 resources/profiles/BIBO.ini
 resources/profiles/BIBO/BIBO2.svg
@@ -272,9 +340,47 @@ resources/profiles/BIBO/BIBO2_bed.stl
 resources/profiles/BIBO/BIBO2_thumbnail.png
 resources/profiles/Creality.idx
 resources/profiles/Creality.ini
+resources/profiles/Creality/CR10MINI_thumbnail.png
+resources/profiles/Creality/CR10S4_thumbnail.png
+resources/profiles/Creality/CR10S5_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/CR20PRO_thumbnail.png
+resources/profiles/Creality/CR20_thumbnail.png
+resources/profiles/Creality/ENDER2_thumbnail.png
+resources/profiles/Creality/ENDER3BLTOUCH_thumbnail.png
+resources/profiles/Creality/ENDER3V2_thumbnail.png
 resources/profiles/Creality/ENDER3_thumbnail.png
+resources/profiles/Creality/ENDER5PLUS_thumbnail.png
+resources/profiles/Creality/ENDER5_thumbnail.png
+resources/profiles/Creality/cr10.svg
+resources/profiles/Creality/cr10_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/cr10v2_bed.stl
+resources/profiles/Creality/cr20.svg
+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/ender5plus.svg
+resources/profiles/Creality/ender5plus_bed.stl
+resources/profiles/FLSun.idx
+resources/profiles/FLSun.ini
+resources/profiles/FLSun/Q5.svg
+resources/profiles/FLSun/Q5_bed.stl
+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/LulzBot.idx
 resources/profiles/LulzBot.ini
 resources/profiles/LulzBot/MINI_AERO_thumbnail.png
@@ -301,11 +407,31 @@ resources/profiles/PrusaResearch/mk3.svg
 resources/profiles/PrusaResearch/mk3_bed.stl
 resources/profiles/PrusaResearch/sl1.svg
 resources/profiles/PrusaResearch/sl1_bed.stl
+resources/profiles/TriLAB.idx
+resources/profiles/TriLAB.ini
+resources/profiles/TriLAB/DQ2+FP2_thumbnail.png
+resources/profiles/TriLAB/DQ2+FP_thumbnail.png
+resources/profiles/TriLAB/DQ2P+FP2_thumbnail.png
+resources/profiles/TriLAB/DQ2P+FP_thumbnail.png
+resources/profiles/TriLAB/DQ2P_thumbnail.png
+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/dq2_bed.stl
 resources/resources
 resources/shaders/gouraud.fs
 resources/shaders/gouraud.vs
+resources/shaders/gouraud_light.fs
+resources/shaders/gouraud_light.vs
+resources/shaders/options_110.fs
+resources/shaders/options_110.vs
+resources/shaders/options_120.fs
+resources/shaders/options_120.vs
 resources/shaders/printbed.fs
 resources/shaders/printbed.vs
+resources/shaders/toolpaths_lines.fs
+resources/shaders/toolpaths_lines.vs
 resources/shaders/variable_layer_height.fs
 resources/shaders/variable_layer_height.vs
 resources/udev/90-3dconnexion.rules
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index f4f9c69906..a28a3fd3d0 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -1,12 +1,14 @@
 $NetBSD$
 
-SHA1 (PrusaSlicer-2.2.0.tar.gz) = 6ce58ebc8b786484374ff735bc783b66b9a58099
-RMD160 (PrusaSlicer-2.2.0.tar.gz) = 2a151b3e488fa26c2a3af2e67996b5954b801966
-SHA512 (PrusaSlicer-2.2.0.tar.gz) = 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
-Size (PrusaSlicer-2.2.0.tar.gz) = 30811929 bytes
+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 (patch-src_CMakeLists_txt) = 1ec421e911ef96ae412643216080e1f26e5282c4
-SHA1 (patch-src_PrusaSlicer.cpp) = ab61fc3ed6b99c9686c26a0dcc978c819783a27f
-SHA1 (patch-src_admesh_stlinit.cpp) = db72a9660045de06db58188227767aefd84ad829
+SHA1 (patch-src_PrusaSlicer.cpp) = 50c517a9e6f2b7a6c639a0fd81811d087bb15e86
 SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
 SHA1 (patch-src_avrdude_libavrdude.h) = 414cf7c6c23f7eed61319f8580c1dd7218ac4337
-SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 4e3d61385da6e31d09a740160bac66e77108b74d
+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
new file mode 100644
index 0000000000..932f7a50da
--- /dev/null
+++ b/prusaslicer/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use GTK3, since that's how we build wxWidgets.
+
+--- CMakeLists.txt.orig	2021-01-11 13:01:51.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)
+ option(SLIC3R_ASAN              "Enable ASan on Clang and GCC" 0)
+ 
+-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)
diff --git a/prusaslicer/patches/patch-src_PrusaSlicer.cpp b/prusaslicer/patches/patch-src_PrusaSlicer.cpp
index 6b69357f11..7875d38588 100644
--- a/prusaslicer/patches/patch-src_PrusaSlicer.cpp
+++ b/prusaslicer/patches/patch-src_PrusaSlicer.cpp
@@ -2,17 +2,17 @@ $NetBSD$
 
 Use more portable boost routine for finding running executable path.
 
---- src/PrusaSlicer.cpp.orig	2020-03-21 10:55:51.000000000 +0000
+--- src/PrusaSlicer.cpp.orig	2021-01-11 13:01:51.000000000 +0000
 +++ src/PrusaSlicer.cpp
-@@ -22,6 +22,7 @@
- #include <cstring>
+@@ -23,6 +23,7 @@
  #include <iostream>
  #include <math.h>
+ #include <boost/algorithm/string/predicate.hpp>
 +#include <boost/dll/runtime_symbol_info.hpp>
  #include <boost/filesystem.hpp>
  #include <boost/nowide/args.hpp>
  #include <boost/nowide/cenv.hpp>
-@@ -554,7 +555,7 @@ bool CLI::setup(int argc, char **argv)
+@@ -594,7 +595,7 @@ bool CLI::setup(int argc, char **argv)
          }
      }
  
diff --git a/prusaslicer/patches/patch-src_admesh_stlinit.cpp b/prusaslicer/patches/patch-src_admesh_stlinit.cpp
deleted file mode 100644
index 648d8689e6..0000000000
--- a/prusaslicer/patches/patch-src_admesh_stlinit.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-Use newer endian handling in boost.
-
---- src/admesh/stlinit.cpp.orig	2020-03-21 10:55:51.000000000 +0000
-+++ src/admesh/stlinit.cpp
-@@ -26,9 +26,9 @@
- #include <math.h>
- #include <assert.h>
- 
-+#include <boost/endian.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/cstdio.hpp>
--#include <boost/detail/endian.hpp>
- 
- #include "stl.h"
- 
-@@ -36,7 +36,7 @@
- #error "SEEK_SET not defined"
- #endif
- 
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
- extern void stl_internal_reverse_quads(char *buf, size_t cnt);
- #endif /* BOOST_LITTLE_ENDIAN */
- 
-@@ -89,7 +89,7 @@ static FILE* stl_open_count_facets(stl_f
-     	// Read the int following the header.  This should contain # of facets.
- 	  	uint32_t header_num_facets;
-     	bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-     	// Convert from little endian to big endian.
-     	stl_internal_reverse_quads((char*)&header_num_facets, 4);
- #endif /* BOOST_LITTLE_ENDIAN */
-@@ -158,7 +158,7 @@ static bool stl_read(stl_file *stl, FILE
-       		// Read a single facet from a binary .STL file. We assume little-endian architecture!
-       		if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
-       			return false;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-       		// Convert the loaded little endian data to big endian.
-       		stl_internal_reverse_quads((char*)&facet, 48);
- #endif /* BOOST_LITTLE_ENDIAN */
diff --git a/prusaslicer/patches/patch-src_libslic3r_Thread.cpp b/prusaslicer/patches/patch-src_libslic3r_Thread.cpp
new file mode 100644
index 0000000000..b5b0b8dcaa
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_Thread.cpp
@@ -0,0 +1,29 @@
+$NetBSD$
+
+pthread_setname_np takes 3 arguments.
+
+--- src/libslic3r/Thread.cpp.orig	2021-01-11 13:01:51.000000000 +0000
++++ src/libslic3r/Thread.cpp
+@@ -161,19 +161,19 @@ std::optional<std::string> get_current_t
+ // posix
+ bool set_thread_name(std::thread &thread, const char *thread_name)
+ {
+-   	pthread_setname_np(thread.native_handle(), thread_name);
++   	pthread_setname_np(thread.native_handle(), thread_name, nullptr);
+ 	return true;
+ }
+ 
+ bool set_thread_name(boost::thread &thread, const char *thread_name)
+ {
+-   	pthread_setname_np(thread.native_handle(), thread_name);
++   	pthread_setname_np(thread.native_handle(), thread_name, nullptr);
+ 	return true;
+ }
+ 
+ bool set_current_thread_name(const char *thread_name)
+ {
+-	pthread_setname_np(pthread_self(), thread_name);
++	pthread_setname_np(pthread_self(), thread_name, nullptr);
+ 	return true;
+ }
+ 
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_InstanceCheck.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_InstanceCheck.cpp
new file mode 100644
index 0000000000..a79d0b7c65
--- /dev/null
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_InstanceCheck.cpp
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Treat NetBSD like Linux.
+
+--- src/slic3r/GUI/InstanceCheck.cpp.orig	2021-01-11 13:01:51.000000000 +0000
++++ src/slic3r/GUI/InstanceCheck.cpp
+@@ -23,7 +23,7 @@
+ #include <strsafe.h>
+ #endif //WIN32
+ 
+-#if __linux__
++#if defined(__linux__) || defined(__NetBSD__)
+ #include <dbus/dbus.h> /* Pull in all of D-Bus headers. */
+ #endif //__linux__
+ 
+@@ -169,7 +169,7 @@ namespace instance_check_internal
+ 		return false;
+ 	}
+ 
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__NetBSD__)
+ 
+ 	static bool  send_message(const std::string &message_text, const std::string &version)
+ 	{
+@@ -257,7 +257,7 @@ bool instance_check(int argc, char** arg
+ 	hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
+ #else
+ 	boost::system::error_code ec;
+-#ifdef __linux__
++#if defined(__linux__) || defined(__NetBSD__)
+ 	// If executed by an AppImage, start the AppImage, not the main process.
+ 	// see https://docs.appimage.org/packaging-guide/environment-variables.html#id2
+ 	const char *appimage_env = std::getenv("APPIMAGE");
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp b/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
index 1c6626dfe0..1f3236abbc 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 pkgsrc hidapi.h is one level deeper than builtin.
 
---- src/slic3r/GUI/Mouse3DController.hpp.orig	2020-03-21 10:55:51.000000000 +0000
+--- src/slic3r/GUI/Mouse3DController.hpp.orig	2021-01-11 13:01:51.000000000 +0000
 +++ src/slic3r/GUI/Mouse3DController.hpp
 @@ -6,7 +6,7 @@
  
@@ -12,4 +12,4 @@ pkgsrc hidapi.h is one level deeper than builtin.
 +#include "hidapi/hidapi.h"
  
  #include <queue>
- #include <thread>
+ #include <atomic>


Home | Main Index | Thread Index | Old Index