diff options
| -rw-r--r-- | cad/PrusaSlicer/Makefile | 4 | ||||
| -rw-r--r-- | cad/PrusaSlicer/files/patch-src_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt | 9 |
4 files changed, 29 insertions, 5 deletions
diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 8fba84266752..facc9f8cd327 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -3,7 +3,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MAINTAINER= teodorsigaev@gmail.com @@ -23,7 +23,7 @@ LIB_DEPENDS= libtbb.so:devel/tbb \ libmpfr.so:math/mpfr \ libdbus-1.so:devel/dbus \ libpng.so:graphics/png -BUILD_DEPENDS= cereal>=1.2.2:devel/cereal \ +BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \ cgal>=5.0.2:math/cgal USES= cmake desktop-file-utils eigen:3 gettext gl iconv pkgconfig diff --git a/cad/PrusaSlicer/files/patch-src_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..011a5f500bd0 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2021-02-16 20:42:55 UTC ++++ src/CMakeLists.txt +@@ -111,7 +111,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) + if (APPLE) + # add_compile_options(-stdlib=libc++) + # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) diff --git a/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt new file mode 100644 index 000000000000..b87e4be74f3f --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/libslic3r/CMakeLists.txt.orig 2021-02-16 20:42:21 UTC ++++ src/libslic3r/CMakeLists.txt +@@ -297,7 +297,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_IN + target_link_libraries(libslic3r + libnest2d + admesh +- cereal + libigl + miniz + boost_libs diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt index b26800f0bccf..22efe2367d62 100644 --- a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt +++ b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt @@ -1,8 +1,11 @@ ---- src/slic3r/CMakeLists.txt.orig 2021-01-12 12:07:42 UTC +--- src/slic3r/CMakeLists.txt.orig 2021-01-11 13:01:51 UTC +++ src/slic3r/CMakeLists.txt -@@ -234,7 +234,7 @@ encoding_check(libslic3r_gui) +@@ -232,9 +232,9 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES} - target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) + encoding_check(libslic3r_gui) + +-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") |