Date: Wed, 17 Feb 2021 22:52:33 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565820 - in head/cad/PrusaSlicer: . files Message-ID: <202102172252.11HMqXBW084815@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Feb 17 22:52:32 2021 New Revision: 565820 URL: https://svnweb.freebsd.org/changeset/ports/565820 Log: - Fix build with after devel/cereal update PR: 253569 Submitted by: teodorsigaev@gmail.com (maintainer) Added: head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt (contents, props changed) head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt (contents, props changed) Modified: head/cad/PrusaSlicer/Makefile head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt Modified: head/cad/PrusaSlicer/Makefile ============================================================================== --- head/cad/PrusaSlicer/Makefile Wed Feb 17 22:50:20 2021 (r565819) +++ head/cad/PrusaSlicer/Makefile Wed Feb 17 22:52:32 2021 (r565820) @@ -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 Added: head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/PrusaSlicer/files/patch-src_CMakeLists.txt Wed Feb 17 22:52:32 2021 (r565820) @@ -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) Added: head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt Wed Feb 17 22:52:32 2021 (r565820) @@ -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 Modified: head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt ============================================================================== --- head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt Wed Feb 17 22:50:20 2021 (r565819) +++ head/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt Wed Feb 17 22:52:32 2021 (r565820) @@ -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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102172252.11HMqXBW084815>