Diff updating cad/prusaslicer to 2.9.0.
Deleted files:
- cad/prusaslicer/patches/patch-src_libslic3r_Arrange_Core_DataStoreTraits_hpp
- cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt
Added files:
-
cad/prusaslicer/patches/patch-src_slic3r-arrange_include_arrange_DataStoreTraits_hpp
Modified files:
- cad/prusaslicer/Makefile
- cad/prusaslicer/distinfo
- cad/prusaslicer/patches/patch-CMakeLists_txt
- cad/prusaslicer/patches/patch-src_CMakeLists_txt
- cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
- cad/prusaslicer/patches/patch-src_slic3r_CMakeLists_txt
- cad/prusaslicer/patches/patch-src_slic3r_GUI_GLCanvas3D_cpp
- cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp
- cad/prusaslicer/patches/patch-src_slic3r_GUI_UserAccountCommunication_cpp
- cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp
- cad/prusaslicer/patches/patch-tests_libslic3r_test_emboss_cpp
- cad/prusaslicer/pkg/PLIST
diff /usr/ports
path + /usr/ports
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 296c324aa2dfa754e2e187e7f4ccc01f21dd3be2
file + cad/prusaslicer/Makefile
--- cad/prusaslicer/Makefile
+++ cad/prusaslicer/Makefile
@@ -2,9 +2,8 @@ COMMENT = g-code generator for 3D printers
ONLY_FOR_ARCHS = ${LP64_ARCHS}
DPB_PROPERTIES = parallel
-V = 2.8.1
+V = 2.9.0
PKGNAME = prusaslicer-${V}
-REVISION = 1
GH_ACCOUNT = prusa3d
GH_PROJECT = PrusaSlicer
@@ -75,7 +74,4 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSLIC3R_GTK=3 \
-DSLIC3R_PCH=OFF
-post-extract:
- rm ${WRKDIST}/cmake/modules/FindEigen3.cmake
-
.include <bsd.port.mk>
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 2ea6f5d19aac4b521d3cf9164c2221e275bd8d3a
file + cad/prusaslicer/distinfo
--- cad/prusaslicer/distinfo
+++ cad/prusaslicer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.8.1.tar.gz) =
9xAz3U6f3Y5ax7W+WAPQ1tCewP2H3pKxUrPGu64EwQM=
-SIZE (PrusaSlicer-version_2.8.1.tar.gz) = 69409077
+SHA256 (PrusaSlicer-version_2.9.0.tar.gz) =
UVpB3qO80vyttxOyLk7M/Ub7t6fKja2EQOe14p+7wgY=
+SIZE (PrusaSlicer-version_2.9.0.tar.gz) = 70604482
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 93bcd6e59d035b72952d1f3e096b1252326ab34c
file + cad/prusaslicer/patches/patch-CMakeLists_txt
--- cad/prusaslicer/patches/patch-CMakeLists_txt
+++ cad/prusaslicer/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -234,7 +234,7 @@ if (APPLE)
+@@ -233,7 +233,7 @@ if (APPLE)
endif ()
endif ()
@@ -10,7 +10,7 @@ Index: CMakeLists.txt
find_package(PkgConfig REQUIRED)
if (CMAKE_VERSION VERSION_LESS "3.1")
-@@ -646,7 +646,6 @@ elseif (SLIC3R_FHS)
+@@ -645,7 +645,6 @@ elseif (SLIC3R_FHS)
DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME
PrusaSlicer-gcodeviewer.png
)
endforeach()
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 3b94fa45d7046f70236d6ba992ccb5aa7dd3d420
file + cad/prusaslicer/patches/patch-src_CMakeLists_txt
--- cad/prusaslicer/patches/patch-src_CMakeLists_txt
+++ cad/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -136,6 +136,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
+@@ -138,6 +138,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
elseif (APPLE)
target_link_libraries(PrusaSlicer "-framework OpenGL")
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - ef0f62cea48485573e9d8af519e00fd29129c098
file + cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
--- cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
+++ cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
@@ -1,7 +1,7 @@
Index: src/PrusaSlicer.cpp
--- src/PrusaSlicer.cpp.orig
+++ src/PrusaSlicer.cpp
-@@ -807,8 +807,8 @@ bool CLI::setup(int argc, char **argv)
+@@ -879,8 +879,8 @@ bool CLI::setup(int argc, char **argv)
#endif
// See Invoking prusa-slicer from $PATH environment variable crashes #5542
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 5475dafc8f8ea480bd57a5148bfc216d8c3c1dc0
file + /dev/null
--- cad/prusaslicer/patches/patch-src_libslic3r_Arrange_Core_DataStoreTraits_hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with llvm-19
-https://github.com/freebsd/freebsd-ports/commit/778f3f32a33da38f6b526acdddfd6d805a9d0535
-
-Index: src/libslic3r/Arrange/Core/DataStoreTraits.hpp
---- src/libslic3r/Arrange/Core/DataStoreTraits.hpp.orig
-+++ src/libslic3r/Arrange/Core/DataStoreTraits.hpp
-@@ -71,7 +71,7 @@ template<class T, class TT = T> using WritableDataStor
- template<class T, class ArrItem>
- void set_data(ArrItem &itm, const std::string &key, T &&data)
- {
-- WritableDataStoreTraits<ArrItem>::template set(itm, key,
std::forward<T>(data));
-+ WritableDataStoreTraits<ArrItem>::template set<T>(itm, key,
std::forward<T>(data));
- }
-
- template<class T> constexpr bool IsReadWritableDataStore = IsDataStore<T> &&
IsWritableDataStore<T>;
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 6d85ebb18448381a79585f5c797a935f515f6a71
file + /dev/null
--- cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/libslic3r/CMakeLists.txt
---- src/libslic3r/CMakeLists.txt.orig
-+++ src/libslic3r/CMakeLists.txt
-@@ -639,6 +639,7 @@ target_link_libraries(libslic3r PUBLIC
- libigl
- agg
- ankerl
-+ boost_headeronly
- )
-
- if (APPLE)
commit - 1d08f52dbd7a88198d66f6e691c4acc7982636ee
blob - /dev/null
file +
cad/prusaslicer/patches/patch-src_slic3r-arrange_include_arrange_DataStoreTraits_hpp
(mode 644)
--- /dev/null
+++
cad/prusaslicer/patches/patch-src_slic3r-arrange_include_arrange_DataStoreTraits_hpp
@@ -0,0 +1,15 @@
+Fix build with llvm-19
+https://github.com/freebsd/freebsd-ports/commit/778f3f32a33da38f6b526acdddfd6d805a9d0535
+
+Index: src/slic3r-arrange/include/arrange/DataStoreTraits.hpp
+--- src/slic3r-arrange/include/arrange/DataStoreTraits.hpp.orig
++++ src/slic3r-arrange/include/arrange/DataStoreTraits.hpp
+@@ -71,7 +71,7 @@ template<class T, class TT = T> using WritableDataStor
+ template<class T, class ArrItem>
+ void set_data(ArrItem &itm, const std::string &key, T &&data)
+ {
+- WritableDataStoreTraits<ArrItem>::template set(itm, key,
std::forward<T>(data));
++ WritableDataStoreTraits<ArrItem>::template set<T>(itm, key,
std::forward<T>(data));
+ }
+
+ template<class T> constexpr bool IsReadWritableDataStore = IsDataStore<T> &&
IsWritableDataStore<T>;
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - b0a2c134579f971aace58b10f4f12b15585bad7a
file + cad/prusaslicer/patches/patch-src_slic3r_CMakeLists_txt
--- cad/prusaslicer/patches/patch-src_slic3r_CMakeLists_txt
+++ cad/prusaslicer/patches/patch-src_slic3r_CMakeLists_txt
@@ -1,8 +1,17 @@
Index: src/slic3r/CMakeLists.txt
--- src/slic3r/CMakeLists.txt.orig
+++ src/slic3r/CMakeLists.txt
-@@ -421,6 +421,9 @@ endforeach()
+@@ -393,7 +393,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+ find_package(NanoSVG REQUIRED)
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
++if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL
"OpenBSD")
+ find_package(OpenSSL REQUIRED)
+ endif()
+
+@@ -434,6 +434,9 @@ endforeach()
+
encoding_check(libslic3r_gui)
+pkg_check_modules(HIDAPI REQUIRED hidapi-libusb)
@@ -11,18 +20,16 @@ Index: src/slic3r/CMakeLists.txt
target_link_libraries(
libslic3r_gui
PUBLIC
-@@ -442,8 +445,8 @@ target_link_libraries(
+@@ -457,7 +460,7 @@ target_link_libraries(
if (MSVC)
target_link_libraries(libslic3r_gui PUBLIC Setupapi.lib)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-- target_link_libraries(libslic3r_gui PUBLIC ${DBUS_LIBRARIES})
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL
"OpenBSD")
-+ target_link_libraries(libslic3r_gui PUBLIC ${DBUS_LIBRARIES} ssl crypto
boost_headeronly)
- elseif (APPLE)
- target_link_libraries(libslic3r_gui PUBLIC ${DISKARBITRATION_LIBRARY}
${COREWLAN_LIBRARY})
- endif()
-@@ -465,7 +468,7 @@ if (UNIX AND NOT APPLE)
+ target_link_libraries(libslic3r_gui PUBLIC
+ ${DBus1_LIBRARIES}
+ OpenSSL::SSL
+@@ -484,7 +487,7 @@ if (UNIX AND NOT APPLE)
find_package(GTK${SLIC3R_GTK} REQUIRED)
find_package(PkgConfig REQUIRED)
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 888c55e75054ff3ba576631e24c22b5cbb320bda
file + cad/prusaslicer/patches/patch-src_slic3r_GUI_GLCanvas3D_cpp
--- cad/prusaslicer/patches/patch-src_slic3r_GUI_GLCanvas3D_cpp
+++ cad/prusaslicer/patches/patch-src_slic3r_GUI_GLCanvas3D_cpp
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GLCanvas3D.cpp
--- src/slic3r/GUI/GLCanvas3D.cpp.orig
+++ src/slic3r/GUI/GLCanvas3D.cpp
-@@ -107,7 +107,7 @@ float RetinaHelper::get_scale_factor() { return float(
+@@ -161,7 +161,7 @@ float RetinaHelper::get_scale_factor() { return float(
#endif // __WXGTK3__
// Fixed the collision between BuildVolume::Type::Convex and macro Convex
defined inside /usr/include/X11/X.h that is included by WxWidgets 3.0.
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - ffde76d2f7cd7770b53f47a8a842b23c4caea301
file + cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp
--- cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp
+++ cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp
@@ -1,10 +1,10 @@
Index: src/slic3r/GUI/Plater.cpp
--- src/slic3r/GUI/Plater.cpp.orig
+++ src/slic3r/GUI/Plater.cpp
-@@ -4106,7 +4106,7 @@ void Plater::load_project(const wxString& filename)
+@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString& filename)
+ s_multiple_beds.set_loading_project_flag(true);
+ ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);});
- p->reset();
-
- if (! load_files({ into_path(filename) }).empty()) {
+ if (! load_files((const std::vector<boost::filesystem::path>){
into_path(filename) }).empty()) {
// At least one file was loaded.
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - cec541f0b9d5f83ff3f0e729bfd35afaf48cb26d
file + cad/prusaslicer/patches/patch-src_slic3r_GUI_UserAccountCommunication_cpp
--- cad/prusaslicer/patches/patch-src_slic3r_GUI_UserAccountCommunication_cpp
+++ cad/prusaslicer/patches/patch-src_slic3r_GUI_UserAccountCommunication_cpp
@@ -36,7 +36,7 @@ Index: src/slic3r/GUI/UserAccountCommunication.cpp
load_refresh_token_linux(refresh_token);
#endif
}
-@@ -254,7 +255,7 @@ void UserAccountCommunication::set_username(const std:
+@@ -252,7 +253,7 @@ void UserAccountCommunication::set_username(const std:
save_secret("tokens", m_session->get_shared_session_key(),
tokens);
}
else {
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - 107565a7533f3d44d9e7ea885ab1acfd2359c358
file + cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp
--- cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp
+++ cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp
@@ -1,7 +1,7 @@
Index: tests/fff_print/test_gcode.cpp
--- tests/fff_print/test_gcode.cpp.orig
+++ tests/fff_print/test_gcode.cpp
-@@ -66,7 +66,7 @@ TEST_CASE("Wiping speeds", "[GCode]") {
+@@ -65,7 +65,7 @@ TEST_CASE("Wiping speeds", "[GCode]") {
INFO("Wipe moves don\'t retract faster than configured speed");
CHECK(retract_speed < expected_retract_speed);
}
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - b21df79433b0c9c4145a842768651c0bdc18ad1d
file + cad/prusaslicer/patches/patch-tests_libslic3r_test_emboss_cpp
--- cad/prusaslicer/patches/patch-tests_libslic3r_test_emboss_cpp
+++ cad/prusaslicer/patches/patch-tests_libslic3r_test_emboss_cpp
@@ -1,7 +1,7 @@
Index: tests/libslic3r/test_emboss.cpp
--- tests/libslic3r/test_emboss.cpp.orig
+++ tests/libslic3r/test_emboss.cpp
-@@ -413,7 +413,7 @@ TEST_CASE("ray segment intersection", "[MeshBoolean]")
+@@ -414,7 +414,7 @@ TEST_CASE("ray segment intersection", "[MeshBoolean]")
CHECK(abs(*t1 - *t2) < std::numeric_limits<double>::epsilon());
}
@@ -10,7 +10,7 @@ Index: tests/libslic3r/test_emboss.cpp
{
Vec2d point(1, 1);
Vec2d dir(-1, 0);
-@@ -482,7 +482,7 @@ TEST_CASE("Italic check", "[Emboss]")
+@@ -483,7 +483,7 @@ TEST_CASE("Italic check", "[Emboss]")
#endif // FONT_DIR_PATH
#include "libslic3r/CutSurface.hpp"
commit - 937543c66f11e20c450ad06ea4247b86a4636545
blob - fd83cc8a066587408d464b83ea98058076893bc5
file + cad/prusaslicer/pkg/PLIST
--- cad/prusaslicer/pkg/PLIST
+++ cad/prusaslicer/pkg/PLIST
@@ -44,6 +44,7 @@ share/PrusaSlicer/icons/align_vertical_bottom.svg
share/PrusaSlicer/icons/align_vertical_center.svg
share/PrusaSlicer/icons/align_vertical_top.svg
share/PrusaSlicer/icons/arrange.svg
+share/PrusaSlicer/icons/arrange_current.svg
share/PrusaSlicer/icons/attention.svg
share/PrusaSlicer/icons/browse.svg
share/PrusaSlicer/icons/bullet_black.png
@@ -132,6 +133,8 @@ share/PrusaSlicer/icons/flag_green.svg
share/PrusaSlicer/icons/flag_red.svg
share/PrusaSlicer/icons/funnel.svg
share/PrusaSlicer/icons/fuzzy_skin.svg
+share/PrusaSlicer/icons/fuzzy_skin_painting.svg
+share/PrusaSlicer/icons/fuzzy_skin_painting_.svg
share/PrusaSlicer/icons/gcode.icns
share/PrusaSlicer/icons/hollow.svg
share/PrusaSlicer/icons/hollowing.svg
@@ -212,7 +215,9 @@ share/PrusaSlicer/icons/notification_preferences_hover
share/PrusaSlicer/icons/notification_right.svg
share/PrusaSlicer/icons/notification_right_hover.svg
share/PrusaSlicer/icons/notification_warning.svg
+share/PrusaSlicer/icons/notification_warning_grey.svg
share/PrusaSlicer/icons/number_of_copies.svg
+share/PrusaSlicer/icons/numbers.png
share/PrusaSlicer/icons/objlist_info.svg
share/PrusaSlicer/icons/open.svg
share/PrusaSlicer/icons/open_browser.svg
@@ -227,6 +232,9 @@ share/PrusaSlicer/icons/plater.svg
share/PrusaSlicer/icons/plug.svg
share/PrusaSlicer/icons/preview.svg
share/PrusaSlicer/icons/preview_menu.svg
+share/PrusaSlicer/icons/print_finished.svg
+share/PrusaSlicer/icons/print_idle.svg
+share/PrusaSlicer/icons/print_running.svg
share/PrusaSlicer/icons/printer.svg
share/PrusaSlicer/icons/printer_available.svg
share/PrusaSlicer/icons/printer_busy.svg
@@ -268,6 +276,7 @@ share/PrusaSlicer/icons/sla_printer_offline.svg
share/PrusaSlicer/icons/sla_supports.svg
share/PrusaSlicer/icons/sla_view_original.svg
share/PrusaSlicer/icons/sla_view_processed.svg
+share/PrusaSlicer/icons/slice_all.svg
share/PrusaSlicer/icons/snap.svg
share/PrusaSlicer/icons/spin_dec.svg
share/PrusaSlicer/icons/spin_dec_act.svg
@@ -629,6 +638,8 @@ share/PrusaSlicer/profiles/FLSun/QQSP_thumbnail.png
share/PrusaSlicer/profiles/Geeetech/
share/PrusaSlicer/profiles/Geeetech.idx
share/PrusaSlicer/profiles/Geeetech.ini
+share/PrusaSlicer/profiles/Geeetech/105x105.stl
+share/PrusaSlicer/profiles/Geeetech/105x105.svg
share/PrusaSlicer/profiles/Geeetech/125X130.stl
share/PrusaSlicer/profiles/Geeetech/125x130.svg
share/PrusaSlicer/profiles/Geeetech/150x150.stl
@@ -663,6 +674,8 @@ share/PrusaSlicer/profiles/Geeetech/GiantArmD200_thumb
share/PrusaSlicer/profiles/Geeetech/I3ProB_thumbnail.png
share/PrusaSlicer/profiles/Geeetech/I3ProC_thumbnail.png
share/PrusaSlicer/profiles/Geeetech/I3ProW_thumbnail.png
+share/PrusaSlicer/profiles/Geeetech/M1.svg
+share/PrusaSlicer/profiles/Geeetech/M1_thumbnail.png
share/PrusaSlicer/profiles/Geeetech/MeCreator2_thumbnail.png
share/PrusaSlicer/profiles/Geeetech/MeCreator_thumbnail.png
share/PrusaSlicer/profiles/Geeetech/MeDucer_thumbnail.png
@@ -838,6 +851,7 @@ share/PrusaSlicer/profiles/RatRig/rr-vminion.stl
share/PrusaSlicer/profiles/RatRig/rr-vminion.svg
share/PrusaSlicer/profiles/RatRig/vc4-corexy.png
share/PrusaSlicer/profiles/RatRig/vc4-hybrid.png
+share/PrusaSlicer/profiles/RatRig/vc4-idex.png
share/PrusaSlicer/profiles/Rigid3D/
share/PrusaSlicer/profiles/Rigid3D.idx
share/PrusaSlicer/profiles/Rigid3D.ini
@@ -1127,9 +1141,11 @@ share/PrusaSlicer/shapes/torus.stl
share/PrusaSlicer/shapes/universal wall mount hole.png
share/PrusaSlicer/shapes/universal wall mount hole.stl
share/PrusaSlicer/web/
+share/PrusaSlicer/web/connect_error.html
share/PrusaSlicer/web/connect_loading.html
-share/PrusaSlicer/web/connection_failed.html
-share/PrusaSlicer/web/loading.html
+share/PrusaSlicer/web/error_no_reload.html
+share/PrusaSlicer/web/other_error.html
+share/PrusaSlicer/web/other_loading.html
share/applications/PrusaGcodeviewer.desktop
share/applications/PrusaSlicer.desktop
share/icons/hicolor/128x128/apps/PrusaSlicer-gcodeviewer.png
