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

prusaslicer: Update to 2.5.0-rc1

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Thu Aug 25 20:38:02 2022 +1000
Changeset:	80e85ac4a078eb508736ff3b561ef525cbc92cdf

Modified Files:
	prusaslicer/Makefile
	prusaslicer/PLIST
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_CMakeLists_txt
	prusaslicer/patches/patch-src_libslic3r_GCodeSender.cpp
	prusaslicer/patches/patch-src_libslic3r_LocalesUtils.hpp
	prusaslicer/patches/patch-src_libslic3r_Thread.cpp
	prusaslicer/patches/patch-src_slic3r_Utils_Serial.cpp
Added Files:
	prusaslicer/patches/patch-src_occt__wrapper_CMakeLists.txt

Log Message:
prusaslicer: Update to 2.5.0-rc1

Noteable new features:
- Arachne perimeter generator
- Lightning infill
- Pressure equalizer (EXPERIMENTAL)
- Visibility-based seam placement
- STEP file format import (requires new opencascade dependency)

Full feature and bug release notes at:
https://github.com/prusa3d/PrusaSlicer/releases

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

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

diffstat:
 prusaslicer/Makefile                               | 15 ++++++++++----
 prusaslicer/PLIST                                  | 22 ++++++++++++++++++++
 prusaslicer/distinfo                               | 17 +++++++--------
 prusaslicer/patches/patch-src_CMakeLists_txt       | 23 +++++----------------
 .../patches/patch-src_libslic3r_GCodeSender.cpp    |  2 ++
 .../patches/patch-src_libslic3r_LocalesUtils.hpp   | 20 +++++++++++++++++-
 prusaslicer/patches/patch-src_libslic3r_Thread.cpp | 24 +++-------------------
 .../patches/patch-src_occt__wrapper_CMakeLists.txt | 15 ++++++++++++++
 .../patches/patch-src_slic3r_Utils_Serial.cpp      |  2 ++
 9 files changed, 88 insertions(+), 52 deletions(-)

diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index c4f2dca414..b50d361b82 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGVERSION=	2.4.2
+PKGVERSION=	2.5.0rc1
 PKGNAME=	prusaslicer-${PKGVERSION}
 DISTNAME=	PrusaSlicer-${PKGVERSION:S/rc/-rc/}
 CATEGORIES=	cad
@@ -22,12 +22,16 @@ GCC_REQD+=	10
 USE_LANGUAGES=	c c++17
 USE_TOOLS+=	cmake gmake
 USE_CMAKE=	yes
+ICON_THEMES=	yes
+
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
+BUILDLINK_TRANSFORM.NetBSD+=	l:libexpat:expat
 
 .include "../../mk/bsd.prefs.mk"
 
-CMAKE_ARGS+=	-DSLIC3R_WX_STABLE=1
-CMAKE_ARGS+=	-DSLIC3R_FHS=1
-#CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS=-g
+CMAKE_ARGS+=	-DSLIC3R_WX_STABLE:BOOL=TRUE
+CMAKE_ARGS+=	-DSLIC3R_FHS:BOOL=TRUE
+#CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS:STRING=-g
 
 .include "../../comms/libhidapi/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
@@ -43,6 +47,8 @@ CMAKE_ARGS+=	-DSLIC3R_FHS=1
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/graphite2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libjpeg-turbo/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/cgal/buildlink3.mk"
@@ -54,6 +60,7 @@ CMAKE_ARGS+=	-DSLIC3R_FHS=1
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../wip/cereal/buildlink3.mk"
 .include "../../wip/nlopt/buildlink3.mk"
+.include "../../wip/opencascade-git/buildlink3.mk"
 .include "../../wip/openvdb/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"
diff --git a/prusaslicer/PLIST b/prusaslicer/PLIST
index 2388953c54..f4dbcd664e 100644
--- a/prusaslicer/PLIST
+++ b/prusaslicer/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD$
+bin/OCCTWrapper.so
 bin/prusa-gcodeviewer
 bin/prusa-slicer
 lib/udev/rules.d/90-3dconnexion.rules
