Index: head/cad/PrusaSlicer/Makefile =================================================================== --- head/cad/PrusaSlicer/Makefile (revision 565819) +++ head/cad/PrusaSlicer/Makefile (revision 565820) @@ -1,40 +1,40 @@ # $FreeBSD$ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MAINTAINER= teodorsigaev@gmail.com COMMENT= Slicing application for 3D printers LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libtbb.so:devel/tbb \ libboost_log.so:devel/boost-libs \ libHalf.so:graphics/ilmbase \ libnlopt.so:math/nlopt \ libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libopenvdb.so:misc/openvdb \ libgmp.so:math/gmp \ 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 CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DSLIC3R_GTK=3 \ -DSLIC3R_FHS=1 USE_GITHUB= yes GH_ACCOUNT= prusa3d USE_WX= 3.1 USE_GL= gl glu glew PORTDATA= * .include Index: head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt =================================================================== --- head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt (nonexistent) +++ head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt (revision 565820) @@ -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) Property changes on: head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt =================================================================== --- head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt (nonexistent) +++ head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt (revision 565820) @@ -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 Property changes on: head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt =================================================================== --- head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt (revision 565819) +++ head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt (revision 565820) @@ -1,11 +1,14 @@ ---- 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") target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES}) endif()