diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index b79f34a202c0..04dec50c3b1d 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,39 +1,39 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.3.3 -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/onetbb \ libboost_log.so:devel/boost-libs \ libImath.so:math/Imath \ 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.3.0.10:devel/cereal \ cgal>=5.0.2:math/cgal USES= cmake cpe desktop-file-utils eigen:3 gettext gl iconv pkgconfig CPE_VENDOR= prusa3d 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 diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile index e85cd55fa193..8556597978ea 100644 --- a/graphics/blender-lts28/Makefile +++ b/graphics/blender-lts28/Makefile @@ -1,211 +1,211 @@ PORTNAME= blender DISTVERSION= 2.83.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ http://public.planetmirror.com/pub/blender/source/ # long term support v2.8x PKGNAMESUFFIX= -lts28 MAINTAINER= FreeBSD@Shaneware.biz COMMENT= 3D modeling/rendering/animation package - LTS LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libboost_regex.so:devel/boost-libs RUN_DEPENDS= ${PYNUMPY} # libboost_regex.so just acts as a placeholder; several boost # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. USES= cmake compiler:c++14-lang gl cpe gnome jpeg python:3.7 shebangfix \ tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew CMAKE_OFF= WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \ WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \ WITH_CYCLES_LOGGING SUB_FILES= blender SHEBANG_FILES= release/bin/blender-thumbnailer.py \ release/scripts/modules/bl_i18n_utils/merge_po.py \ release/scripts/modules/bl_i18n_utils/utils_rtl.py \ release/scripts/modules/blend_render_info.py CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-float-conversion CFLAGS_i386= -march=i586 CXXFLAGS_i386= -march=i586 # prevent conflict with other blender versions DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PLIST_SUB+= VER=${DISTVERSION:R} SUFFIX=${PKGNAMESUFFIX} OPTIONS_SUB= yes .include "${.CURDIR}/Makefile.options" ALEMBIC_CMAKE_BOOL= WITH_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic # note that this needs to be set to match alembics hdf5 option ALEMBIC_HDF5_IMPLIES= ALEMBIC ALEMBIC_HDF5_CMAKE_BOOL= WITH_ALEMBIC_HDF5 ALEMBIC_HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 AVI_CMAKE_BOOL= WITH_CODEC_AVI BULLET_CMAKE_BOOL= WITH_BULLET CAMERATRACK_CMAKE_BOOL= WITH_LIBMV CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON COLLADA_CMAKE_BOOL= WITH_OPENCOLLADA COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \ libpcre.so:devel/pcre COLLADA_USE= GNOME=libxml2 COLLADA_USES= gnome COMPOSITOR_CMAKE_BOOL= WITH_COMPOSITOR CYCLES_IMPLIES= OPENIMAGEIO CYCLES_CMAKE_BOOL= WITH_CYCLES CYCLES_LIB_DEPENDS= libpugixml.so:textproc/pugixml CYCLESEMBR_IMPLIES= CYCLES CYCLESEMBR_CMAKE_BOOL= WITH_CYCLES_EMBREE CYCLESEMBR_LIB_DEPENDS= libembree3.so:graphics/embree CYCLESOSL_IMPLIES= CYCLES CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ -DOSL_ROOT_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/" CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG FFMPEG_LDFLAGS= -L${PREFIX}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libflite_cmu_us_kal.so:audio/flite FFTW3_CMAKE_BOOL= WITH_FFTW3 FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 FRAMESERVER_CMAKE_BOOL= WITH_IMAGE_FRAMESERVER FREESTYLE_CMAKE_BOOL= WITH_FREESTYLE HDR_CMAKE_BOOL= WITH_IMAGE_HDR HEADLESS_PREVENTS= MENU XINPUT XF86VMODE HEADLESS_PREVENTS_MSG= X11 options can't be used in headless mode HEADLESS_CMAKE_BOOL= WITH_HEADLESS INPUT_NDOF_CMAKE_BOOL= WITH_INPUT_NDOF JACK_CMAKE_BOOL= WITH_JACK JACK_LIB_DEPENDS= libjack.so:audio/jack LZO_CMAKE_BOOL= WITH_LZO LZMA_CMAKE_BOOL= WITH_LZMA MENU_USES= desktop-file-utils MOD_BOOLEAN_CMAKE_BOOL= WITH_MOD_BOOLEAN MOD_FLUID_CMAKE_BOOL= WITH_MOD_FLUID MOD_OCEANSIM_IMPLIES= FFTW3 MOD_OCEANSIM_CMAKE_BOOL= WITH_MOD_OCEANSIM MOD_REMESH_CMAKE_BOOL= WITH_MOD_REMESH MOD_SMOKE_CMAKE_BOOL= WITH_MOD_SMOKE NLS_CMAKE_BOOL= WITH_INTERNATIONAL # Use iconv:wchar_t to force the usage of iconv from ports. # libboost_locale.so uses libiconv_open, while we only provide # iconv_open in 10.x+ NLS_USES= gettext iconv:lib,wchar_t OPENAL_CMAKE_BOOL= WITH_OPENAL OPENAL_USES= openal:al,alut OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libyaml-cpp03.so:devel/yaml-cpp03 \ libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR OPENEXR_CFLAGS= -I${LOCALBASE}/include/Imath OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr OPENIMAGEIO_IMPLIES= OPENEXR TIFF OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio OPENIMAGEDN_CMAKE_BOOL= WITH_OPENIMAGEDENOISE OPENIMAGEDN_LIB_DEPENDS= libOpenImageDenoise.so:graphics/oidn # openmp usually works on amd64 OPENMP_CMAKE_BOOL= WITH_OPENMP OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC OPENVDB_LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/onetbb RAYOPTIMIZATION_CMAKE_BOOL= WITH_RAYOPTIMIZATION SDL_CMAKE_BOOL= WITH_SDL SDL_USE= SDL=sdl2 SDL_USES= sdl SNDFILE_CMAKE_BOOL= WITH_CODEC_SNDFILE SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/onetbb TIFF_CMAKE_BOOL= WITH_IMAGE_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff XINPUT_CMAKE_BOOL= WITH_X11_XINPUT XINPUT_USE= XORG=xi XF86VMODE_CMAKE_BOOL= WITH_X11_XF86VMODE XF86VMODE_USE= XORG=xi,xxf86vm .if defined(WITH_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON .endif .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DWITH_CPU_SSE:BOOL=OFF .endif .if ${LLVM_DEFAULT:M[678]0} LLVM_VER= 90 .else LLVM_VER= ${LLVM_DEFAULT} .endif post-patch-OPENCOLORIO-on: @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \ ${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake post-build: @(cd ${WRKSRC}/doc/manpage && \ ${PYTHON_CMD} blender.1.py \ ${INSTALL_WRKSRC}/bin/blender \ ${INSTALL_WRKSRC}/bin/${PORTNAME}.1) post-install: ${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 # rename files to prevent conflict with other blender versions ${MV} ${STAGEDIR}${PREFIX}/share/blender \ ${STAGEDIR}${PREFIX}/share/blender${PKGNAMESUFFIX} ${MV} ${STAGEDIR}${PREFIX}/share/doc/blender \ ${STAGEDIR}${PREFIX}/share/doc/blender${PKGNAMESUFFIX} ${MV} ${STAGEDIR}${PREFIX}/bin/blender \ ${STAGEDIR}${PREFIX}/bin/blender-bin${PKGNAMESUFFIX} ${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender${PKGNAMESUFFIX} ${MV} ${STAGEDIR}${PREFIX}/bin/blender-thumbnailer.py \ ${STAGEDIR}${PREFIX}/bin/blender${PKGNAMESUFFIX}-thumbnailer.py ${MV} ${STAGEDIR}${PREFIX}/man/man1/blender.1 \ ${STAGEDIR}${PREFIX}/man/man1/blender${PKGNAMESUFFIX}.1 ${MV} ${STAGEDIR}${PREFIX}/share/applications/blender.desktop \ ${STAGEDIR}${PREFIX}/share/applications/blender${PKGNAMESUFFIX}.desktop ${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/blender.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/blender${PKGNAMESUFFIX}.svg ${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/blender-symbolic.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/blender${PKGNAMESUFFIX}-symbolic.svg post-install-DRACO-on: # move draco pylib into site-packages ${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/ ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/ ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so @${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python post-install-MENU-on: @-update-desktop-database -q .include diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 459d4a8b3d69..df4655533266 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,197 +1,197 @@ # Created by: Jimmy Olgeni PORTNAME= blender DISTVERSION= 2.91.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ http://public.planetmirror.com/pub/blender/source/ MAINTAINER= FreeBSD@Shaneware.biz COMMENT= 3D modeling/rendering/animation package LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= uses 64bit atomic functions BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libboost_regex.so:devel/boost-libs RUN_DEPENDS= ${PYNUMPY} # libboost_regex.so just acts as a placeholder; several boost # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. USES= cmake compiler:c++14-lang cpe gl gnome jpeg python:3.8 shebangfix \ tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew CMAKE_OFF= WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \ WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \ WITH_CYCLES_LOGGING SHEBANG_FILES= release/bin/blender-thumbnailer.py \ release/scripts/modules/bl_i18n_utils/merge_po.py \ release/scripts/modules/bl_i18n_utils/utils_rtl.py \ release/scripts/modules/blend_render_info.py CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-float-conversion CFLAGS_i386= -march=i586 CXXFLAGS_i386= -march=i586 PLIST_SUB+= VER=${DISTVERSION:R} OPTIONS_SUB= yes .include "${.CURDIR}/Makefile.options" ALEMBIC_CMAKE_BOOL= WITH_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic # note that this needs to be set to match alembics hdf5 option ALEMBIC_HDF5_IMPLIES= ALEMBIC ALEMBIC_HDF5_CMAKE_BOOL= WITH_ALEMBIC_HDF5 ALEMBIC_HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 AVI_CMAKE_BOOL= WITH_CODEC_AVI BULLET_CMAKE_BOOL= WITH_BULLET CAMERATRACK_CMAKE_BOOL= WITH_LIBMV CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON COLLADA_CMAKE_BOOL= WITH_OPENCOLLADA COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \ libpcre.so:devel/pcre COLLADA_USE= GNOME=libxml2 COLLADA_USES= gnome COMPOSITOR_CMAKE_BOOL= WITH_COMPOSITOR CYCLES_IMPLIES= OPENIMAGEIO TBB CYCLES_CMAKE_BOOL= WITH_CYCLES CYCLES_LIB_DEPENDS= libpugixml.so:textproc/pugixml CYCLESEMBR_IMPLIES= CYCLES CYCLESEMBR_CMAKE_BOOL= WITH_CYCLES_EMBREE CYCLESEMBR_LIB_DEPENDS= libembree3.so:graphics/embree CYCLESOSL_IMPLIES= CYCLES CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ -DOSL_ROOT_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/" CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} EBOOL_CMAKE_BOOL= WITH_GMP EBOOL_LIB_DEPENDS= libgmp.so:math/gmp FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FFTW3_CMAKE_BOOL= WITH_FFTW3 FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 FRAMESERVER_CMAKE_BOOL= WITH_IMAGE_FRAMESERVER FREESTYLE_CMAKE_BOOL= WITH_FREESTYLE HDR_CMAKE_BOOL= WITH_IMAGE_HDR HEADLESS_PREVENTS= MENU XINPUT XF86VMODE HEADLESS_PREVENTS_MSG= X11 options can't be used in headless mode HEADLESS_CMAKE_BOOL= WITH_HEADLESS INPUT_NDOF_CMAKE_BOOL= WITH_INPUT_NDOF JACK_CMAKE_BOOL= WITH_JACK JACK_LIB_DEPENDS= libjack.so:audio/jack LZO_CMAKE_BOOL= WITH_LZO LZMA_CMAKE_BOOL= WITH_LZMA MENU_USES= desktop-file-utils MOD_BOOLEAN_CMAKE_BOOL= WITH_MOD_BOOLEAN MOD_FLUID_IMPLIES= TBB MOD_FLUID_CMAKE_BOOL= WITH_MOD_FLUID MOD_OCEANSIM_IMPLIES= FFTW3 MOD_OCEANSIM_CMAKE_BOOL= WITH_MOD_OCEANSIM MOD_REMESH_CMAKE_BOOL= WITH_MOD_REMESH MOD_SMOKE_CMAKE_BOOL= WITH_MOD_SMOKE NLS_CMAKE_BOOL= WITH_INTERNATIONAL # Use iconv:wchar_t to force the usage of iconv from ports. # libboost_locale.so uses libiconv_open, while we only provide # iconv_open in 10.x+ NLS_USES= gettext iconv:lib,wchar_t OPENAL_CMAKE_BOOL= WITH_OPENAL OPENAL_USES= openal:al,alut OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libyaml-cpp03.so:devel/yaml-cpp03 \ libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR OPENEXR_CFLAGS= -I${LOCALBASE}/include/Imath OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath OPENIMAGEIO_IMPLIES= OPENEXR TIFF OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio OPENIMAGEDN_IMPLIES= TBB OPENIMAGEDN_CMAKE_BOOL= WITH_OPENIMAGEDENOISE OPENIMAGEDN_LIB_DEPENDS= libOpenImageDenoise.so:graphics/oidn # openmp usually works on amd64 OPENMP_CMAKE_BOOL= WITH_OPENMP OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv OPENVDB_IMPLIES= TBB OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC OPENVDB_LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libopenvdb.so:misc/openvdb RAYOPTIMIZATION_CMAKE_BOOL= WITH_RAYOPTIMIZATION SDL_CMAKE_BOOL= WITH_SDL SDL_USE= SDL=sdl2 SDL_USES= sdl SNDFILE_CMAKE_BOOL= WITH_CODEC_SNDFILE SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/onetbb TIFF_CMAKE_BOOL= WITH_IMAGE_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TRACE_CMAKE_BOOL= WITH_POTRACE TRACE_LIB_DEPENDS= libpotrace.so:graphics/libpotrace XINPUT_CMAKE_BOOL= WITH_X11_XINPUT XINPUT_USE= XORG=xi XF86VMODE_CMAKE_BOOL= WITH_X11_XF86VMODE XF86VMODE_USE= XORG=xi,xxf86vm .if defined(WITH_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON .endif .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DWITH_CPU_SSE:BOOL=OFF .endif .if ${LLVM_DEFAULT:M[678]0} LLVM_VER= 90 .else LLVM_VER= ${LLVM_DEFAULT} .endif post-patch-OPENCOLORIO-on: @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \ ${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake post-build: @(cd ${WRKSRC}/doc/manpage && \ ${PYTHON_CMD} blender.1.py \ ${INSTALL_WRKSRC}/bin/blender \ ${INSTALL_WRKSRC}/bin/${PORTNAME}.1) post-install: ${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install-DRACO-on: # move draco pylib into site-packages ${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/ ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/ ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so @${RM} -R ${STAGEDIR}/${PREFIX}/share/blender/${DISTVERSION:R}/python post-install-MENU-on: @-update-desktop-database -q .include diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index fae5d3ba6c98..7985d7fee8c7 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,136 +1,136 @@ # Created by: Shane Ambler PORTNAME= openimageio DISTVERSIONPREFIX= Release- DISTVERSION= 2.2.16.0 # PORTREVISION must be set with ?= so as not to stomp over # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= OpenImageIO graphics library LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libfmt.so:devel/libfmt \ libhdf5.so:science/hdf5 \ libheif.so:graphics/libheif \ libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr \ libpng.so:graphics/png \ libsquish.so:graphics/squish \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp USES= cmake jpeg compiler:c++11-lib iconv:wchar_t USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ STOP_ON_WARNING USE_OPENSSL OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \ OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB OPTIONS_DEFAULT= DICOM FREETYPE GIF OCIO OPENJPEG PTEX TOOLS OPTIONS_SUB= yes DOCS_CMAKE_BOOL= INSTALL_DOCS DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} DICOM_DESC= DICOM/MEDICOM support DICOM_CMAKE_BOOL= USE_DICOM DICOM_LIB_DEPENDS= libdcmimage.so:graphics/dcmtk FFMPEG_DESC= Use FFmpeg to support extra file types FFMPEG_CMAKE_BOOL= USE_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FREETYPE_CMAKE_BOOL= USE_FREETYPE FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_RUN_DEPENDS= ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf GIF_CMAKE_BOOL= USE_GIF GIF_LIB_DEPENDS= libgif.so:graphics/giflib IMAGEVIEWER_DESC= Build image viewer (requires Qt) IMAGEVIEWER_USES= gl qt:5 IMAGEVIEWER_IMPLIES= TOOLS IMAGEVIEWER_CMAKE_BOOL= USE_QT USE_OPENGL IMAGEVIEWER_USE= GL=gl,glu,glew \ QT=buildtools,core,gui,opengl,qmake_build,widgets OCIO_DESC= Color management support OCIO_CMAKE_BOOL= USE_OCIO OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio OPENCV_CMAKE_BOOL= USE_OPENCV OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ libopencv_core.so:graphics/opencv \ libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CMAKE_BOOL= USE_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg PTEX_DESC= ptex support PTEX_LIB_DEPENDS= libPtex.so:graphics/ptex RAW_CMAKE_BOOL= USE_LIBRAW RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw TBB_DESC= Intel tbb support TBB_CMAKE_BOOL= USE_TBB TBB_LIB_DEPENDS= libtbb.so:devel/onetbb TEST_CMAKE_BOOL= OIIO_BUILD_TESTS TOOLS_DESC= Build CLI tools TOOLS_CMAKE_BOOL= OIIO_BUILD_TOOLS VDB_DESC= OpenVDB support VDB_CMAKE_BOOL= USE_OPENVDB VDB_LIB_DEPENDS= libopenvdb.so:misc/openvdb # DISTVERSION has an extra digit which isn't in the lib name # for LIBVERS we want the first three digits PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/} post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/src/cmake/modules/FindPtex.cmake .include .if ${SLAVE_PORT} == yes BUILD_DEPENDS+= ${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11 LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio PLIST= ${PKGDIR}/pkg-plist-pybind USES+= python:3.6+ USE_PYTHON= flavors CMAKE_ON+= USE_PYTHON # we don't need the apps built - only libs. CMAKE_OFF+= USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} do-install: ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .else # SLAVE_PORT != yes USE_LDCONFIG= yes CMAKE_OFF+= USE_PYTHON post-install: ${LN} -sf libOpenImageIO.so.2.2 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2 ${LN} -sf libOpenImageIO_Util.so.2.2 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2 do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test .endif # SLAVE_PORT .include diff --git a/math/curv/Makefile b/math/curv/Makefile index e2bfae5f7d1f..a46a8d7f7eef 100644 --- a/math/curv/Makefile +++ b/math/curv/Makefile @@ -1,43 +1,43 @@ PORTNAME= curv DISTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math lang graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Language for making art using mathematics LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libdouble-conversion.so:devel/double-conversion \ libglfw.so:graphics/glfw \ libImath.so:math/Imath \ libtbb.so:devel/onetbb \ libopenvdb.so:misc/openvdb USES= cmake compiler:c++14-lang gl localbase:ldflags xorg USE_GL= gl USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= curv3d GH_TUPLE= ocornut:imgui:e0cab56:imgui/extern/imgui \ Tessil:ordered-map:4051af7:om/extern/ordered-map \ AmokHuginnsson:replxx:b901d5f:replxx/extern/replxx LDFLAGS+= -lopenvdb PLIST_FILES= bin/curv \ lib/curv/lib/blend.curv \ lib/curv/lib/builder.curv \ lib/curv/lib/noise.curv \ lib/curv/lib/web_colour.curv \ lib/curv/std.curv \ share/gtksourceview-3.0/language-specs/curv.lang post-install: @${RM} ${STAGEDIR}${PREFIX}/lib/curv/lib/README .include diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile index 8abafccf5ecb..5b4fe9fde562 100644 --- a/misc/openvdb/Makefile +++ b/misc/openvdb/Makefile @@ -1,62 +1,57 @@ PORTNAME= openvdb DISTVERSIONPREFIX= v -DISTVERSION= 8.1.0 -PORTREVISION= 6 +DISTVERSION= 9.0.0 CATEGORIES= misc -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch:-p1 # backport of change TBB -> OneTBB - MAINTAINER= yuri@FreeBSD.org COMMENT= Tools for storage and manipulation of sparse volumetric data LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libboost_system.so:devel/boost-libs \ libImath.so:math/Imath \ libtbb.so:devel/onetbb TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lang localbase:ldflags pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation CMAKE_ARGS= -DCONCURRENT_MALLOC="Tbbmalloc" -DTbb_INCLUDE_DIR=${LOCALBASE}/include CMAKE_OFF= OPENVDB_CORE_STATIC CMAKE_TESTING_ON= OPENVDB_BUILD_UNITTESTS # one test fails: https://github.com/AcademySoftwareFoundation/openvdb/issues/1103 OPTIONS_DEFINE= PYTHON TOOLS #DOCS # TOOLS and PYTHON should be made into subpackages OPTIONS_DEFAULT= PYTHON TOOLS OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= OPENVDB_BUILD_PYTHON_MODULE PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} TOOLS_DESC= Build CLI tools TOOLS_CMAKE_BOOL= OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \ OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW TOOLS_LIB_DEPENDS= libglfw.so:graphics/glfw \ libOpenEXR.so:graphics/openexr TOOLS_USES= gl xorg TOOLS_USE= GL=gl,glu XORG=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm -post-patch: # extra fix for OneTBB +xpost-patch: # extra fix for OneTBB @cd ${WRKSRC}/openvdb/openvdb && \ - ${MKDIR} thread && \ - ${MV} util/Threading.h thread/ + ${MKDIR} thread # DOCS is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/899 #DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS #DOCS_BUILD_DEPENDS= doxygen:devel/doxygen #PORTDOCS= * .include diff --git a/misc/openvdb/distinfo b/misc/openvdb/distinfo index 5c70c0e4ff93..2573b28edeae 100644 --- a/misc/openvdb/distinfo +++ b/misc/openvdb/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1628995152 -SHA256 (AcademySoftwareFoundation-openvdb-v8.1.0_GH0.tar.gz) = 3e09d47331429be7409a3a3c27fdd3c297f96d31d2153febe194e664a99d6183 -SIZE (AcademySoftwareFoundation-openvdb-v8.1.0_GH0.tar.gz) = 2619432 -SHA256 (e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch) = 9c39e12741df0fa293e8281c2567d59a8093786625580c62c6509aa4d17a5a7f -SIZE (e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch) = 76933 +TIMESTAMP = 1636936172 +SHA256 (AcademySoftwareFoundation-openvdb-v9.0.0_GH0.tar.gz) = ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468 +SIZE (AcademySoftwareFoundation-openvdb-v9.0.0_GH0.tar.gz) = 2945040 diff --git a/misc/openvdb/files/patch-CMakeLists.txt b/misc/openvdb/files/patch-CMakeLists.txt index a3667035df69..17689aa25184 100644 --- a/misc/openvdb/files/patch-CMakeLists.txt +++ b/misc/openvdb/files/patch-CMakeLists.txt @@ -1,28 +1,22 @@ ---- CMakeLists.txt.orig 2021-06-11 21:38:41 UTC +--- CMakeLists.txt.orig 2021-10-30 02:55:40 UTC +++ CMakeLists.txt -@@ -216,7 +216,7 @@ set(MINIMUM_CXX_STANDARD 14) +@@ -250,7 +250,7 @@ set(MINIMUM_CXX_STANDARD 14) + # @note Blosc version is currently treated as exception which must be adhered # to. The minimum version must be at least 1.5.0. Previous versions are incompatible. - # Later versions (including 1.5.4), can be buggy on certain platforms. -set(MINIMUM_BLOSC_VERSION 1.5.0) +set(MINIMUM_BLOSC_VERSION 1.15) # @note ABI always enforced so the correct deprecation messages are available. # OPENVDB_USE_DEPRECATED_ABI_ should be used to circumvent this set(MINIMUM_OPENVDB_ABI_VERSION 6) -@@ -231,13 +231,13 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) +@@ -265,8 +265,8 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) set(MINIMUM_MSVC_VERSION 19.10) - set(MINIMUM_BOOST_VERSION 1.61) # @warning should be 1.66, but H18 ships with 1.61 -- set(MINIMUM_ILMBASE_VERSION 2.2) # @warning should be 2.3, but H18 ships with 2.2 -- set(MINIMUM_OPENEXR_VERSION 2.2) # @warning should be 2.3, but H18 ships with 2.2 -+ set(MINIMUM_ILMBASE_VERSION 3.0) # @warning should be 2.3, but H18 ships with 2.2 -+ set(MINIMUM_OPENEXR_VERSION 3.0) # @warning should be 2.3, but H18 ships with 2.2 + set(MINIMUM_BOOST_VERSION 1.70) +- set(MINIMUM_ILMBASE_VERSION 2.4) +- set(MINIMUM_OPENEXR_VERSION 2.4) ++ set(MINIMUM_ILMBASE_VERSION 3.0) ++ set(MINIMUM_OPENEXR_VERSION 3.0) set(MINIMUM_ZLIB_VERSION 1.2.7) - set(MINIMUM_TBB_VERSION 2018.0) - set(MINIMUM_LLVM_VERSION 6.0.0) - -- set(MINIMUM_PYTHON_VERSION 2.7) -+ set(MINIMUM_PYTHON_VERSION ${FREEBSD_PYTHON_VER}) - set(MINIMUM_NUMPY_VERSION 1.14.0) - - set(MINIMUM_GOOGLETEST_VERSION 1.8) + set(MINIMUM_TBB_VERSION 2019.0) + set(MINIMUM_LLVM_VERSION 7.0.0) diff --git a/misc/openvdb/files/patch-cmake_FindOpenEXR.cmake b/misc/openvdb/files/patch-cmake_FindOpenEXR.cmake deleted file mode 100644 index 45d78f1a4039..000000000000 --- a/misc/openvdb/files/patch-cmake_FindOpenEXR.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/FindOpenEXR.cmake.orig 2021-02-05 19:21:38 UTC -+++ cmake/FindOpenEXR.cmake -@@ -91,8 +91,7 @@ if(DISABLE_CMAKE_SEARCH_PATHS) - endif() - - set(_OPENEXR_COMPONENT_LIST -- IlmImf -- IlmImfUtil -+ OpenEXR - ) - - if(OpenEXR_FIND_COMPONENTS) diff --git a/misc/openvdb/files/patch-cmake_FindTBB.cmake b/misc/openvdb/files/patch-cmake_FindTBB.cmake index 384f0817d3a9..8d3480fd715d 100644 --- a/misc/openvdb/files/patch-cmake_FindTBB.cmake +++ b/misc/openvdb/files/patch-cmake_FindTBB.cmake @@ -1,10 +1,10 @@ ---- cmake/FindTBB.cmake.orig 2021-02-05 19:21:38 UTC +--- cmake/FindTBB.cmake.orig 2021-10-30 02:55:40 UTC +++ cmake/FindTBB.cmake -@@ -93,7 +93,6 @@ endif() +@@ -110,7 +110,6 @@ endif() set(_TBB_COMPONENT_LIST tbb tbbmalloc - tbbmalloc_proxy ) if(TBB_FIND_COMPONENTS) diff --git a/misc/openvdb/files/patch-doc_CMakeLists.txt b/misc/openvdb/files/patch-doc_CMakeLists.txt index 31df4557ff24..ae537ef77557 100644 --- a/misc/openvdb/files/patch-doc_CMakeLists.txt +++ b/misc/openvdb/files/patch-doc_CMakeLists.txt @@ -1,10 +1,10 @@ ---- doc/CMakeLists.txt.orig 2021-02-05 19:21:38 UTC +--- doc/CMakeLists.txt.orig 2021-10-30 02:55:40 UTC +++ doc/CMakeLists.txt -@@ -195,5 +195,5 @@ doxygen_add_docs(doc ${DOXY_FILES} +@@ -270,5 +270,5 @@ doxygen_add_docs(doc ${DOXY_FILES} COMMENT "Generating API documentation with Doxygen") # Suppress "Installing..." messages for all but one of the hundreds of generated files. -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/html/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/html) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR} MESSAGE_NEVER) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION share/doc/openvdb) +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION share/doc/openvdb MESSAGE_NEVER) diff --git a/misc/openvdb/files/patch-openvdb_openvdb_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_CMakeLists.txt deleted file mode 100644 index d1ff3bfa6cc7..000000000000 --- a/misc/openvdb/files/patch-openvdb_openvdb_CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ ---- openvdb/openvdb/CMakeLists.txt.orig 2021-06-11 21:38:41 UTC -+++ openvdb/openvdb/CMakeLists.txt -@@ -128,8 +128,8 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_V - endif() - endif() - -+find_package(Imath ${MINIMUM_ILMBASE_VERSION} REQUIRED) - if(USE_IMATH_HALF) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) - if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) - message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " -@@ -191,7 +191,7 @@ set(OPENVDB_CORE_DEPENDENT_LIBS - ) - - if(USE_IMATH_HALF) -- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS IlmBase::Half) -+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Imath::Half) - endif() - - if(WIN32) diff --git a/misc/openvdb/files/patch-openvdb_openvdb_Types.h b/misc/openvdb/files/patch-openvdb_openvdb_Types.h deleted file mode 100644 index 037068298f82..000000000000 --- a/misc/openvdb/files/patch-openvdb_openvdb_Types.h +++ /dev/null @@ -1,11 +0,0 @@ ---- openvdb/openvdb/Types.h.orig 2021-06-11 21:38:41 UTC -+++ openvdb/openvdb/Types.h -@@ -9,7 +9,7 @@ - #include "TypeList.h" // backwards compat - - #ifdef OPENVDB_USE_IMATH_HALF --#include -+#include - namespace openvdb { - OPENVDB_USE_VERSION_NAMESPACE - namespace OPENVDB_VERSION_NAME { diff --git a/misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt deleted file mode 100644 index ce148b306885..000000000000 --- a/misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- openvdb/openvdb/cmd/CMakeLists.txt.orig 2021-06-11 21:38:41 UTC -+++ openvdb/openvdb/cmd/CMakeLists.txt -@@ -116,8 +116,8 @@ endif() - #### vdb_render - - if(OPENVDB_BUILD_VDB_RENDER) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) -- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -+ find_package(Imath ${MINIMUM_ILMBASE_VERSION} REQUIRED) -+ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) - - set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) - add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES}) -@@ -129,11 +129,8 @@ if(OPENVDB_BUILD_VDB_RENDER) - # headers - - target_link_libraries(vdb_render -- IlmBase::Half -- OpenEXR::IlmImf -- IlmBase::IlmThread -- IlmBase::Iex -- IlmBase::Imath -+ OpenEXR::OpenEXR -+ Imath::Imath - ${OPENVDB_BINARIES_DEPENDENT_LIBS} - ) - diff --git a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt index 16ccc54eefa9..e7987e5b6e12 100644 --- a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt +++ b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt @@ -1,25 +1,16 @@ ---- openvdb/openvdb/python/CMakeLists.txt.orig 2021-02-05 19:21:38 UTC +--- openvdb/openvdb/python/CMakeLists.txt.orig 2021-10-30 02:55:40 UTC +++ openvdb/openvdb/python/CMakeLists.txt -@@ -81,7 +81,7 @@ if(OPENVDB_BUILD_PYTHON_UNITTESTS) +@@ -88,11 +88,11 @@ if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) + list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) endif() - if(${CMAKE_VERSION} VERSION_LESS 3.14) -- find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) - OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) +-find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) ++find_package(Python ${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) + OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) - if(USE_NUMPY) -@@ -90,11 +90,11 @@ if(${CMAKE_VERSION} VERSION_LESS 3.14) - list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) - endif() - else() -- find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) - OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) - - if(USE_NUMPY) -- find_package(Python QUIET COMPONENTS NumPy) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS NumPy) - if(NOT TARGET Python::NumPy) - message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " - "\"${MINIMUM_NUMPY_VERSION}\")" + if(USE_NUMPY) +- find_package(Python QUIET COMPONENTS NumPy) ++ find_package(Python ${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS NumPy) + if(NOT TARGET Python::NumPy) + message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " + "\"${MINIMUM_NUMPY_VERSION}\")" diff --git a/misc/openvdb/pkg-plist b/misc/openvdb/pkg-plist index c264e0880272..79ce97eb9c13 100644 --- a/misc/openvdb/pkg-plist +++ b/misc/openvdb/pkg-plist @@ -1,156 +1,157 @@ %%TOOLS%%bin/vdb_lod %%TOOLS%%bin/vdb_print %%TOOLS%%bin/vdb_render %%TOOLS%%bin/vdb_view include/openvdb/Exceptions.h include/openvdb/Grid.h include/openvdb/MetaMap.h include/openvdb/Metadata.h include/openvdb/Platform.h include/openvdb/PlatformConfig.h include/openvdb/TypeList.h include/openvdb/Types.h include/openvdb/io/Archive.h include/openvdb/io/Compression.h include/openvdb/io/DelayedLoadMetadata.h include/openvdb/io/File.h include/openvdb/io/GridDescriptor.h include/openvdb/io/Queue.h include/openvdb/io/Stream.h include/openvdb/io/TempFile.h include/openvdb/io/io.h include/openvdb/math/BBox.h include/openvdb/math/ConjGradient.h include/openvdb/math/Coord.h include/openvdb/math/DDA.h include/openvdb/math/FiniteDifference.h include/openvdb/math/Half.h include/openvdb/math/HalfLimits.h include/openvdb/math/LegacyFrustum.h include/openvdb/math/Maps.h include/openvdb/math/Mat.h include/openvdb/math/Mat3.h include/openvdb/math/Mat4.h include/openvdb/math/Math.h include/openvdb/math/Operators.h include/openvdb/math/Proximity.h include/openvdb/math/QuantizedUnitVec.h include/openvdb/math/Quat.h include/openvdb/math/Ray.h include/openvdb/math/Stats.h include/openvdb/math/Stencils.h include/openvdb/math/Transform.h include/openvdb/math/Tuple.h include/openvdb/math/Vec2.h include/openvdb/math/Vec3.h include/openvdb/math/Vec4.h include/openvdb/openvdb.h include/openvdb/points/AttributeArray.h include/openvdb/points/AttributeArrayString.h include/openvdb/points/AttributeGroup.h include/openvdb/points/AttributeSet.h include/openvdb/points/IndexFilter.h include/openvdb/points/IndexIterator.h include/openvdb/points/PointAdvect.h include/openvdb/points/PointAttribute.h include/openvdb/points/PointConversion.h include/openvdb/points/PointCount.h include/openvdb/points/PointDataGrid.h include/openvdb/points/PointDelete.h include/openvdb/points/PointGroup.h include/openvdb/points/PointMask.h include/openvdb/points/PointMove.h include/openvdb/points/PointSample.h include/openvdb/points/PointScatter.h include/openvdb/points/StreamCompression.h %%PYTHON%%include/openvdb/python/pyopenvdb.h include/openvdb/thread/Threading.h include/openvdb/tools/Activate.h include/openvdb/tools/ChangeBackground.h include/openvdb/tools/Clip.h include/openvdb/tools/Composite.h include/openvdb/tools/Count.h include/openvdb/tools/Dense.h include/openvdb/tools/DenseSparseTools.h include/openvdb/tools/Diagnostics.h include/openvdb/tools/FastSweeping.h include/openvdb/tools/Filter.h include/openvdb/tools/FindActiveValues.h include/openvdb/tools/GridOperators.h include/openvdb/tools/GridTransformer.h include/openvdb/tools/Interpolation.h include/openvdb/tools/LevelSetAdvect.h include/openvdb/tools/LevelSetFilter.h include/openvdb/tools/LevelSetFracture.h include/openvdb/tools/LevelSetMeasure.h include/openvdb/tools/LevelSetMorph.h include/openvdb/tools/LevelSetPlatonic.h include/openvdb/tools/LevelSetRebuild.h include/openvdb/tools/LevelSetSphere.h include/openvdb/tools/LevelSetTracker.h include/openvdb/tools/LevelSetUtil.h include/openvdb/tools/Mask.h include/openvdb/tools/Merge.h include/openvdb/tools/MeshToVolume.h include/openvdb/tools/Morphology.h include/openvdb/tools/MultiResGrid.h include/openvdb/tools/NodeVisitor.h include/openvdb/tools/ParticleAtlas.h include/openvdb/tools/ParticlesToLevelSet.h include/openvdb/tools/PointAdvect.h include/openvdb/tools/PointIndexGrid.h include/openvdb/tools/PointPartitioner.h include/openvdb/tools/PointScatter.h include/openvdb/tools/PointsToMask.h include/openvdb/tools/PoissonSolver.h include/openvdb/tools/PotentialFlow.h include/openvdb/tools/Prune.h include/openvdb/tools/RayIntersector.h include/openvdb/tools/RayTracer.h include/openvdb/tools/SignedFloodFill.h include/openvdb/tools/Statistics.h include/openvdb/tools/TopologyToLevelSet.h include/openvdb/tools/ValueTransformer.h include/openvdb/tools/VectorTransformer.h include/openvdb/tools/VelocityFields.h include/openvdb/tools/VolumeAdvect.h include/openvdb/tools/VolumeToMesh.h include/openvdb/tools/VolumeToSpheres.h include/openvdb/tree/InternalNode.h include/openvdb/tree/Iterator.h include/openvdb/tree/LeafBuffer.h include/openvdb/tree/LeafManager.h include/openvdb/tree/LeafNode.h include/openvdb/tree/LeafNodeBool.h include/openvdb/tree/LeafNodeMask.h include/openvdb/tree/NodeManager.h include/openvdb/tree/NodeUnion.h include/openvdb/tree/RootNode.h include/openvdb/tree/Tree.h include/openvdb/tree/TreeIterator.h include/openvdb/tree/ValueAccessor.h include/openvdb/util/CpuTimer.h +include/openvdb/util/ExplicitInstantiation.h include/openvdb/util/Formats.h include/openvdb/util/MapsUtil.h include/openvdb/util/Name.h include/openvdb/util/NodeMasks.h include/openvdb/util/NullInterrupter.h include/openvdb/util/PagedArray.h include/openvdb/util/Util.h include/openvdb/util/logging.h include/openvdb/version.h lib/cmake/OpenVDB/FindBlosc.cmake lib/cmake/OpenVDB/FindIlmBase.cmake lib/cmake/OpenVDB/FindJemalloc.cmake lib/cmake/OpenVDB/FindLog4cplus.cmake lib/cmake/OpenVDB/FindOpenEXR.cmake lib/cmake/OpenVDB/FindOpenVDB.cmake lib/cmake/OpenVDB/FindTBB.cmake lib/cmake/OpenVDB/OpenVDBGLFW3Setup.cmake lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake lib/cmake/OpenVDB/OpenVDBUtils.cmake lib/libopenvdb.so -lib/libopenvdb.so.8.1 -lib/libopenvdb.so.8.1.0 -%%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so +lib/libopenvdb.so.9.0 +lib/libopenvdb.so.9.0.0 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyopenvdb.so diff --git a/science/opensph/Makefile b/science/opensph/Makefile index b6c527d020ea..5fa46883cff3 100644 --- a/science/opensph/Makefile +++ b/science/opensph/Makefile @@ -1,73 +1,73 @@ PORTNAME= OpenSPH DISTVERSION= 0.3.8 -PORTREVISION= 2 # accounts for the upstream moving 0.3.8 release, including bugfixes +PORTREVISION= 3 # accounts for the upstream moving 0.3.8 release, including bugfixes CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Library and graphical tools for running SPH and N-body simulations LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= catch>0:devel/catch USES= compiler:c++14-lang qmake qt:5 USE_GITLAB= yes USE_WX= 3.1 GL_SITE= https://gitlab.com GL_ACCOUNT= sevecekp GL_PROJECT= sph GL_COMMIT= 7de6c044339f649e3d19e61f735a6a24572b792a QMAKE_SOURCE_PATH= ${WRKSRC}/sph.pro QMAKE_ARGS= CONFIG+=release CXXFLAGS+= -DSPH_CONFIG_SET TEST_WRKSRC= ${WRKDIR}/test BINARY_ALIAS= wx-config=${LOCALBASE}/bin/wxgtk3u-3.1-config PLIST_FILES= bin/opensph bin/opensph-cli bin/opensph-info OPTIONS_DEFINE= CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB OPTIONS_DEFAULT= CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB CHAISCRIPT_DESC= Be able to read and modify particle data from a script CHAISCRIPT_QMAKE_ON= CONFIG+=use_chaiscript CHAISCRIPT_BUILD_DEPENDS= ${LOCALBASE}/include/chaiscript/chaiscript.hpp:lang/chaiscript EIGEN_DESC= Eigen for additional methods to set up initial conditions EIGEN_QMAKE_ON= CONFIG+=use_eigen EIGEN_USES= eigen:3 HDF5_DESC= Be able to read files generated by miluphcuda code HDF5_QMAKE_ON= CONFIG+=use_hdf5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 OPENMP_QMAKE_ON= CONFIG+=use_openmp TBB_DESC= Parallelize with Intel Threading Building Blocks TBB_QMAKE_ON= CONFIG+=use_tbb TBB_LIB_DEPENDS= libtbb.so:devel/onetbb VDB_DESC= Use OpenVDB for converting particles to volumetric data VDB_QMAKE_ON= CONFIG+=use_vdb VDB_LIB_DEPENDS= libImath.so:math/Imath \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/onetbb do-test: @${REINPLACE_CMD} -e 's|Path(.*|Path("${TEST_WRKSRC}");|' ${WRKSRC}/test/utils/Config.h @${MKDIR} ${TEST_WRKSRC} @cd ${_QMAKE_WRKSRC} && \ ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \ ${WRKSRC}/test.pro \ ${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS} @cd ${BUILD_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} @cd ${TEST_WRKSRC} && \ ${WRKSRC}/test/test .include