wip/PrusaSlicer: Converts STL models into gcode for 3d printing

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/PrusaSlicer: Converts STL models into gcode for 3d printing
From: Paul Ripke <stix%stix.id.au@localhost>
Date: Mon, 12 Oct 2020 13:44:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Tue Oct 13 00:44:55 2020 +1100
Changeset:	31eedcb7ae608d9906a7ed2010d042d30f6f56c1

Added Files:
	PrusaSlicer/DESCR
	PrusaSlicer/Makefile
	PrusaSlicer/PLIST
	PrusaSlicer/TODO
	PrusaSlicer/distinfo
	PrusaSlicer/patches/patch-src_CMakeLists_txt
	PrusaSlicer/patches/patch-src_PrusaSlicer.cpp
	PrusaSlicer/patches/patch-src_admesh_stlinit.cpp
	PrusaSlicer/patches/patch-src_avrdude_libavrdude.h
	PrusaSlicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp

Log Message:
wip/PrusaSlicer: Converts STL models into gcode for 3d printing

PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
instructions for FFF printers or PNG layers for mSLA 3D printers. It's
compatible with any modern printer based on the RepRap toolchain, including
all those based on the Marlin, Prusa, Sprinter and Repetier firmware. It
also works with Mach3, LinuxCNC and Machinekit controllers.

PrusaSlicer is based on Slic3r by Alessandro Ranelucci and the RepRap community.

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

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

diffstat:
 PrusaSlicer/DESCR                                  |   7 +
 PrusaSlicer/Makefile                               |  41 +++
 PrusaSlicer/PLIST                                  | 311 +++++++++++++++++++++
 PrusaSlicer/TODO                                   |   4 +
 PrusaSlicer/distinfo                               |  11 +
 PrusaSlicer/patches/patch-src_CMakeLists_txt       |  28 ++
 PrusaSlicer/patches/patch-src_PrusaSlicer.cpp      |  23 ++
 PrusaSlicer/patches/patch-src_admesh_stlinit.cpp   |  44 +++
 PrusaSlicer/patches/patch-src_avrdude_libavrdude.h |  15 +
 .../patch-src_slic3r_GUI_Mouse3DController.hpp     |  15 +
 10 files changed, 499 insertions(+)

