From 5d44d3955cf88128a2ac8543c75e3ccbde134a63 Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:49:32 +0200 Subject: [PATCH 1/7] idempotent mkdir --- BuildLinux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BuildLinux.sh b/BuildLinux.sh index f60e5c5f346..aef32945431 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -122,12 +122,12 @@ then fi if [ ! -d "deps/build" ] then - mkdir deps/build + mkdir -p deps/build fi if [[ -n "${BUILD_DEBUG}" ]] then # have to build deps with debug & release or the cmake won't find everything it needs - mkdir deps/build/release + mkdir -p deps/build/release cmake -S deps -B deps/build/release -G Ninja -DDESTDIR="../destdir" ${BUILD_ARGS} cmake --build deps/build/release BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug" From d857caea939e9e45392271534bec99c56bc91922 Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:49:47 +0200 Subject: [PATCH 2/7] boost version --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b062604fba6..311b1c71f77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,7 +410,8 @@ endif() # set(Boost_COMPILER "-mgw81") # boost::process was introduced first in version 1.64.0, # boost::beast::detail::base64 was introduced first in version 1.66.0 -find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) +#find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) +find_package(Boost 1.84.0 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) add_library(boost_libs INTERFACE) add_library(boost_headeronly INTERFACE) From 66e79cc7ff7e4db541fa684e4e10e71e3e7102b0 Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:50:06 +0200 Subject: [PATCH 3/7] bump Orca version --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index ac86c2d666b..3b614bdfc0b 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "0") endif() -set(SoftFever_VERSION "2.1.1") +set(SoftFever_VERSION "2.2.0-dev") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" SoftFever_VERSION_MATCH ${SoftFever_VERSION}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1}) From a7571180e3137e8f8a1a09a39c1ebf84cef90b35 Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:54:12 +0200 Subject: [PATCH 4/7] Qhull version --- src/qhull/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt index 6f0e090dc7f..814922d68e0 100644 --- a/src/qhull/CMakeLists.txt +++ b/src/qhull/CMakeLists.txt @@ -10,7 +10,8 @@ # see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925540 -find_package(Qhull 7.2 QUIET) +#find_package(Qhull 7.2 QUIET) # Qhull::qhullcpp target was not found +find_package(Qhull 8.0.2 QUIET) # warns only deps 8.0.1 found add_library(qhull INTERFACE) From 9dd0e4f01207f96b4fb7329248fb6c329f6a94c6 Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:55:14 +0200 Subject: [PATCH 5/7] sort m_extruder_retract_keys --- src/libslic3r/PrintConfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index b17746db4f5..7f86be01f02 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5331,11 +5331,11 @@ void PrintConfigDef::init_extruder_option_keys() "retraction_length", "retraction_minimum_travel", "retraction_speed", + "travel_slope", "wipe", "wipe_distance", "z_hop", - "z_hop_types", - "travel_slope" + "z_hop_types" }; assert(std::is_sorted(m_extruder_retract_keys.begin(), m_extruder_retract_keys.end())); } From a7062273d801d398611a63fb01c97b3fffde6f06 Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:55:41 +0200 Subject: [PATCH 6/7] remove assert --- src/libslic3r/Emboss.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp index 13d494d949f..1f630994d11 100644 --- a/src/libslic3r/Emboss.cpp +++ b/src/libslic3r/Emboss.cpp @@ -334,8 +334,8 @@ bool Emboss::divide_segments_for_close_point(ExPolygons &expolygons, double dist const Points &poly_pts = poly.points; const Point &line_a = poly_pts[id.point_index]; const Point &line_b = (!ids.is_last_point(id)) ? poly_pts[id.point_index + 1] : poly_pts.front(); - assert(line_a == lines[index].a.cast()); - assert(line_b == lines[index].b.cast()); + // assert(line_a == lines[index].a.cast()); + // assert(line_b == lines[index].b.cast()); if (p == line_a || p == line_b) continue; divs.emplace_back(p, index); From 5b8b9a50383ce3ec381b3296391fea1ae4242ebc Mon Sep 17 00:00:00 2001 From: Henri van der Riet Date: Tue, 13 Aug 2024 18:56:14 +0200 Subject: [PATCH 7/7] fix ORCA_CHECK_GCODE_PLACEHOLDERS redefinition --- src/libslic3r/libslic3r_version.h.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in index 90383c93af6..1c9defad586 100644 --- a/src/libslic3r/libslic3r_version.h.in +++ b/src/libslic3r/libslic3r_version.h.in @@ -10,6 +10,13 @@ //#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@" #define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@ #define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@ -#define ORCA_CHECK_GCODE_PLACEHOLDERS @ORCA_CHECK_GCODE_PLACEHOLDERS@ + +// @ORCA_CHECK_GCODE_PLACEHOLDERS@ +// Logic taken from ./src/libslic3r/GCode.hpp +#if !defined(NDEBUG) + #define ORCA_CHECK_GCODE_PLACEHOLDERS 1 +#else + #define ORCA_CHECK_GCODE_PLACEHOLDERS 0 +#endif #endif /* __SLIC3R_VERSION_H */