@@ -343,6 +344,7 @@ share/PrusaSlicer/profiles/Creality/CR10MAX_thumbnail.png
 share/PrusaSlicer/profiles/Creality/CR10MINI_thumbnail.png
 share/PrusaSlicer/profiles/Creality/CR10S4_thumbnail.png
 share/PrusaSlicer/profiles/Creality/CR10S5_thumbnail.png
+share/PrusaSlicer/profiles/Creality/CR10SMARTPRO_thumbnail.png
 share/PrusaSlicer/profiles/Creality/CR10SMART_thumbnail.png
 share/PrusaSlicer/profiles/Creality/CR10SPROV2_thumbnail.png
 share/PrusaSlicer/profiles/Creality/CR10SPRO_thumbnail.png
@@ -363,9 +365,12 @@ share/PrusaSlicer/profiles/Creality/CRX_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER2PRO_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER2_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER3BLTOUCH_thumbnail.png
+share/PrusaSlicer/profiles/Creality/ENDER3MAXNEO_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER3MAX_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER3PRO_thumbnail.png
+share/PrusaSlicer/profiles/Creality/ENDER3S1PRO_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER3S1_thumbnail.png
+share/PrusaSlicer/profiles/Creality/ENDER3V2NEO_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER3V2_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER3_thumbnail.png
 share/PrusaSlicer/profiles/Creality/ENDER4_thumbnail.png
@@ -411,6 +416,14 @@ share/PrusaSlicer/profiles/Creality/ender7.svg
 share/PrusaSlicer/profiles/Creality/ender7_bed.stl
 share/PrusaSlicer/profiles/Creality/sermoond1.svg
 share/PrusaSlicer/profiles/Creality/sermoond1_bed.stl
+share/PrusaSlicer/profiles/Elegoo.idx
+share/PrusaSlicer/profiles/Elegoo.ini
+share/PrusaSlicer/profiles/Elegoo/NEPTUNE1_thumbnail.png
+share/PrusaSlicer/profiles/Elegoo/NEPTUNE2D_thumbnail.png
+share/PrusaSlicer/profiles/Elegoo/NEPTUNE2S_thumbnail.png
+share/PrusaSlicer/profiles/Elegoo/NEPTUNE2_thumbnail.png
+share/PrusaSlicer/profiles/Elegoo/NEPTUNE3_thumbnail.png
+share/PrusaSlicer/profiles/Elegoo/NEPTUNEX_thumbnail.png
 share/PrusaSlicer/profiles/FLSun.idx
 share/PrusaSlicer/profiles/FLSun.ini
 share/PrusaSlicer/profiles/FLSun/Q5.svg
@@ -421,8 +434,17 @@ share/PrusaSlicer/profiles/FLSun/QQSP_bed.stl
 share/PrusaSlicer/profiles/FLSun/QQSP_thumbnail.png
 share/PrusaSlicer/profiles/INAT.idx
 share/PrusaSlicer/profiles/INAT.ini
+share/PrusaSlicer/profiles/INAT/PROTON_XE750_thumbnail.png
 share/PrusaSlicer/profiles/INAT/PROTON_X_RAIL_thumbnail.png
 share/PrusaSlicer/profiles/INAT/PROTON_X_ROD_thumbnail.png
+share/PrusaSlicer/profiles/Infinity3D.idx
+share/PrusaSlicer/profiles/Infinity3D.ini
+share/PrusaSlicer/profiles/Infinity3D/DEV-200_thumbnail.png
+share/PrusaSlicer/profiles/Infinity3D/DEV-350_thumbnail.png
+share/PrusaSlicer/profiles/Infinity3D/DEV_200_bed.stl
+share/PrusaSlicer/profiles/Infinity3D/DEV_200_texture.svg
+share/PrusaSlicer/profiles/Infinity3D/DEV_350_bed.stl
+share/PrusaSlicer/profiles/Infinity3D/DEV_350_texture.svg
 share/PrusaSlicer/profiles/Jubilee.idx
 share/PrusaSlicer/profiles/Jubilee.ini
 share/PrusaSlicer/profiles/Jubilee/Jubilee_bed.stl
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 25b862470e..1cec2889b9 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -1,20 +1,21 @@
 $NetBSD$
 