diffs:
diff --git a/PrusaSlicer/DESCR b/PrusaSlicer/DESCR
new file mode 100644
index 0000000000..f0a94ac820
--- /dev/null
+++ b/PrusaSlicer/DESCR
@@ -0,0 +1,7 @@
+PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
+instructions for FFF printers or PNG layers for mSLA 3D printers. It's
+compatible with any modern printer based on the RepRap toolchain, including
+all those based on the Marlin, Prusa, Sprinter and Repetier firmware. It
+also works with Mach3, LinuxCNC and Machinekit controllers.
+
+PrusaSlicer is based on Slic3r by Alessandro Ranelucci and the RepRap community.
diff --git a/PrusaSlicer/Makefile b/PrusaSlicer/Makefile
new file mode 100644
index 0000000000..24b8532966
--- /dev/null
+++ b/PrusaSlicer/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD$
+
+DISTNAME=	PrusaSlicer-2.2.0
+CATEGORIES=	cad
+MASTER_SITES=	${MASTER_SITE_GITHUB:=prusa3d/}
+GITHUB_PROJECT=	PrusaSlicer
+GITHUB_TAG=	version_${PKGVERSION_NOREV}
+# Needed, else we strip the 'v' and look for "ersion".
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+
+MAINTAINER=	stix%stix.id.au@localhost
+HOMEPAGE=	https://www.prusa3d.com/prusaslicer/
+COMMENT=	Converts STL models into gcode for 3d printing
+LICENSE=	gnu-agpl-v3
+
+ONLY_FOR_PLATFORM=	*-*-aarch64 *-*-x86_64 *-*-earmv6 *-*-earmv7 *-*-i386
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	cmake gmake
+USE_CMAKE=	yes
+#BUILD_TARGET=	default
+#TEST_TARGET=	test
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../comms/libhidapi/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/ilmbase/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../math/cgal/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../math/nlopt/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../wip/cereal/buildlink3.mk"
+.include "../../wip/openvdb/buildlink3.mk"
+.include "../../wip/wxGTK31/buildlink3.mk"
+.include "../../wip/threadingbuildingblocks/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/PrusaSlicer/PLIST b/PrusaSlicer/PLIST
new file mode 100644
index 0000000000..bf52b61d0b
--- /dev/null
+++ b/PrusaSlicer/PLIST
@@ -0,0 +1,311 @@
+@comment $NetBSD$
+bin/prusa-slicer
+resources/fonts/NotoSans-Regular.ttf
+resources/fonts/NotoSansCJK-Regular.ttc
+resources/fonts/README.txt
+resources/icons/PrusaSlicer.icns
+resources/icons/PrusaSlicer.ico
+resources/icons/PrusaSlicer.png
+resources/icons/PrusaSlicer_128px.png
+resources/icons/PrusaSlicer_192px.png
+resources/icons/PrusaSlicer_192px_grayscale.png
+resources/icons/PrusaSlicer_192px_transparent.png
+resources/icons/PrusaSlicer_32px.png
+resources/icons/add.svg
+resources/icons/add_copies.svg
+resources/icons/add_gcode.svg
+resources/icons/add_modifier.svg
+resources/icons/add_part.svg
+resources/icons/advanced_plus.svg
+resources/icons/arrange.svg
+resources/icons/browse.svg
+resources/icons/bullet_black.png
+resources/icons/bullet_blue.png
+resources/icons/bullet_white.png
+resources/icons/change_extruder.svg
+resources/icons/cog.svg
+resources/icons/cog_go.png
+resources/icons/colorchange_add.svg
+resources/icons/colorchange_add_f.svg
+resources/icons/colorchange_add_m.svg
+resources/icons/colorchange_add_off.png
+resources/icons/colorchange_add_on.png
+resources/icons/colorchange_del.svg
+resources/icons/colorchange_del_f.svg
+resources/icons/colorchange_delete_off.png
+resources/icons/colorchange_delete_on.png
+resources/icons/cooling.svg
+resources/icons/copy.svg
+resources/icons/copy_menu.svg
+resources/icons/cross.svg
+resources/icons/cross_focus.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_white.svg
+resources/icons/down_half_circle.png
+resources/icons/drop_to_bed.svg
+resources/icons/edit_gcode.svg
+resources/icons/edit_gcode_f.svg
+resources/icons/edit_layers_all.svg
+resources/icons/edit_layers_some.svg
+resources/icons/edit_uni.svg
+resources/icons/editor.svg
+resources/icons/editor_menu.svg
+resources/icons/eject_sd.svg
+resources/icons/error_tick.svg
+resources/icons/error_tick_f.svg
+resources/icons/exclamation.svg
+resources/icons/export_config.svg
+resources/icons/export_config_bundle.svg
+resources/icons/export_gcode.svg
+resources/icons/export_plater.svg
+resources/icons/export_to_sd.svg
+resources/icons/eye_closed.svg
+resources/icons/eye_open.svg
+resources/icons/flag_green.svg
+resources/icons/flag_red.svg
+resources/icons/funnel.svg
+resources/icons/gcode.icns
+resources/icons/hollow.svg
+resources/icons/hollowing.svg
+resources/icons/import_config.svg
+resources/icons/import_config_bundle.svg
+resources/icons/import_plater.svg
+resources/icons/infill.svg
+resources/icons/instance_add.svg
+resources/icons/instance_remove.svg
+resources/icons/layers.svg
+resources/icons/layers_white.svg
+resources/icons/left_half_circle.png
+resources/icons/lock_closed.svg
+resources/icons/lock_closed_f.svg
+resources/icons/lock_closed_white.svg
+resources/icons/lock_open.svg
+resources/icons/lock_open_f.svg
+resources/icons/lock_open_sys.svg
+resources/icons/mark_X.svg
+resources/icons/mark_Y.svg
+resources/icons/mark_Z.svg
+resources/icons/mirroring_off.svg
+resources/icons/mirroring_on.svg
+resources/icons/mirroring_transparent.png
+resources/icons/mode_advanced.svg
+resources/icons/mode_advanced_.png
+resources/icons/mode_advanced_sq.png
+resources/icons/mode_expert.svg
+resources/icons/mode_expert_.png
+resources/icons/mode_expert_sq.png
+resources/icons/mode_simple.svg
+resources/icons/mode_simple_.png
+resources/icons/mode_simple_sq.png
+resources/icons/move.svg
+resources/icons/note.svg
+resources/icons/number_of_copies.svg
+resources/icons/one_layer_lock_off.png
+resources/icons/one_layer_lock_on.png
+resources/icons/one_layer_unlock_off.png
+resources/icons/one_layer_unlock_on.png
+resources/icons/open.svg
+resources/icons/output+page_white.svg
+resources/icons/pad.svg
+resources/icons/paste.svg
+resources/icons/paste_menu.svg
+resources/icons/pause_add.png
+resources/icons/pause_print.svg
+resources/icons/pause_print_f.svg
+resources/icons/place.svg
+resources/icons/plater.svg
+resources/icons/preview.svg
+resources/icons/preview_menu.svg
+resources/icons/printer.svg
+resources/icons/printer_placeholder.png
+resources/icons/printer_white.svg
+resources/icons/question.svg
+resources/icons/re_slice.svg
+resources/icons/redo.svg
+resources/icons/redo_menu.svg
+resources/icons/redo_toolbar.svg
+resources/icons/remove.svg
+resources/icons/remove_copies.svg
+resources/icons/remove_menu.svg
+resources/icons/resin.svg
+resources/icons/revert_all_.svg
+resources/icons/right_half_circle.png
+resources/icons/rotate.svg
+resources/icons/row.png
+resources/icons/save.svg
+resources/icons/scale.svg
+resources/icons/set_separate_obj.svg
+resources/icons/shape_ungroup.png
+resources/icons/skirt+brim.svg
+resources/icons/sla_printer.svg
+resources/icons/sla_supports.svg
+resources/icons/split_object_SMALL.svg
+resources/icons/split_objects.svg
+resources/icons/split_parts.svg
+resources/icons/split_parts_SMALL.svg
+resources/icons/spool.svg
+resources/icons/stl.icns
+resources/icons/support.svg
+resources/icons/support_blocker.svg
+resources/icons/support_enforcer.svg
+resources/icons/table.png
+resources/icons/test.svg
+resources/icons/thumb_down.svg
+resources/icons/thumb_up.svg
+resources/icons/time.svg
+resources/icons/toolbar_background.png
+resources/icons/undo.svg
+resources/icons/undo_menu.svg
+resources/icons/undo_toolbar.svg
+resources/icons/up_half_circle.png
+resources/icons/upload_queue.svg
+resources/icons/variable_layer_height_reset.png
+resources/icons/variable_layer_height_tooltip.png
+resources/icons/white/add_copies.svg
+resources/icons/white/add_modifier.svg
+resources/icons/white/add_part.svg
+resources/icons/white/advanced+wrench.svg
+resources/icons/white/advanced_plus.svg
+resources/icons/white/cog.svg
+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/edit_layers_all.svg
+resources/icons/white/edit_layers_some.svg
+resources/icons/white/editor_menu.svg
+resources/icons/white/export_config.svg
+resources/icons/white/export_config_bundle.svg
+resources/icons/white/export_gcode.svg
+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/flag_green.svg
+resources/icons/white/flag_red.svg
+resources/icons/white/funnel.svg
+resources/icons/white/hollowing.svg
+resources/icons/white/import_config.svg
+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/layers.svg
+resources/icons/white/lock2_closed.svg
+resources/icons/white/lock_closed.svg
+resources/icons/white/lock_open_sys.svg
+resources/icons/white/machine+cog.svg
+resources/icons/white/mirroring_off.svg
+resources/icons/white/mirroring_on.svg
+resources/icons/white/note.svg
+resources/icons/white/notes.svg
+resources/icons/white/number_of_copies.svg
+resources/icons/white/open.svg
+resources/icons/white/output+page_white.svg
+resources/icons/white/pad.svg
+resources/icons/white/paste_menu.svg
+resources/icons/white/plater.svg
+resources/icons/white/preview_menu.svg
+resources/icons/white/printer.svg
+resources/icons/white/re_slice.svg
+resources/icons/white/redo_menu.svg
+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/set_separate_obj.svg
+resources/icons/white/skirt+brim.svg
+resources/icons/white/sla_printer.svg
+resources/icons/white/split_object_SMALL.svg
+resources/icons/white/split_parts_SMALL.svg
+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/test.svg
+resources/icons/white/time.svg
+resources/icons/white/undo_menu.svg
+resources/icons/white/upload_queue.svg
+resources/icons/white/wrench.svg
+resources/icons/wrench.svg
+resources/icons/wrench_white.svg
+resources/localization/PrusaSlicer.pot
+resources/localization/cs/PrusaSlicer.mo
+resources/localization/cs/PrusaSlicer_cs.po
+resources/localization/de/PrusaSlicer.mo
+resources/localization/de/PrusaSlicer_de.po
+resources/localization/en/PrusaSlicer.mo
+resources/localization/en/PrusaSlicer_en.po
+resources/localization/es/PrusaSlicer.mo
+resources/localization/es/PrusaSlicer_es.po
+resources/localization/fr/PrusaSlicer.mo
+resources/localization/fr/PrusaSlicer_fr.po
+resources/localization/it/PrusaSlicer.mo
+resources/localization/it/PrusaSlicer_it.po
+resources/localization/ja/PrusaSlicer.mo
+resources/localization/ja/PrusaSlicer_ja.po
+resources/localization/ko/PrusaSlicer.mo
+resources/localization/ko/PrusaSlicer_ko_KR.po
+resources/localization/list.txt
+resources/localization/nl/PrusaSlicer.mo
+resources/localization/nl/PrusaSlicer_nl.po
+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/tr/PrusaSlicer.mo
+resources/localization/tr/PrusaSlicer_tr.po
+resources/localization/uk/PrusaSlicer.mo
+resources/localization/uk/PrusaSlicer_uk.po
+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/BIBO.idx
+resources/profiles/BIBO.ini
+resources/profiles/BIBO/BIBO2.svg
+resources/profiles/BIBO/BIBO2_bed.stl
+resources/profiles/BIBO/BIBO2_thumbnail.png
+resources/profiles/Creality.idx
+resources/profiles/Creality.ini
+resources/profiles/Creality/ENDER3_thumbnail.png
+resources/profiles/Creality/ender3.svg
+resources/profiles/Creality/ender3_bed.stl
+resources/profiles/LulzBot.idx
+resources/profiles/LulzBot.ini
+resources/profiles/LulzBot/MINI_AERO_thumbnail.png
+resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png
+resources/profiles/PrusaResearch.idx
+resources/profiles/PrusaResearch.ini
+resources/profiles/PrusaResearch/MINI_thumbnail.png
+resources/profiles/PrusaResearch/MK2.5MMU2_thumbnail.png
+resources/profiles/PrusaResearch/MK2.5SMMU2S_thumbnail.png
+resources/profiles/PrusaResearch/MK2.5S_thumbnail.png
+resources/profiles/PrusaResearch/MK2.5_thumbnail.png
+resources/profiles/PrusaResearch/MK2SMM_thumbnail.png
+resources/profiles/PrusaResearch/MK2S_thumbnail.png
+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/SL1_thumbnail.png
+resources/profiles/PrusaResearch/mini.svg
+resources/profiles/PrusaResearch/mini_bed.stl
+resources/profiles/PrusaResearch/mk2.svg
+resources/profiles/PrusaResearch/mk2_bed.stl
+resources/profiles/PrusaResearch/mk3.svg
+resources/profiles/PrusaResearch/mk3_bed.stl
+resources/profiles/PrusaResearch/sl1.svg
+resources/profiles/PrusaResearch/sl1_bed.stl
+resources/resources
+resources/shaders/gouraud.fs
+resources/shaders/gouraud.vs
+resources/shaders/printbed.fs
+resources/shaders/printbed.vs
+resources/shaders/variable_layer_height.fs
+resources/shaders/variable_layer_height.vs
+resources/udev/90-3dconnexion.rules
diff --git a/PrusaSlicer/TODO b/PrusaSlicer/TODO
new file mode 100644
index 0000000000..b7ab471fcc
--- /dev/null
+++ b/PrusaSlicer/TODO
@@ -0,0 +1,4 @@
+In addition to wip/ versions of packages, this package needs:
+
+- patch to math/nlopt to avoid symbol collisions with libc.
+- patch to math/cgal to remove WRKDIR from installed cmake files.
diff --git a/PrusaSlicer/distinfo b/PrusaSlicer/distinfo
new file mode 100644
index 0000000000..9616a857d8
--- /dev/null
+++ b/PrusaSlicer/distinfo
@@ -0,0 +1,11 @@
+$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 (patch-src_CMakeLists_txt) = fcff54df2484c2bbf9ed4c2da62fe6fe8b6329df
+SHA1 (patch-src_PrusaSlicer.cpp) = ab61fc3ed6b99c9686c26a0dcc978c819783a27f
+SHA1 (patch-src_admesh_stlinit.cpp) = db72a9660045de06db58188227767aefd84ad829
+SHA1 (patch-src_avrdude_libavrdude.h) = 414cf7c6c23f7eed61319f8580c1dd7218ac4337
+SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 4e3d61385da6e31d09a740160bac66e77108b74d
diff --git a/PrusaSlicer/patches/patch-src_CMakeLists_txt b/PrusaSlicer/patches/patch-src_CMakeLists_txt
new file mode 100644
index 0000000000..7357a734ca
--- /dev/null
+++ b/PrusaSlicer/patches/patch-src_CMakeLists_txt
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Use libhidapi from pkgsrc.
+Only use libdl on Linux.
+
+--- src/CMakeLists.txt.orig	2020-03-21 10:55:51.000000000 +0000
++++ src/CMakeLists.txt
+@@ -23,8 +23,6 @@ add_subdirectory(libslic3r)
+ 
+ if (SLIC3R_GUI)
+     add_subdirectory(imgui)
+-    add_subdirectory(hidapi)
+-    include_directories(hidapi/include)
+ 
+     if(WIN32)
+         message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
+@@ -113,8 +111,10 @@ target_link_libraries(PrusaSlicer libsli
+         target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
+     elseif (APPLE)
+         target_link_libraries(PrusaSlicer "-framework OpenGL")
+-    else ()
++    elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+         target_link_libraries(PrusaSlicer -ldl)
++    else ()
++        # nothing.
+     endif ()
+ endif ()
+ 
diff --git a/PrusaSlicer/patches/patch-src_PrusaSlicer.cpp b/PrusaSlicer/patches/patch-src_PrusaSlicer.cpp
new file mode 100644
index 0000000000..6b69357f11
--- /dev/null
+++ b/PrusaSlicer/patches/patch-src_PrusaSlicer.cpp
@@ -0,0 +1,23 @@
+$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
+@@ -22,6 +22,7 @@
+ #include <cstring>
+ #include <iostream>
+ #include <math.h>
++#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)
+         }
+     }
+ 
+-    boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]);
++    boost::filesystem::path path_to_binary = boost::dll::program_location();
+ 
+     // Path from the Slic3r binary to its resources.
+ #ifdef __APPLE__
diff --git a/PrusaSlicer/patches/patch-src_admesh_stlinit.cpp b/PrusaSlicer/patches/patch-src_admesh_stlinit.cpp
new file mode 100644
index 0000000000..648d8689e6
--- /dev/null
+++ b/PrusaSlicer/patches/patch-src_admesh_stlinit.cpp
@@ -0,0 +1,44 @@
+$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_avrdude_libavrdude.h b/PrusaSlicer/patches/patch-src_avrdude_libavrdude.h
new file mode 100644
index 0000000000..303b61de4c
--- /dev/null
+++ b/PrusaSlicer/patches/patch-src_avrdude_libavrdude.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+alloca.h is Linux specific.
+
+--- src/avrdude/libavrdude.h.orig	2020-03-21 10:55:51.000000000 +0000
++++ src/avrdude/libavrdude.h
+@@ -950,7 +950,7 @@ int read_config_builtin();
+ // Header file for alloca()
+ #if defined(WIN32NATIVE)
+ #  include <malloc.h>
+-#else
++#elif defined(__linux__)
+ #  include <alloca.h>
+ #endif
+ 
diff --git a/PrusaSlicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp b/PrusaSlicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
new file mode 100644
index 0000000000..1c6626dfe0
--- /dev/null
+++ b/PrusaSlicer/patches/patch-src_slic3r_GUI_Mouse3DController.hpp
@@ -0,0 +1,15 @@
+$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
+@@ -6,7 +6,7 @@
+ 
+ #include "libslic3r/Point.hpp"
+ 
+-#include "hidapi.h"
++#include "hidapi/hidapi.h"
+ 
+ #include <queue>
+ #include <thread>
Prev by Date: wip/cereal: Upgrade from 1.2.2 to 1.3.0.
Next by Date: wip/wxGTK31: Development version of x11/wxGTK30.
Previous by Thread: wip/cereal: Upgrade from 1.2.2 to 1.3.0.
Next by Thread: wip/wxGTK31: Development version of x11/wxGTK30.
Indexes:
Home | Main Index | Thread Index | Old Index