Accepting request 1229138 from science
- Changelog for 2.8.1 * When using the wipe tower with "No sparse layers" option enabled, there would still be travels to the wipe tower location even for the skipped layers. This is a regression introduced in 2.8.1-rc1 (#13384). * A warning about inconsistent color profiles in PNGs used as Prusa Account avatar is now silently ignored (#12920). ## Improvements with respect to 2.8.0 * Based on the feedback received after 2.8.0 release, the menu bar was reinstated and the menu no longer hides under a button. Thanks everyone for the feedback, it was very helpful and it will be taken into consideration during possible UI-related decisions in the future. #12943 * When logging-in with the PrusaAccount using third party authorization (Google, Apple, Facebook), an external browser window is opened so the user is not forced to enter their credentials into windows created by PrusaSlicer. * The built-in web engine no longer remembers the user after logout. * There are two new parameters: Filaments->Advanced->Abrasive material and Printers->Extruder->High flow nozzle. Both flags will be used to check whether a sliced G-code is compatible with the given printer (abrasive material requires hardened nozzle) and also to ensure that "Set as current" function in PrusaSlicer-embedded Prusa Connect will select the suitable profile for the given configuration. * Note that this feature is supported since MINI/MK4/XL firmware version 6.2.0-alpha1, and that the implementation in Prusa Connect is not completely finished yet, meaning that the dialog where printer is selected does not use this information - it OBS-URL: https://build.opensuse.org/request/show/1229138 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PrusaSlicer?expand=0&rev=37
This commit is contained in:
commit
646ff91146
@ -1,54 +0,0 @@
|
|||||||
From ac3e07ee03b439932b9f7b00849ca202602f8901 Mon Sep 17 00:00:00 2001
|
|
||||||
From: randomtechguy <50642148+Rose-David@users.noreply.github.com>
|
|
||||||
Date: Fri, 12 Jul 2024 17:24:16 -0400
|
|
||||||
Subject: [PATCH 1/3] Update CMakeLists.txt to fix linux compile error
|
|
||||||
|
|
||||||
---
|
|
||||||
src/slic3r/CMakeLists.txt | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
Index: PrusaSlicer-version_2.8.0/src/slic3r/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/CMakeLists.txt
|
|
||||||
+++ PrusaSlicer-version_2.8.0/src/slic3r/CMakeLists.txt
|
|
||||||
@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
|
|
||||||
)
|
|
||||||
|
|
||||||
find_package(NanoSVG REQUIRED)
|
|
||||||
+find_package(OpenSSL REQUIRED)
|
|
||||||
|
|
||||||
if (APPLE)
|
|
||||||
list(APPEND SLIC3R_GUI_SOURCES
|
|
||||||
@@ -404,7 +405,7 @@ endforeach()
|
|
||||||
|
|
||||||
encoding_check(libslic3r_gui)
|
|
||||||
|
|
||||||
-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
|
|
||||||
+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
|
|
||||||
|
|
||||||
if (MSVC)
|
|
||||||
target_link_libraries(libslic3r_gui Setupapi.lib)
|
|
||||||
Index: PrusaSlicer-version_2.8.0/src/slic3r/Config/Version.cpp
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/Config/Version.cpp
|
|
||||||
+++ PrusaSlicer-version_2.8.0/src/slic3r/Config/Version.cpp
|
|
||||||
@@ -7,6 +7,7 @@
|
|
||||||
#include <cctype>
|
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
+#include <boost/filesystem/directory.hpp>
|
|
||||||
#include <boost/nowide/fstream.hpp>
|
|
||||||
|
|
||||||
#include "libslic3r/libslic3r.h"
|
|
||||||
Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/UserAccountCommunication.cpp
|
|
||||||
===================================================================
|
|
||||||
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/UserAccountCommunication.cpp
|
|
||||||
+++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/UserAccountCommunication.cpp
|
|
||||||
@@ -13,6 +13,7 @@
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
#include <boost/nowide/cstdio.hpp>
|
|
||||||
#include <boost/nowide/fstream.hpp>
|
|
||||||
+#include <boost/nowide/convert.hpp>
|
|
||||||
#include <curl/curl.h>
|
|
||||||
#include <string>
|
|
||||||
|
|
321
PrusaSlicer-2.8.1-pr13609-fix-build.patch
Normal file
321
PrusaSlicer-2.8.1-pr13609-fix-build.patch
Normal file
@ -0,0 +1,321 @@
|
|||||||
|
From bf17924d6582b8a7baca5a58e59c604f3288cd19 Mon Sep 17 00:00:00 2001
|
||||||
|
From: randomtechguy <50642148+Rose-David@users.noreply.github.com>
|
||||||
|
Date: Fri, 12 Jul 2024 17:24:16 -0400
|
||||||
|
Subject: [PATCH 1/5] Update CMakeLists.txt to fix linux compile error
|
||||||
|
|
||||||
|
---
|
||||||
|
src/slic3r/CMakeLists.txt | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
|
||||||
|
index 82e91bb10b..b20583a5ba 100644
|
||||||
|
--- a/src/slic3r/CMakeLists.txt
|
||||||
|
+++ b/src/slic3r/CMakeLists.txt
|
||||||
|
@@ -391,6 +391,7 @@ set(SLIC3R_GUI_SOURCES
|
||||||
|
)
|
||||||
|
|
||||||
|
find_package(NanoSVG REQUIRED)
|
||||||
|
+find_package(OpenSSL REQUIRED)
|
||||||
|
|
||||||
|
if (APPLE)
|
||||||
|
list(APPEND SLIC3R_GUI_SOURCES
|
||||||
|
@@ -447,6 +448,8 @@ target_link_libraries(
|
||||||
|
NanoSVG::nanosvgrast
|
||||||
|
stb_dxt
|
||||||
|
fastfloat
|
||||||
|
+ OpenSSL::SSL
|
||||||
|
+ OpenSSL::Crypto
|
||||||
|
)
|
||||||
|
|
||||||
|
if (MSVC)
|
||||||
|
|
||||||
|
From da3587cea3c9b51f97f41e3eb09e4479d3b0492f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonne Mickelin <jonne@ljhms.se>
|
||||||
|
Date: Wed, 20 Nov 2024 16:05:44 +0100
|
||||||
|
Subject: [PATCH 2/5] Update cmake/FindEigen3 to the one bundled with version
|
||||||
|
3.4.0
|
||||||
|
|
||||||
|
This solves the build error with the missing `Eigen3::Eigen` build
|
||||||
|
target.
|
||||||
|
|
||||||
|
Partially fixes #13608
|
||||||
|
---
|
||||||
|
cmake/modules/FindEigen3.cmake | 71 ++++++++++++++++++++++------------
|
||||||
|
1 file changed, 46 insertions(+), 25 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cmake/modules/FindEigen3.cmake b/cmake/modules/FindEigen3.cmake
|
||||||
|
index 1da37619ef..2dbed58384 100644
|
||||||
|
--- a/cmake/modules/FindEigen3.cmake
|
||||||
|
+++ b/cmake/modules/FindEigen3.cmake
|
||||||
|
@@ -9,6 +9,16 @@
|
||||||
|
# EIGEN3_FOUND - system has eigen lib with correct version
|
||||||
|
# EIGEN3_INCLUDE_DIR - the eigen include directory
|
||||||
|
# EIGEN3_VERSION - eigen version
|
||||||
|
+#
|
||||||
|
+# and the following imported target:
|
||||||
|
+#
|
||||||
|
+# Eigen3::Eigen - The header-only Eigen library
|
||||||
|
+#
|
||||||
|
+# This module reads hints about search locations from
|
||||||
|
+# the following environment variables:
|
||||||
|
+#
|
||||||
|
+# EIGEN3_ROOT
|
||||||
|
+# EIGEN3_ROOT_DIR
|
||||||
|
|
||||||
|
# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
|
||||||
|
# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
|
||||||
|
@@ -18,16 +28,16 @@
|
||||||
|
if(NOT Eigen3_FIND_VERSION)
|
||||||
|
if(NOT Eigen3_FIND_VERSION_MAJOR)
|
||||||
|
set(Eigen3_FIND_VERSION_MAJOR 2)
|
||||||
|
- endif(NOT Eigen3_FIND_VERSION_MAJOR)
|
||||||
|
+ endif()
|
||||||
|
if(NOT Eigen3_FIND_VERSION_MINOR)
|
||||||
|
set(Eigen3_FIND_VERSION_MINOR 91)
|
||||||
|
- endif(NOT Eigen3_FIND_VERSION_MINOR)
|
||||||
|
+ endif()
|
||||||
|
if(NOT Eigen3_FIND_VERSION_PATCH)
|
||||||
|
set(Eigen3_FIND_VERSION_PATCH 0)
|
||||||
|
- endif(NOT Eigen3_FIND_VERSION_PATCH)
|
||||||
|
+ endif()
|
||||||
|
|
||||||
|
set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
|
||||||
|
-endif(NOT Eigen3_FIND_VERSION)
|
||||||
|
+endif()
|
||||||
|
|
||||||
|
macro(_eigen3_check_version)
|
||||||
|
file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
|
||||||
|
@@ -42,45 +52,56 @@ macro(_eigen3_check_version)
|
||||||
|
set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
|
||||||
|
if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
|
||||||
|
set(EIGEN3_VERSION_OK FALSE)
|
||||||
|
- else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
|
||||||
|
+ else()
|
||||||
|
set(EIGEN3_VERSION_OK TRUE)
|
||||||
|
- endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
|
||||||
|
+ endif()
|
||||||
|
|
||||||
|
if(NOT EIGEN3_VERSION_OK)
|
||||||
|
|
||||||
|
message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
|
||||||
|
"but at least version ${Eigen3_FIND_VERSION} is required")
|
||||||
|
- endif(NOT EIGEN3_VERSION_OK)
|
||||||
|
-endmacro(_eigen3_check_version)
|
||||||
|
+ endif()
|
||||||
|
+endmacro()
|
||||||
|
|
||||||
|
if (EIGEN3_INCLUDE_DIR)
|
||||||
|
|
||||||
|
# in cache already
|
||||||
|
_eigen3_check_version()
|
||||||
|
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
|
||||||
|
-
|
||||||
|
-else (EIGEN3_INCLUDE_DIR)
|
||||||
|
-
|
||||||
|
- # specific additional paths for some OS
|
||||||
|
- if (WIN32)
|
||||||
|
- set(EIGEN_ADDITIONAL_SEARCH_PATHS ${EIGEN_ADDITIONAL_SEARCH_PATHS} "C:/Program Files/Eigen/include" "C:/Program Files (x86)/Eigen/include")
|
||||||
|
- endif(WIN32)
|
||||||
|
-
|
||||||
|
- find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
|
||||||
|
- PATHS
|
||||||
|
- ${CMAKE_INSTALL_PREFIX}/include
|
||||||
|
- ${EIGEN_ADDITIONAL_SEARCH_PATHS}
|
||||||
|
- ${KDE4_INCLUDE_DIR}
|
||||||
|
- PATH_SUFFIXES eigen3 eigen
|
||||||
|
- )
|
||||||
|
+ set(Eigen3_FOUND ${EIGEN3_VERSION_OK})
|
||||||
|
+
|
||||||
|
+else ()
|
||||||
|
+
|
||||||
|
+ # search first if an Eigen3Config.cmake is available in the system,
|
||||||
|
+ # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
|
||||||
|
+ # the script will work as usual
|
||||||
|
+ find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
|
||||||
|
+
|
||||||
|
+ if(NOT EIGEN3_INCLUDE_DIR)
|
||||||
|
+ find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
|
||||||
|
+ HINTS
|
||||||
|
+ ENV EIGEN3_ROOT
|
||||||
|
+ ENV EIGEN3_ROOT_DIR
|
||||||
|
+ PATHS
|
||||||
|
+ ${CMAKE_INSTALL_PREFIX}/include
|
||||||
|
+ ${KDE4_INCLUDE_DIR}
|
||||||
|
+ PATH_SUFFIXES eigen3 eigen
|
||||||
|
+ )
|
||||||
|
+ endif()
|
||||||
|
|
||||||
|
if(EIGEN3_INCLUDE_DIR)
|
||||||
|
_eigen3_check_version()
|
||||||
|
- endif(EIGEN3_INCLUDE_DIR)
|
||||||
|
+ endif()
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
|
||||||
|
|
||||||
|
mark_as_advanced(EIGEN3_INCLUDE_DIR)
|
||||||
|
|
||||||
|
-endif(EIGEN3_INCLUDE_DIR)
|
||||||
|
+endif()
|
||||||
|
+
|
||||||
|
+if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen)
|
||||||
|
+ add_library(Eigen3::Eigen INTERFACE IMPORTED)
|
||||||
|
+ set_target_properties(Eigen3::Eigen PROPERTIES
|
||||||
|
+ INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}")
|
||||||
|
+endif()
|
||||||
|
|
||||||
|
From 5c1fd3e489da10a6fb828681b2ee777736b45a61 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonne Mickelin <jonne@ljhms.se>
|
||||||
|
Date: Wed, 20 Nov 2024 16:11:11 +0100
|
||||||
|
Subject: [PATCH 3/5] Replace FindDbus.cmake with the upstream module
|
||||||
|
|
||||||
|
This solves the build error with missing headers.
|
||||||
|
|
||||||
|
Partially fixes #13608.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 2 +-
|
||||||
|
cmake/modules/FindDBus.cmake | 59 ------------------------------------
|
||||||
|
src/slic3r/CMakeLists.txt | 2 +-
|
||||||
|
3 files changed, 2 insertions(+), 61 deletions(-)
|
||||||
|
delete mode 100644 cmake/modules/FindDBus.cmake
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 31cb4c0ff3..42a9302a0d 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -246,7 +246,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
|
find_package(Threads REQUIRED)
|
||||||
|
|
||||||
|
- find_package(DBus REQUIRED)
|
||||||
|
+ find_package(DBus1 REQUIRED)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
|
||||||
|
diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake
|
||||||
|
deleted file mode 100644
|
||||||
|
index d54d4e516c..0000000000
|
||||||
|
--- a/cmake/modules/FindDBus.cmake
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,59 +0,0 @@
|
||||||
|
-# - Try to find DBus
|
||||||
|
-# Once done, this will define
|
||||||
|
-#
|
||||||
|
-# DBUS_FOUND - system has DBus
|
||||||
|
-# DBUS_INCLUDE_DIRS - the DBus include directories
|
||||||
|
-# DBUS_LIBRARIES - link these to use DBus
|
||||||
|
-#
|
||||||
|
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
|
||||||
|
-#
|
||||||
|
-# Redistribution and use in source and binary forms, with or without
|
||||||
|
-# modification, are permitted provided that the following conditions
|
||||||
|
-# are met:
|
||||||
|
-# 1. Redistributions of source code must retain the above copyright
|
||||||
|
-# notice, this list of conditions and the following disclaimer.
|
||||||
|
-# 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
-# notice, this list of conditions and the following disclaimer in the
|
||||||
|
-# documentation and/or other materials provided with the distribution.
|
||||||
|
-#
|
||||||
|
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
|
||||||
|
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
|
||||||
|
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||||
|
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
|
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||||
|
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
|
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
-
|
||||||
|
-FIND_PACKAGE(PkgConfig)
|
||||||
|
-PKG_CHECK_MODULES(PC_DBUS QUIET dbus-1)
|
||||||
|
-
|
||||||
|
-FIND_LIBRARY(DBUS_LIBRARIES
|
||||||
|
- NAMES dbus-1
|
||||||
|
- HINTS ${PC_DBUS_LIBDIR}
|
||||||
|
- ${PC_DBUS_LIBRARY_DIRS}
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-FIND_PATH(DBUS_INCLUDE_DIR
|
||||||
|
- NAMES dbus/dbus.h
|
||||||
|
- HINTS ${PC_DBUS_INCLUDEDIR}
|
||||||
|
- ${PC_DBUS_INCLUDE_DIRS}
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-GET_FILENAME_COMPONENT(_DBUS_LIBRARY_DIR ${DBUS_LIBRARIES} PATH)
|
||||||
|
-FIND_PATH(DBUS_ARCH_INCLUDE_DIR
|
||||||
|
- NAMES dbus/dbus-arch-deps.h
|
||||||
|
- HINTS ${PC_DBUS_INCLUDEDIR}
|
||||||
|
- ${PC_DBUS_INCLUDE_DIRS}
|
||||||
|
- ${_DBUS_LIBRARY_DIR}
|
||||||
|
- ${DBUS_INCLUDE_DIR}
|
||||||
|
- PATH_SUFFIXES include
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-SET(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
|
||||||
|
-
|
||||||
|
-INCLUDE(FindPackageHandleStandardArgs)
|
||||||
|
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus REQUIRED_VARS DBUS_INCLUDE_DIRS DBUS_LIBRARIES)
|
||||||
|
\ No newline at end of file
|
||||||
|
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
|
||||||
|
index b20583a5ba..d1ce7b5b08 100644
|
||||||
|
--- a/src/slic3r/CMakeLists.txt
|
||||||
|
+++ b/src/slic3r/CMakeLists.txt
|
||||||
|
@@ -455,7 +455,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})
|
||||||
|
+ target_link_libraries(libslic3r_gui PUBLIC ${DBus1_LIBRARIES})
|
||||||
|
elseif (APPLE)
|
||||||
|
target_link_libraries(libslic3r_gui PUBLIC ${DISKARBITRATION_LIBRARY} ${COREWLAN_LIBRARY})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
From f7a25cae1820444f4e999b429598ca477a35ccb8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonne Mickelin <jonne@ljhms.se>
|
||||||
|
Date: Wed, 20 Nov 2024 16:14:07 +0100
|
||||||
|
Subject: [PATCH 4/5] Link boost_headeronly in slic3r and libslic3r
|
||||||
|
|
||||||
|
This solves the linker error about missing `boost::log` symbols.
|
||||||
|
|
||||||
|
Fixes #13608.
|
||||||
|
---
|
||||||
|
src/libslic3r/CMakeLists.txt | 3 ++-
|
||||||
|
src/slic3r/CMakeLists.txt | 1 +
|
||||||
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
|
||||||
|
index ea669ee30c..d80b17a0bc 100644
|
||||||
|
--- a/src/libslic3r/CMakeLists.txt
|
||||||
|
+++ b/src/libslic3r/CMakeLists.txt
|
||||||
|
@@ -524,7 +524,7 @@ cmake_policy(SET CMP0011 NEW)
|
||||||
|
find_package(CGAL REQUIRED)
|
||||||
|
cmake_policy(POP)
|
||||||
|
|
||||||
|
-add_library(libslic3r_cgal STATIC
|
||||||
|
+add_library(libslic3r_cgal STATIC
|
||||||
|
CutSurface.hpp CutSurface.cpp
|
||||||
|
Geometry/VoronoiUtilsCgal.hpp Geometry/VoronoiUtilsCgal.cpp
|
||||||
|
IntersectionPoints.hpp IntersectionPoints.cpp
|
||||||
|
@@ -596,6 +596,7 @@ target_link_libraries(libslic3r PUBLIC
|
||||||
|
libigl
|
||||||
|
agg
|
||||||
|
ankerl
|
||||||
|
+ boost_headeronly
|
||||||
|
)
|
||||||
|
|
||||||
|
if (APPLE)
|
||||||
|
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
|
||||||
|
index d1ce7b5b08..27c226120d 100644
|
||||||
|
--- a/src/slic3r/CMakeLists.txt
|
||||||
|
+++ b/src/slic3r/CMakeLists.txt
|
||||||
|
@@ -450,6 +450,7 @@ target_link_libraries(
|
||||||
|
fastfloat
|
||||||
|
OpenSSL::SSL
|
||||||
|
OpenSSL::Crypto
|
||||||
|
+ boost_headeronly
|
||||||
|
)
|
||||||
|
|
||||||
|
if (MSVC)
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:58d484f85b34d83026f8220bab983f855fbcd72767d0887f21f5cc382e5b19ab
|
|
||||||
size 69806919
|
|
3
PrusaSlicer-version_2.8.1.tar.gz
Normal file
3
PrusaSlicer-version_2.8.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f71033dd4e9fdd8e5ac7b5be5803d0d6d09ec0fd87de92b152b3c6bbae04c103
|
||||||
|
size 69409077
|
@ -1,3 +1,172 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Dec 8 16:40:40 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Changelog for 2.8.1
|
||||||
|
* When using the wipe tower with "No sparse layers" option
|
||||||
|
enabled, there would still be travels to the wipe tower
|
||||||
|
location even for the skipped layers. This is a regression
|
||||||
|
introduced in 2.8.1-rc1 (#13384).
|
||||||
|
* A warning about inconsistent color profiles in PNGs used as
|
||||||
|
Prusa Account avatar is now silently ignored (#12920).
|
||||||
|
## Improvements with respect to 2.8.0
|
||||||
|
* Based on the feedback received after 2.8.0 release, the menu
|
||||||
|
bar was reinstated and the menu no longer hides under a button.
|
||||||
|
Thanks everyone for the feedback, it was very helpful and it
|
||||||
|
will be taken into consideration during possible UI-related
|
||||||
|
decisions in the future. #12943
|
||||||
|
* When logging-in with the PrusaAccount using third party
|
||||||
|
authorization (Google, Apple, Facebook), an external browser
|
||||||
|
window is opened so the user is not forced to enter their
|
||||||
|
credentials into windows created by PrusaSlicer.
|
||||||
|
* The built-in web engine no longer remembers the user after
|
||||||
|
logout.
|
||||||
|
* There are two new parameters: Filaments->Advanced->Abrasive
|
||||||
|
material and Printers->Extruder->High flow nozzle. Both flags
|
||||||
|
will be used to check whether a sliced G-code is compatible
|
||||||
|
with the given printer (abrasive material requires hardened
|
||||||
|
nozzle) and also to ensure that "Set as current" function in
|
||||||
|
PrusaSlicer-embedded Prusa Connect will select the suitable
|
||||||
|
profile for the given configuration.
|
||||||
|
* Note that this feature is supported since MINI/MK4/XL firmware
|
||||||
|
version 6.2.0-alpha1, and that the implementation in Prusa
|
||||||
|
Connect is not completely finished yet, meaning that the dialog
|
||||||
|
where printer is selected does not use this information - it
|
||||||
|
will later start working without the need to download a new
|
||||||
|
slicer version.
|
||||||
|
* Automatic orientation of bridges has been improved. Issues with
|
||||||
|
unanchored bridges caused by inconvenient choice of their angle
|
||||||
|
should now occur less frequently, although there is still a
|
||||||
|
large class of scenarios where the solution is suboptimal.
|
||||||
|
* The output of --query-printer-models command line option was
|
||||||
|
extended to contain bed shape and dimensions. Note that custom
|
||||||
|
bed shapes are currently not supported.
|
||||||
|
* The 'new version available' notification can now be used to
|
||||||
|
direct the user to our website, instead of just downloading the
|
||||||
|
executable. As of now, we release two different Linux
|
||||||
|
AppImages, so the user needs to be able to choose which one
|
||||||
|
they want to download.
|
||||||
|
* A new infill type called Zig-zag was created. It behaves the
|
||||||
|
same as Rectilinear, except that the pattern is aligned between
|
||||||
|
layers (Rectilinear is optimized for short travels, which leads
|
||||||
|
to inconsistencies). The new infill may thus take slightly
|
||||||
|
longer to print because of that, although the effect will be
|
||||||
|
negligible in most prints. It is possible that Rectilinear and
|
||||||
|
Zig-zag will be merged into a single infill type in one of the
|
||||||
|
upcoming releases. #12613
|
||||||
|
## Bugs fixed with respect to 2.8.0
|
||||||
|
* General improvement of Prusa Connect / PrusaAccount session
|
||||||
|
stability. There were scenarios which led to uncommanded
|
||||||
|
logouts from PrusaAccount, some resulting in partially blank
|
||||||
|
Prusa Connect screen and requiring application restart to fix.
|
||||||
|
The problems occurred after being logged on for a long time,
|
||||||
|
after waking the PC up from sleep, or when internet connection
|
||||||
|
was unstable.
|
||||||
|
* Fixed missing G-code preview on setups using older GPUs
|
||||||
|
(#12908).
|
||||||
|
* Some settings were not applied when overridden per object
|
||||||
|
(#12916).
|
||||||
|
* Fixed adding SVGs as parts/modifiers. This was broken in 2.8.0
|
||||||
|
(#12915).
|
||||||
|
* Fixed UI glitch resulting in disappearing text in edit boxes
|
||||||
|
after editing (#12932).
|
||||||
|
* Fixed incorrect capture of keyboard input, which led to some
|
||||||
|
keys being ignored (#13043).
|
||||||
|
* Physical printer configured to use username/password
|
||||||
|
authentication no longer asks the user for the credentials when
|
||||||
|
opening the Physical Printer page (#12921, #12933).
|
||||||
|
* Notification informing about the user having logged in into
|
||||||
|
PrusaAccount occasionally showed even when the user was in fact
|
||||||
|
logged in for a long time already (#12963, #13166).
|
||||||
|
* Object shells incorrectly stayed visible after switching from
|
||||||
|
FFF to SLA and back.
|
||||||
|
* Fixed rotation slider in SVG tool when "Use surface" option was
|
||||||
|
active (it incorrectly reverted to original position when
|
||||||
|
released).
|
||||||
|
* Changing Dynamic overhang speeds settings did not trigger
|
||||||
|
G-code regeneration as is should have.
|
||||||
|
* Fixed loading of specific OBJ files (#12157).
|
||||||
|
* Fixed a crash when scaling to fit in specific cases (circular
|
||||||
|
bed and objects with parts).
|
||||||
|
* Fixed an infinite loop during infill generation stage occurring
|
||||||
|
in rare cases (#11426).
|
||||||
|
* 'Export Plate as STL/OBJ Including Supports' no longer exports
|
||||||
|
non-printable objects.
|
||||||
|
* Fixed zero velocity G-code commands when the pressure equalizer
|
||||||
|
was combined with spiral vase mode. This bugfix was ported from
|
||||||
|
OrcaSlicer. Thanks to @Noisyfox, @SoftFever and everyone
|
||||||
|
involved.
|
||||||
|
* Fixed incorrect Color Changes placement after reslicing in
|
||||||
|
certain cases (#13008).
|
||||||
|
* Reduced number of emitted M106 G-codes when dynamic fan speed
|
||||||
|
on overhangs is enabled. Too many commands were generated even
|
||||||
|
when the fan speed barely changed or did not change at all.
|
||||||
|
#11981, #11856
|
||||||
|
* Fixed missing update when adding Color Change with supports
|
||||||
|
enabled.
|
||||||
|
* Fixed crash when loading specific 3MFs containing Color Changes
|
||||||
|
(#13038).
|
||||||
|
* Adaptive layer height feature did not work when Z shrinkage
|
||||||
|
compensation was used.
|
||||||
|
* Fixed unexpected autoselection of SLA printer in Configuration
|
||||||
|
Wizard in certain cases (#13058).
|
||||||
|
* Fixed couple of usability issues with the vertical slider in
|
||||||
|
preview (hovered ticks selection and reaction to mouse wheel)
|
||||||
|
(#12944).
|
||||||
|
* Fixed unexpected deceleration on overhangs with dynamic
|
||||||
|
overhangs speed enabled.
|
||||||
|
* Line infill did not generate at all when maximum anchor length
|
||||||
|
was set to zero.
|
||||||
|
* When seam position was set to Random, the algorithm would
|
||||||
|
occasionally place the seam on a bridging perimeter.
|
||||||
|
* Fixed erratic placement of seams occassionally happening with
|
||||||
|
specific object geometry.
|
||||||
|
* Fixed a problem in STEP file loading, which resulted in errors
|
||||||
|
in the geometry of the loaded model (#12271, #12122).
|
||||||
|
* Using certain fonts for the text embossing led to project files
|
||||||
|
which PrusaSlicer was not able to open anymore (#13123).
|
||||||
|
* Custom G-codes are not allowed to contain certain keywords
|
||||||
|
which PrusaSlicer uses for internal purposes. The check that
|
||||||
|
these keywords are not present was not working in the previous
|
||||||
|
version. It is now fixed.
|
||||||
|
* Fixed artifacts sometimes appearing in the "Actual speed"
|
||||||
|
preview. The artifacts were a result of long-existing bug in
|
||||||
|
the G-code processor, the "Actual speed" preview just made them
|
||||||
|
visible. The bug could have led to incorrect time estimates for
|
||||||
|
specific G-codes.
|
||||||
|
* Fixed three distinct crashes in Configuration Wizard occurring
|
||||||
|
after a specific sequence of steps.
|
||||||
|
* Fixed a long-existing bug in the cooling logic, which resulted
|
||||||
|
in zero or possibly negative extrusion commands in very rare
|
||||||
|
cases.
|
||||||
|
* Downloading from Printables did not work when the download
|
||||||
|
folder contained non-ASCII characters.
|
||||||
|
* Fixed selection of print host type in Physical Printer dialog.
|
||||||
|
PrusaLink was missing in the list for several printers which
|
||||||
|
actually support it. This also caused several other glitches
|
||||||
|
(#13286).
|
||||||
|
* The Connect status dots in the Printer Settings dropdown did
|
||||||
|
not show for SLA printers.
|
||||||
|
* Custom printer profile created in Config Wizard could be saved
|
||||||
|
under a name clashing with a system profile name.
|
||||||
|
* "Rename preset" button was inadvertently not shown in the UI
|
||||||
|
when physical printer profile was selected.
|
||||||
|
* Number of toolchanges did not show in the "Sliced info" box
|
||||||
|
when wipe tower was disabled (#6832).
|
||||||
|
- Replace PrusaSlicer-2.8.1-fix-build.patch with
|
||||||
|
PrusaSlicer-2.8.1-pr13609-fix-build.patch and remove unstable
|
||||||
|
(because not merged yet) URL from Source tag.
|
||||||
|
gh#prusa3d/PrusaSlicer#13609
|
||||||
|
- Remove update-desktop-files
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Dec 8 08:57:27 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
- Update to version 2.8.1
|
||||||
|
https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.8.1
|
||||||
|
- Removed PrusaSlicer-2.8.0-slic3r-includes.patch
|
||||||
|
- Added PrusaSlicer-2.8.1-fix-build.patch
|
||||||
|
- Updated up-occt-version.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 13 19:22:26 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
Fri Sep 13 19:22:26 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: PrusaSlicer
|
Name: PrusaSlicer
|
||||||
Version: 2.8.0
|
Version: 2.8.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
|
Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
|
||||||
License: AGPL-3.0-only
|
License: AGPL-3.0-only
|
||||||
@ -27,8 +27,8 @@ URL: https://www.prusa3d.com/prusaslicer/
|
|||||||
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-version_%{version}.tar.gz
|
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-version_%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch gh#prusa3d/PrusaSlicer#11769
|
# PATCH-FIX-UPSTREAM PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch gh#prusa3d/PrusaSlicer#11769
|
||||||
Patch1: PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch
|
Patch1: PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch
|
||||||
# PATCH-FIX-UPSTREAM PrusaSlicer-2.8.0-includes.patch gh#prusa3d/PrusaSlicer#13080
|
# PATCH-FIX-UPSTREAM PrusaSlicer-2.8.1-pr13609-fix-build.patch gh#prusa3d/PrusaSlicer#13609
|
||||||
Patch2: PrusaSlicer-2.8.0-slic3r-includes.patch
|
Patch2: PrusaSlicer-2.8.1-pr13609-fix-build.patch
|
||||||
# PATCH-FIX-OPENSUSE up-occt-version.patch mike.chikov@gmail.com -- install wrapper so into libdir, not bindir
|
# PATCH-FIX-OPENSUSE up-occt-version.patch mike.chikov@gmail.com -- install wrapper so into libdir, not bindir
|
||||||
Patch10: up-occt-version.patch
|
Patch10: up-occt-version.patch
|
||||||
# PATCH-FIX-OPENSUSE PrusaSlicer-2.6.0-octoprint-name-fix.patch -- cast lambda expression to same type
|
# PATCH-FIX-OPENSUSE PrusaSlicer-2.6.0-octoprint-name-fix.patch -- cast lambda expression to same type
|
||||||
@ -64,11 +64,11 @@ BuildRequires: memory-constraints
|
|||||||
BuildRequires: nlopt-devel
|
BuildRequires: nlopt-devel
|
||||||
BuildRequires: occt-devel
|
BuildRequires: occt-devel
|
||||||
BuildRequires: openexr-devel
|
BuildRequires: openexr-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: openvdb-devel >= 7.1
|
BuildRequires: openvdb-devel >= 7.1
|
||||||
BuildRequires: openvdb-tools
|
BuildRequires: openvdb-tools
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: tbb-devel
|
BuildRequires: tbb-devel
|
||||||
BuildRequires: update-desktop-files
|
|
||||||
BuildRequires: wxGTK3-devel >= 3.2
|
BuildRequires: wxGTK3-devel >= 3.2
|
||||||
# need the fltk fork, see deps/NanoSVG/NanoSVG.cmake
|
# need the fltk fork, see deps/NanoSVG/NanoSVG.cmake
|
||||||
BuildRequires: nanosvg-devel >= 2022.12.22
|
BuildRequires: nanosvg-devel >= 2022.12.22
|
||||||
@ -83,6 +83,7 @@ BuildRequires: pkgconfig(qhull_r)
|
|||||||
BuildRequires: pkgconfig(qhullcpp)
|
BuildRequires: pkgconfig(qhullcpp)
|
||||||
BuildRequires: pkgconfig(wayland-client)
|
BuildRequires: pkgconfig(wayland-client)
|
||||||
BuildRequires: pkgconfig(wayland-egl)
|
BuildRequires: pkgconfig(wayland-egl)
|
||||||
|
BuildRequires: pkgconfig(webkit2gtk-4.1)
|
||||||
Requires: noto-sans-fonts
|
Requires: noto-sans-fonts
|
||||||
# Cannot allocate memory to build
|
# Cannot allocate memory to build
|
||||||
ExcludeArch: %{ix86}
|
ExcludeArch: %{ix86}
|
||||||
@ -127,9 +128,6 @@ export CC=gcc-%gcc_ver CXX=g++-%gcc_ver
|
|||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
|
||||||
%suse_update_desktop_file -r PrusaSlicer Graphics 3DGraphics
|
|
||||||
%suse_update_desktop_file -r PrusaGcodeviewer Graphics 3DGraphics
|
|
||||||
|
|
||||||
#remove stray font file
|
#remove stray font file
|
||||||
rm -rf %{buildroot}%{_datadir}/%{name}/fonts
|
rm -rf %{buildroot}%{_datadir}/%{name}/fonts
|
||||||
|
|
||||||
|
@ -1,17 +1,25 @@
|
|||||||
Index: PrusaSlicer-version_2.6.1/src/occt_wrapper/CMakeLists.txt
|
Index: PrusaSlicer-version_2.8.1/src/occt_wrapper/CMakeLists.txt
|
||||||
===================================================================
|
===================================================================
|
||||||
--- PrusaSlicer-version_2.6.1.orig/src/occt_wrapper/CMakeLists.txt
|
--- PrusaSlicer-version_2.8.1.orig/src/occt_wrapper/CMakeLists.txt 2024-09-18 15:39:04.000000000 +0200
|
||||||
+++ PrusaSlicer-version_2.6.1/src/occt_wrapper/CMakeLists.txt
|
+++ PrusaSlicer-version_2.8.1/src/occt_wrapper/CMakeLists.txt 2024-12-08 10:38:01.245676008 +0100
|
||||||
@@ -19,7 +19,7 @@ include(GenerateExportHeader)
|
@@ -19,14 +19,10 @@ include(GenerateExportHeader)
|
||||||
|
|
||||||
generate_export_header(OCCTWrapper)
|
generate_export_header(OCCTWrapper)
|
||||||
|
|
||||||
-find_package(OpenCASCADE 7.6.2 REQUIRED)
|
-find_package(OpenCASCADE 7.6.1 REQUIRED)
|
||||||
+find_package(OpenCASCADE REQUIRED)
|
+find_package(OpenCASCADE REQUIRED)
|
||||||
|
|
||||||
set(OCCT_LIBS
|
set(OCCT_LIBS
|
||||||
TKXDESTEP
|
- TKXDESTEP
|
||||||
@@ -58,5 +58,5 @@ target_link_libraries(OCCTWrapper ${OCCT
|
- TKSTEP
|
||||||
|
- TKSTEP209
|
||||||
|
- TKSTEPAttr
|
||||||
|
- TKSTEPBase
|
||||||
|
+ TKDESTEP
|
||||||
|
TKXCAF
|
||||||
|
TKXSBase
|
||||||
|
TKVCAF
|
||||||
|
@@ -59,5 +55,5 @@ target_link_libraries(OCCTWrapper libsli
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user