-BLAKE2s (PrusaSlicer-2.4.2.tar.gz) = 5ef613e17f15177e1f9438a619eb1a4937186821845cb0d5e6878de43766c94f
-SHA512 (PrusaSlicer-2.4.2.tar.gz) = d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
-Size (PrusaSlicer-2.4.2.tar.gz) = 47752224 bytes
+BLAKE2s (PrusaSlicer-2.5.0-rc1.tar.gz) = 2e714254eaf4a8b043f8173e3d141cf0a82a3bc5adc72d03ff6139b913e94961
+SHA512 (PrusaSlicer-2.5.0-rc1.tar.gz) = 5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90
+Size (PrusaSlicer-2.5.0-rc1.tar.gz) = 48525654 bytes
 SHA1 (patch-CMakeLists.txt) = 33eb39d85ba7b33226f2cc022250872c3ffa28d8
 SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 4f2afc423a70fe60617b33ff7f26859b39775faa
-SHA1 (patch-src_CMakeLists_txt) = 0931dccf0bd1d94544f7dc855475cc2627a9a76b
+SHA1 (patch-src_CMakeLists_txt) = 81526fa13d1a084e96bf1c4d546f677968ad4b74
 SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
 SHA1 (patch-src_avrdude_libavrdude.h) = 62d48054b147985249664f257dbd8bbd670df233
 SHA1 (patch-src_libslic3r_CMakeLists.txt) = bc82a71633adcb23dca4850d1076f99340030f2b
-SHA1 (patch-src_libslic3r_GCodeSender.cpp) = 07dde2f6762c9ef180512ea20f735fb4d96a8f2c
+SHA1 (patch-src_libslic3r_GCodeSender.cpp) = bd69c52e92ff85dba7f357eab62788a8e67a440e
 SHA1 (patch-src_libslic3r_LocalesUtils.cpp) = 33a473cadbc05eba7f0c218110e53babea36568c
-SHA1 (patch-src_libslic3r_LocalesUtils.hpp) = 7339ef576cbd16f30271c13b706d2487ae78b457
+SHA1 (patch-src_libslic3r_LocalesUtils.hpp) = 88edc6156dd317e08ff6bfdf6f6f2d796c41ae05
 SHA1 (patch-src_libslic3r_Platform.cpp) = 3066585efc98ba4963e41bda5952df38a7b095a0
 SHA1 (patch-src_libslic3r_Platform.hpp) = 5626058616d04396bff6c8550951d04fe03249e4
-SHA1 (patch-src_libslic3r_Thread.cpp) = 2e6e81e77e3efef5657ac55fb6b834b2ebec5d9a
+SHA1 (patch-src_libslic3r_Thread.cpp) = 4d8bc324f959792065e03aa3043658e963c1cf62
+SHA1 (patch-src_occt__wrapper_CMakeLists.txt) = 2e11271757bcc76f3832c8fd27943f3ef97136f1
 SHA1 (patch-src_slic3r_CMakeLists.txt) = 32058caf991b20993c1afecf12154a923db28416
 SHA1 (patch-src_slic3r_GUI_ConfigWizard.cpp) = 523d2eeb26c9f580ccdeb034743c301dcc56c727
 SHA1 (patch-src_slic3r_GUI_ConfigWizard__private.hpp) = 7ac3e3a9a67ebe7c99fbfc17ed9c0b2750d96974
