diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 8af495340343..e1ce04fab6a4 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,71 +1,75 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.9.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad DIST_SUBDIR= PrusaSlicer MAINTAINER= teodorsigaev@gmail.com COMMENT= Slicing application for 3D printers WWW= https://www.prusa3d.com/prusaslicer/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \ cgal>=5.0.2:math/cgal \ opencascade>=7.7.0:cad/opencascade \ libbgcode>=0.2.0_1:cad/libbgcode \ hidapi>=0.14.0:comms/hidapi LIB_DEPENDS+= libbgcode_convert.so:cad/libbgcode \ libbgcode_binarize.so:cad/libbgcode \ libbgcode_core.so:cad/libbgcode \ libtbb.so:devel/onetbb \ libboost_log.so:devel/boost-libs \ libImath.so:math/Imath \ libnlopt.so:math/nlopt \ libqhull_r.so:math/qhull \ libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libiconv.so:converters/libiconv \ libopenvdb.so:misc/openvdb \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libdbus-1.so:devel/dbus \ libpng.so:graphics/png \ libTKXSDRAWSTEP.so:cad/opencascade \ libtiff.so:graphics/tiff \ libfontconfig.so:x11-fonts/fontconfig \ libfreeimage.so:graphics/freeimage \ libfreetype.so:print/freetype2 \ libavcodec.so:multimedia/ffmpeg4 \ libharfbuzz.so:print/harfbuzz \ libwayland-egl.so:graphics/wayland \ libwebkit2gtk-4.1.so:www/webkit2-gtk@41 \ libsoup-3.0.so:devel/libsoup3 \ libjavascriptcoregtk-4.1.so:www/webkit2-gtk@41 \ libz3.so:math/z3 USES= cmake cpe desktop-file-utils eigen:3 gettext gl gnome iconv \ jpeg pkgconfig xorg ssl tcl tk CPE_VENDOR= prusa3d USE_GITHUB= yes GH_ACCOUNT= prusa3d USE_GL= gl glu glew USE_GNOME= gtk30 pango atk cairo gdkpixbuf glib20 USE_WX= 3.2 USE_XORG= x11 CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DSLIC3R_GTK=3 \ -DSLIC3R_FHS=1 \ -DSLIC3R_PCH=OFF \ -DSLIC3R_BUILD_TESTS=OFF \ -Wno-dev PORTDATA= * + post-patch: ${MKDIR} ${WRKSRC}/bundled_deps/hidapi/libusb ${CP} ${FILESDIR}/hid.c ${WRKSRC}/bundled_deps/hidapi/libusb/hid.c + @${REINPLACE_CMD} -e '/_boost_/s|system;||' \ + ${WRKSRC}/CMakeLists.txt + .include diff --git a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake index 142237d5aafd..ed9e56e6f1f3 100644 --- a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake +++ b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake @@ -1,74 +1,75 @@ --- cmake/modules/FindOpenVDB.cmake.orig 2025-04-10 11:26:51 UTC +++ cmake/modules/FindOpenVDB.cmake @@ -347,24 +347,12 @@ endmacro() return() endmacro() -find_package(IlmBase QUIET) -if(NOT IlmBase_FOUND) - pkg_check_modules(IlmBase QUIET IlmBase) +find_package(Imath QUIET COMPONENTS Imath) +if(NOT Imath_FOUND) + pkg_check_modules(Imath QUIET Imath) endif() -if (IlmBase_FOUND AND NOT TARGET IlmBase::Half) - message(STATUS "Falling back to IlmBase found by pkg-config...") - - find_library(IlmHalf_LIBRARY NAMES Half) - if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS) - just_fail("IlmBase::Half can not be found!") - endif() - - add_library(IlmBase::Half UNKNOWN IMPORTED) - set_target_properties(IlmBase::Half PROPERTIES - IMPORTED_LOCATION "${IlmHalf_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") -elseif(NOT IlmBase_FOUND) - just_fail("IlmBase::Half can not be found!") +if(NOT Imath_FOUND) + just_fail("Imath::Half can not be found!") endif() find_package(TBB ${_quiet} ${_required} COMPONENTS tbb) find_package(ZLIB ${_quiet} ${_required}) @@ -451,7 +439,7 @@ if(OpenVDB_USES_ILM) endif() if(OpenVDB_USES_ILM) - find_package(IlmBase ${_quiet} ${_required}) + find_package(Imath ${_quiet} ${_required}) endif() if(OpenVDB_USES_EXR) -@@ -463,7 +451,7 @@ endif() +@@ -463,15 +451,15 @@ endif() endif() # Set deps. Note that the order here is important. If we're building against -# Houdini 17.5 we must include OpenEXR and IlmBase deps first to ensure the +# Houdini 17.5 we must include OpenEXR and Imath deps first to ensure the # users chosen namespaced headers are correctly prioritized. Otherwise other # include paths from shared installs (including houdini) may pull in the wrong # headers -@@ -471,7 +459,7 @@ set(_OPENVDB_VISIBLE_DEPENDENCIES + set(_OPENVDB_VISIBLE_DEPENDENCIES ++ Boost::filesystem Boost::iostreams - Boost::system +- Boost::system - IlmBase::Half + Imath::Imath ) set(_OPENVDB_DEFINITIONS) @@ -481,10 +469,10 @@ if(OpenVDB_USES_EXR) if(OpenVDB_USES_EXR) list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES - IlmBase::IlmThread - IlmBase::Iex - IlmBase::Imath - OpenEXR::IlmImf + OpenEXR::IlmThread + OpenEXR::Iex + Imath::Imath + OpenEXR::OpenEXR ) list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR") endif()