@@ -41,4 +42,4 @@ SHA1 (patch-src_slic3r_GUI_Tab.cpp) = 6b615054719ad3bd3bfcc7e5c7c2a57ae5e66041
 SHA1 (patch-src_slic3r_GUI_UnsavedChangesDialog.cpp) = c2e4e2bfccd8492506c4f794b7085fa2c1cbe846
 SHA1 (patch-src_slic3r_GUI_UnsavedChangesDialog.hpp) = cb399a0d751be5c9b25fcf88554612a17bc44d3c
 SHA1 (patch-src_slic3r_GUI_wxExtensions.cpp) = 14a6b3c6a6c0b082b126dcaf1fc869404fa3e9c9
-SHA1 (patch-src_slic3r_Utils_Serial.cpp) = d9723518f192c752b824e33c6c1c80e7905ddf05
+SHA1 (patch-src_slic3r_Utils_Serial.cpp) = 77dbb4e3526e932c04b8020b6f808278d1319bdb
diff --git a/prusaslicer/patches/patch-src_CMakeLists_txt b/prusaslicer/patches/patch-src_CMakeLists_txt
index 129db1a478..6b1e7a9c82 100644
--- a/prusaslicer/patches/patch-src_CMakeLists_txt
+++ b/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -1,14 +1,13 @@
 $NetBSD$
 
 Use libhidapi from pkgsrc.
-Only use libdl on Linux.
 Allow use of stable track wxWidgets on NetBSD.
 Use namespaces to link against libcereal >= 1.3.1 from:
 https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
 
---- src/CMakeLists.txt.orig	2022-04-22 11:01:19.000000000 +0000
+--- src/CMakeLists.txt.orig	2022-08-19 14:41:23.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -22,8 +22,6 @@ add_subdirectory(libslic3r)
+@@ -24,8 +24,6 @@ endif ()
  
  if (SLIC3R_GUI)
      add_subdirectory(imgui)
@@ -17,7 +16,7 @@ https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1
  
      if(WIN32)
          message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
-@@ -36,10 +34,10 @@ if (SLIC3R_GUI)
+@@ -38,10 +36,10 @@ if (SLIC3R_GUI)
          endif()
      endif()
  
@@ -31,24 +30,12 @@ https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1
          else ()
              find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
  
-@@ -125,7 +123,7 @@ if (NOT WIN32 AND NOT APPLE)
+@@ -127,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE)
      set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
  endif ()
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
+ 
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-@@ -151,8 +149,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 ()
-     if (WIN32)
-         find_library(PSAPI_LIB NAMES Psapi)
diff --git a/prusaslicer/patches/patch-src_libslic3r_GCodeSender.cpp b/prusaslicer/patches/patch-src_libslic3r_GCodeSender.cpp
index 7e72dc3a49..faeee34e51 100644
--- a/prusaslicer/patches/patch-src_libslic3r_GCodeSender.cpp
+++ b/prusaslicer/patches/patch-src_libslic3r_GCodeSender.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Treat NetBSD the same as OpenBSD.
+
 --- src/libslic3r/GCodeSender.cpp.orig	2022-03-10 10:35:03.000000000 +0000
 +++ src/libslic3r/GCodeSender.cpp
 @@ -8,7 +8,7 @@
diff --git a/prusaslicer/patches/patch-src_libslic3r_LocalesUtils.hpp b/prusaslicer/patches/patch-src_libslic3r_LocalesUtils.hpp
index dc71321a7f..18d0a5caa4 100644
--- a/prusaslicer/patches/patch-src_libslic3r_LocalesUtils.hpp
+++ b/prusaslicer/patches/patch-src_libslic3r_LocalesUtils.hpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Stash previous locale in a string on NetBSD.
 
---- src/libslic3r/LocalesUtils.hpp.orig	2021-12-17 14:00:02.000000000 +0000
+--- src/libslic3r/LocalesUtils.hpp.orig	2022-08-19 14:41:23.000000000 +0000
 +++ src/libslic3r/LocalesUtils.hpp
 @@ -23,6 +23,8 @@ public:
  private:
@@ -13,3 +13,21 @@ Stash previous locale in a string on NetBSD.
  #else
      locale_t m_original_locale;
      locale_t m_new_locale;
+@@ -49,7 +51,7 @@ inline void set_c_locales()
+ #ifdef _WIN32
+     _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+     std::setlocale(LC_ALL, "C");
+-#else
++#elif __LINUX__ || __OpenBSD__
+     // We are leaking some memory here, because the newlocale() produced memory will never be released.
+     // This is not a problem though, as there will be a maximum one worker thread created per physical thread.
+     uselocale(newlocale(
+@@ -59,6 +61,8 @@ inline void set_c_locales()
+         LC_ALL
+ #endif
+         , "C", nullptr));
++#elif __NetBSD__
++	setlocale(LC_ALL, "C");
+ #endif
+ }
+ 
diff --git a/prusaslicer/patches/patch-src_libslic3r_Thread.cpp b/prusaslicer/patches/patch-src_libslic3r_Thread.cpp
index 603d855809..c01bba8764 100644
--- a/prusaslicer/patches/patch-src_libslic3r_Thread.cpp
+++ b/prusaslicer/patches/patch-src_libslic3r_Thread.cpp
@@ -2,9 +2,9 @@ $NetBSD$
 
 pthread_setname_np takes 3 arguments on NetBSD.
 
---- src/libslic3r/Thread.cpp.orig	2021-12-17 14:00:02.000000000 +0000
+--- src/libslic3r/Thread.cpp.orig	2022-08-19 14:41:23.000000000 +0000
 +++ src/libslic3r/Thread.cpp
-@@ -156,6 +156,36 @@ std::optional<std::string> get_current_t
+@@ -157,6 +157,36 @@ std::optional<std::string> get_current_t
  	return std::nullopt;
  }
  
@@ -41,7 +41,7 @@ pthread_setname_np takes 3 arguments on NetBSD.
  #else
  
  // posix
-@@ -183,7 +213,9 @@ std::optional<std::string> get_current_t
+@@ -184,7 +214,9 @@ std::optional<std::string> get_current_t
  	return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
  }
  
@@ -52,21 +52,3 @@ pthread_setname_np takes 3 arguments on NetBSD.
  
  #endif // _WIN32
  
-@@ -241,6 +273,9 @@ void name_tbb_thread_pool_threads_set_lo
- #else
- 				// We are leaking some memory here, because the newlocale() produced memory will never be released.
- 				// This is not a problem though, as there will be a maximum one worker thread created per physical thread.
-+#ifdef __NetBSD__
-+                                setlocale(LC_ALL, "C");
-+#else
- 				uselocale(newlocale(
- #ifdef __APPLE__
- 					LC_ALL_MASK
-@@ -249,6 +284,7 @@ void name_tbb_thread_pool_threads_set_lo
- #endif
- 					, "C", nullptr));
- #endif
-+#endif
-     		}
-         });
- }
diff --git a/prusaslicer/patches/patch-src_occt__wrapper_CMakeLists.txt b/prusaslicer/patches/patch-src_occt__wrapper_CMakeLists.txt
new file mode 100644
index 0000000000..655668cd90
--- /dev/null
+++ b/prusaslicer/patches/patch-src_occt__wrapper_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Ignore OpenCASCADE version.
+
+--- src/occt_wrapper/CMakeLists.txt.orig	2022-08-19 14:41:23.000000000 +0000
++++ src/occt_wrapper/CMakeLists.txt
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+ 
+ generate_export_header(OCCTWrapper)
+ 
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/prusaslicer/patches/patch-src_slic3r_Utils_Serial.cpp b/prusaslicer/patches/patch-src_slic3r_Utils_Serial.cpp
index 204816e1f7..07470f42cb 100644
--- a/prusaslicer/patches/patch-src_slic3r_Utils_Serial.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_Utils_Serial.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Treat NetBSD the same as OpenBSD.
+
 --- src/slic3r/Utils/Serial.cpp.orig	2022-03-10 10:35:03.000000000 +0000
 +++ src/slic3r/Utils/Serial.cpp
 @@ -49,7 +49,7 @@
Home | Main Index | Thread Index | Old Index