diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index 01b67ff811e3..c0edf4fbca85 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,82 +1,82 @@ PORTNAME= FreeCAD DISTVERSION= 0.19.2 -PORTREVISION= 3 +PORTREVISION= 4 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e CATEGORIES= cad MAINTAINER= cmt@FreeBSD.org COMMENT= General purpose 3D CAD modeller LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= does not build with OpenCascade 7.6 (yet) BUILD_DEPENDS= pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ ${PY_BOOST} \ libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \ libCoin.so:graphics/Coin \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \ libTKernel.so:cad/opencascade \ libxerces-c.so:textproc/xerces-c3 \ libboost_thread.so:devel/boost-libs \ libarea.so:devel/libarea \ libmed.so:french/med \ libmpi.so:net/openmpi \ libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} USES= dos2unix compiler:c++17-lang cmake gl eigen:3 fortran jpeg \ localbase:ldflags pkgconfig python:3.7+ localbase qt:5 xorg USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu USE_QT= buildtools concurrent core gui network opengl printsupport \ qmake_build svg webkit widgets xml xmlpatterns USE_LDCONFIG= yes -VTK_VER= 9.0 +VTK_VER= 9.1 DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \ -DBUILD_QT5="ON" \ -DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \ -DPYSIDE2RCCBINARY="${RCC}" \ -DPYSIDE2UICBINARY="${UIC}" \ -DBUILD_ENABLE_CXX_STD=C++17 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ ${PORTNAME} "Graphics;Engineering;" false post-patch: @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ ${WRKSRC}/src/Tools/SubWCRev.py post-install: ${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD ${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd .include diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 6dff3738c641..9c97b62d47ea 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,176 +1,177 @@ # Created by: Thierry Thomas PORTNAME= opencascade PORTVERSION= 7.6.0 +PORTREVISION= 1 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry MAINTAINER= thierry@FreeBSD.org COMMENT= Open CASCADE Technology, 3D modeling & numerical simulation LICENSE= OCTPL LICENSE_NAME= LGPL21 with exception LICENSE_FILE= ${WRKSRC}/OCCT_LGPL_EXCEPTION.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= rapidjson>0:devel/rapidjson \ ${LOCALBASE}/lib/qt5/bin/qmake:devel/qt5-qmake \ ${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libpng16.so:graphics/png \ libvtksys-${VTKVER}.so:math/vtk${VTKVER:R} RUN_DEPENDS= bash:shells/bash # Check ${WRKSRC}/dox/overview/overview.md # and ${WRKSRC}/dox/dev_guides/building USES= alias:10 cmake compiler:c++14-lang dos2unix gettext-runtime \ gl gnome localbase python qt:5 shebangfix tk tar:tgz xorg USE_XORG= ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xscrnsaver xt USE_GL= egl gl glesv2 glu USE_GNOME= libxml2 DOS2UNIX_FILES= adm/templates/* SHEBANG_FILES= adm/templates/*.sh \ adm/templates/*.sh.in \ adm/templates/*.sh.main \ adm/genconf.tcl \ adm/start.tcl \ gendoc ENVSH= adm/templates/env.sh -VTKVER= 9.0 +VTKVER= 9.1 OPTIONS_DEFINE= DOCS DOXYGEN FFMPEG VIS VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl) OPTIONS_DEFAULT=FFMPEG VIS OPTIONS_SUB= yes REINPLACE_ARGS= -i "" LDFLAGS+= -Wl,--allow-shlib-undefined CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ -DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE \ -DINSTALL_DIR_LIB=${PREFIX}/lib \ -DINSTALL_DIR_CMAKE=${PREFIX}/lib/cmake \ -DINSTALL_DIR_DATA=${OCCROOT}/data \ -DINSTALL_DIR_RESOURCE=${OCCROOT}/resources \ -DINSTALL_DIR_SAMPLES=${OCCROOT}/samples \ -DINSTALL_DIR_TESTS=${OCCROOT}/tests \ -DINSTALL_TEST_CASES:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON \ -DUSE_TBB:BOOL=OFF \ -DUSE_RAPIDJSON:BOOL=ON \ -DUSE_VTK:BOOL=ON \ -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER} # TODO: TBB to be replaced by onetbb later #CMAKE_ARGS+= -DUSE_EIGEN:BOOL=ON -DUSE_TBB:BOOL=ON #USES+= eigen:3 #LIB_DEPENDS+= libtbb.so:devel/tbb USE_LDCONFIG= yes LOCCROOT= OpenCAS OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \ VE=${PORTVERSION:R:R} VER=${PORTVERSION} FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libtheoraenc.so:multimedia/libtheora \ libunistring.so:devel/libunistring \ libvdpau.so:multimedia/libvdpau \ libxvidcore.so:multimedia/xvid \ libp11-kit.so:security/p11-kit \ libx264.so:multimedia/libx264 \ libtasn1.so:security/libtasn1 \ libvorbis.so:audio/libvorbis \ libdav1d.so:multimedia/dav1d \ libnettle.so:security/nettle \ libgnutls.so:security/gnutls \ libvpx.so:multimedia/libvpx \ libx265.so:multimedia/x265 \ libdrm.so:graphics/libdrm \ libva.so:multimedia/libva \ libaom.so:multimedia/aom \ libmp3lame.so:audio/lame \ libffi.so:devel/libffi \ libidn2.so:dns/libidn2 \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libgmp.so:math/gmp VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON \ -DUSE_GLES2:BOOL=ON \ -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} VIS_CMAKE_OFF= -DUSE_FREEIMAGE:BOOL=OFF \ -DUSE_GLES2:BOOL=OFF VIS_LIB_DEPENDS= libftgl.so:graphics/ftgl \ libfreeimageplus.so:graphics/freeimage VIS_USE= GL=glesv2 DOXYGEN_IMPLIES= DOCS DOXYGEN_USE= TEX=latex:build DOXYGEN_BUILD_DEPENDS= bash:shells/bash \ doxygen:devel/doxygen \ dot:graphics/graphviz \ pdftex:print/tex-basic-engines \ inkscape:graphics/inkscape DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax .include .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == "i386" BITS= 32 .else BITS= 64 .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: to build OpenCascade, you should have at least" @${ECHO_MSG} "2.6 Gb of free disk space in build area!" @${ECHO_MSG} pre-patch: ${REINPLACE_CMD} 's|||' \ ${WRKSRC}/src/BRepMesh/delabella.cpp\ ${WRKSRC}/src/OSD/OSD_MemInfo.cxx pre-configure: ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc ${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/adm/genconfdeps.tcl ${GREP} -rl x86_64 ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -e 's|x86_64|amd64|' .for es in ${ENVSH} ${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es} .endfor post-build-DOXYGEN-on: (cd ${WRKSRC} && ./gendoc -overview) post-install: ${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE (cd ${STAGEDIR}${PREFIX}/bin && \ ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE) post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${RM} -r ${STAGEDIR}${DOCSDIR}/latex ${RM} ${STAGEDIR}${DOCSDIR}/html/build_upgrade_building_3rdparty.html.bak .if defined(MAINTAINER_MODE) regression-test: install ${RM} -rf /tmp/testOCC ${MKDIR} /tmp/testOCC bash -c "\ cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh && \ CSF_TestScriptsPath=${OCCROOT}/tests \ CSF_TestDataPath=${OCCROOT}/data \ DRAWEXE -f ${FILESDIR}/regtest " .endif .include diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile index 577172ff1fe4..c5885d5c2bbe 100644 --- a/graphics/mirtk/Makefile +++ b/graphics/mirtk/Makefile @@ -1,36 +1,36 @@ PORTNAME= mirtk DISTVERSIONPREFIX= v DISTVERSION= 2.0.0-122 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX= -g38210fa CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Medical Image Registration ToolKit (MIRTK) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ nifticlib>0:science/nifticlib USES= cmake compiler:c++11-lang eigen:3 perl5 python USE_GITHUB= yes GH_ACCOUNT= BioMedIA GH_PROJECT= ${PORTNAME:tu} USE_LDCONFIG= yes OPTIONS_DEFINE= TBB VTK OPTIONS_DEFAULT= VTK # TBB is OFF by default until the project is oneTBB-compatible, see https://github.com/BioMedIA/MIRTK/issues/760 TBB_DESC= Build with TBB TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_BROKEN= Not oneTBB-compatible,see https://github.com/BioMedIA/MIRTK/issues/760 VTK_DESC= Build with the VTK toolkit VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-9.0.so:math/vtk9 \ +VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 \ libexpat.so:textproc/expat2 .include diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 3b2abb2d3cc2..1d6d55cca4cd 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,226 +1,226 @@ PORTNAME= opencv DISTVERSION= 4.5.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics PATCH_SITES= https://github.com/opencv/opencv/commit/ PATCHFILES= 998406d20e93aa36b26fd56506f3ea8a82b43c24.patch:-p1 MAINTAINER= tcberner@FreeBSD.org COMMENT= Open Source Computer Vision library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libharfbuzz.so:print/harfbuzz \ libhdf5.so:science/hdf5 USES= cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= WeChatCV:wechat GH_PROJECT= opencv_contrib:contrib \ ade:ade \ opencv_3rdparty:extra_mod_3rdparty_boost_descr \ opencv_3rdparty:extra_mod_3rdparty_vgg \ opencv_3rdparty:wechat \ opencv_3rdparty:face \ opencv_3rdparty:ippicv GH_TAGNAME= v0.1.1f:ade \ 34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \ fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg \ a8b69ccc738421293254aec5ddb38bd523503252:wechat \ 8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \ a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv CMAKE_ON= OPENCV_GENERATE_PKGCONFIG CMAKE_OFF= OPENCV_GENERATE_SETUPVARS \ BUILD_opencv_python2 \ BUILD_TESTS CMAKE_ARGS= -DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules" DATADIR= ${PREFIX}/share/${PORTNAME}4 PLIST_SUB= SHLIB_VER=${DISTVERSION} OPTIONS_DEFINE= EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB VTK OPTIONS_GROUP= IMAGE VIDEO OPTIONS_GROUP_IMAGE= GPHOTO2 JPEG OPENEXR PNG TIFF OPTIONS_GROUP_VIDEO= DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE OPTIONS_SINGLE= BLAS OPTIONS_SINGLE_BLAS= ATLAS OPENBLAS NOBLAS OPTIONS_RADIO= JPEG2K OPTIONS_RADIO_JPEG2K= JASPER OPENJPEG OPTIONS_DEFAULT= EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \ DC1394 GSTREAMER V4L VULKAN WEBP \ GPHOTO2 JPEG OPENEXR PNG TIFF \ OPENBLAS \ OPENJPEG OPTIONS_SUB= yes # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB VTK) EIGEN_DESC= Add Eigen v3 Support, builds sfm modules EIGEN_CMAKE_BOOL= WITH_EIGEN EIGEN_USES= eigen:3 GDAL_DESC= Add Geospatial Data Abstraction Library Support GDAL_CMAKE_BOOL= WITH_GDAL GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal GDCM_DESC= Add Open source DICOM library Support GDCM_CMAKE_BOOL= WITH_GDCM GDCM_LIB_DEPENDS= libgdcmMSFF.so:devel/gdcm HARDENING_DESC= Enables Build Hardening HARDENING_CMAKE_BOOL= ENABLE_BUILD_HARDENING JAVA_DESC= Enable Java Support JAVA_BUILD_DEPENDS= ant:devel/apache-ant JAVA_CMAKE_BOOL= BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA JAVA_MAKE_ENV= JAVACMD=${JAVA} JAVA_USE= JAVA=yes LTO_DESC= Enables Link Time Optimizations LTO_CMAKE_BOOL= ENABLE_THIN_LTO OPENCL_DESC= Add OpenCL Support OPENCL_CMAKE_BOOL= WITH_OPENCL OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl OPENCL_RUN_DEPENDS= opencl>=0:devel/opencl PATENTED_DESC= Enable patented 2d feature detection USE AT OWN RISK PATENTED_CMAKE_BOOL= OPENCV_ENABLE_NONFREE PROTOBUF_DESC= Enable protobuf support, builds dnn modules PROTOBUF_CMAKE_BOOL= WITH_PROTOBUF PROTOBUF_LIB_DEPENDS= libprotobuf.so:devel/protobuf PYTHON_DESC= Enable Python Support 3.6 or greater PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_USES= python:3.6+ PYTHON_CMAKE_BOOL= BUILD_opencv_python3 PYTHON_CMAKE_ON= -DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} TBB_DESC= Add Intel Threading Building Blocks Support TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/tbb VTK_DESC= Include VTK library support (build opencv_viz module) VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-9.0.so:math/vtk9 +VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 ### # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF) GPHOTO2_DESC= Add Gphoto2 Support GPHOTO2_CMAKE_BOOL= WITH_GPHOTO2 GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 JPEG_DESC= Add LibJpeg Support JPEG_CMAKE_BOOL= WITH_JPEG JPEG_USES= jpeg OPENEXR_DESC= Add OpenEXR Support OPENEXR_CMAKE_BOOL= WITH_OPENEXR OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr PNG_DESC= Add LibPNG Support PNG_CMAKE_BOOL= WITH_PNG PNG_LIB_DEPENDS= libpng16.so:graphics/png TIFF_DESC= Add LibTIFF Support TIFF_CMAKE_BOOL= WITH_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff ### # VIDEO group options (DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE) DC1394_DESC= IEEE 1394 camera support DC1394_CMAKE_BOOL= WITH_1394 DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 FFMPEG_DESC= Link with ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg GSTREAMER_DESC= Add GSTREAMER Support GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER GSTREAMER_USE= GSTREAMER1=yes V4L_DESC= Enable support for Video for Linux V4L_CMAKE_BOOL= WITH_V4L WITH_LIBV4L V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l VULKAN_DESC= Add Vulkan Support VULKAN_CMAKE_BOOL= WITH_VULKAN VULKAN_CMAKE_ON= -DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers WEBP_DESC= Add Webp Support WEBP_CMAKE_BOOL= WITH_WEBP WEBP_LIB_DEPENDS= libwebp.so:graphics/webp XINE_DESC= Add Xine Support XINE_CMAKE_BOOL= WITH_XINE XINE_LIB_DEPENDS= libxine.so:multimedia/libxine ### # BLAS group options (ATLAS OPENBLAS NOBLAS) ATLAS_DESC= ATLAS blas implementation with lapacke ATLAS_USES= blaslapack:atlas ATLAS_LIB_DEPENDS= liblapacke.so:math/lapacke OPENBLAS_DESC= OpenBLAS blas implementation with lapacke OPENBLAS_USES= blaslapack:openblas OPENBLAS_LIB_DEPENDS= liblapacke.so:math/lapacke NOBLAS_DESC= Disable support for lapack/blas NOBLAS_CMAKE_BOOL_OFF= WITH_LAPACK ### # JPEG2K group options (JASPER OPENJPEG) JASPER_DESC= Add Jasper Support for JPEG2000 JASPER_CMAKE_BOOL= WITH_JASPER JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper OPENJPEG_DESC= Add OpenJPEG Support for JPEG2000, OpenCV preferred OPENJPEG_CMAKE_BOOL= WITH_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg ### _IPPICV_i386= ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz _IPPICV_amd64= ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz post-extract: # Handle contrib ${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib # Handle prefetched ade modul ${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade ${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade # Handle prefetched xfeatures2d ${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d ${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d ${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d # Handle prefetched wechat ${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode ${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/ # Handle Face ${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face ${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face # Handle ippicv .if defined(_IPPICV_${ARCH}) ${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv (cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}}) .endif post-patch: ${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake ${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake .include diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index b45191df8c3d..ebab4bae192f 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -1,55 +1,56 @@ # Created by: Vladimir Chukharev PORTNAME= mayavi DISTVERSION= 4.7.3 +PORTREVISION= 1 CATEGORIES= graphics science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Application and library for 3D visualization and plotting in Python LICENSE= BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11 # see ${WRKSRC}/image_LICENSE.txt LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.txt LICENSE_FILE_LGPL21= ${WRKSRC}/image_LICENSE_Nuvola.txt LICENSE_FILE_LGPL20= ${WRKSRC}/image_LICENSE_CP.txt LICENSE_FILE_EPL= ${WRKSRC}/image_LICENSE_Eclipse.txt LICENSE_FILE_LGPL3= ${WRKSRC}/image_LICENSE_OOo.txt LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE_YORICK.txt LICENSE_FILE_APACHE11= ${WRKSRC}/LICENSE_COLORBREWER.txt BROKEN_i386= Building TVTK classes... Fatal Python error: Segmentation fault # might be specific to Mayavi or Python versions BUILD_DEPENDS= vtk9>0:math/vtk9 \ ${PYNUMPY} \ ${PY_SPHINX} \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} RUN_DEPENDS= vtk9>0:math/vtk9 \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyface>=6.0.0:devel/py-pyface@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traits>=4.6.0:devel/py-traits@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitsui>=6.0.0:graphics/py-traitsui@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= noflavors distutils autoplist # noflavors to force python to be of the same version as in vtk9, which always has default python version USE_WX= 3.0+ WX_COMPS= python:run SHEBANG_FILES= mayavi/tests/csv_files/csv_2_py POST_PLIST= fix-plist post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tvtk/array_ext*.so fix-plist: @${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/mayavi/preferences/__pycache__$$||" ${TMPPLIST} @${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/tvtk/plugins/scene/__pycache__$$||" ${TMPPLIST} .include diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 78e234e7caef..e1b8383b27f4 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,136 +1,137 @@ PORTNAME= vtk -DISTVERSION= 9.0.3 -PORTREVISION= 1 +DISTVERSION= 9.1.0 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 DISTNAME= ${PORTNAME:tu}-${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Visualization toolkit LICENSE= BSD3CLAUSE LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} -USE_XORG= ice x11 xt xext sm +USE_XORG= ice x11 xt xext sm xcursor xfixes xrender CMAKE_ON= BUILD_SHARED_LIBS \ VTK_INSTALL_NO_DOCUMENTATION VTK_USE_SYSTEM_EXPAT VTK_USE_SYSTEM_TIFF \ VTK_USE_SYSTEM_PNG VTK_USE_SYSTEM_JPEG VTK_USE_SYSTEM_FREETYPE VTK_USE_SYSTEM_ZLIB \ Module_vtkTestingCore Module_vtkTestingRendering CMAKE_ARGS= -DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \ -DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \ -DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \ -DSTAGEDIR=${STAGEDIR} +CFLAGS+= -Du_int=unsigned # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259975 + VTK_SHORT_VER= ${PORTVERSION:R} DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options OPTIONS_DEFINE= DESIGNER DOCS OSMESA PYTHON QT5 EXAMPLES OPTIONS_DEFAULT= MPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage. OSMESA_DESC= Use Mesa for off-screen rendering DESIGNER_DESC= Build the Qt Designer plugin OPTIONS_SUB= yes # Options groups #VTK_GROUPS= Imaging MPI Qt Rendering StandAlone Views VTK_GROUPS= MPI VTK_WRAPS= JAVA TCLTK OPTIONS_GROUP= GROUPS WRAPPING OPTIONS_GROUP_GROUPS=${VTK_GROUPS} OPTIONS_GROUP_WRAPPING=${VTK_WRAPS} GROUPS_DESC= Groups WRAPPING_DESC= Wrapping .for g in ${VTK_GROUPS} $g_DESC= Build the $g group .endfor .for w in ${VTK_WRAPS} $w_DESC= $w wrapping .endfor PYTHON_USES= python:3.6+ PYTHON_CMAKE_BOOL= VTK_WRAP_PYTHON PYTHON_CMAKE_ON= -DVTK_PYTHON_VERSION=${PYTHON_MAJOR_VER} PYTHON_VARS= SUB_FILES=PKG-INFO SUB_LIST=PORTVERSION=${PORTVERSION} QT5_USES= qt:5 -QT5_USE= QT=core,gui,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build +QT5_USE= QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build QT5_CMAKE_ON= -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \ -DVTK_GROUP_ENABLE_Qt:STRING=YES \ -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES DESIGNER_CMAKE_BOOL= QT_DESIGNER_PLUGIN DESIGNER_USE= QT=designer DESIGNER_IMPLIES= QT5 MPI_LIB_DEPENDS= libmpi.so:net/openmpi MPI_CMAKE_ON= -DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec OSMESA_CMAKE_ON= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \ -DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \ -DVTK_USE_X:BOOL=OFF OSMESA_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa # Wrapping JAVA_CATEGORIES= java JAVA_VARS= USE_JAVA=yes JAVA_CMAKE_BOOL= VTK_WRAP_JAVA Module_vtkWrappingJava JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so TCLTK_USES= tk TCLTK_CMAKE_BOOL= VTK_WRAP_TCL VTK_Group_Tk TCLTK_CMAKE_ON= -DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \ -DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR} \ -DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER} DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION DOCS_BUILD_DEPENDS= doxygen:devel/doxygen EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES # Mangling so that it will build when science/netcdf is installed. post-patch: @${MV} ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/netcdf.h \ ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/xxxnetcdf.h @${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ -E 's/[[:<:]]netcdf\.h[[:>:]]/xxxnetcdf.h/' .include .for g in ${VTK_GROUPS} . if ${PORT_OPTIONS:M${g}} CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=ON . else CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=OFF . endif .endfor .if !${PORT_OPTIONS:MOSMESA} USES+= gl USE_GL= gl glu .endif CONFLICTS= vtk6 vtk8 do-install-PYTHON-on: # cmake doesn't install pip's .egg-info: https://gitlab.kitware.com/vtk/vtk/-/issues/18087 @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info @${INSTALL_DATA} ${WRKDIR}/PKG-INFO ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info post-install: # autoplist: thousands of files, complex dependencies on options @cd ${STAGEDIR}${PREFIX} && \ ${FIND} * -type f -or -type l >> ${TMPPLIST} .include diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo index 0754c728341d..cfc8330ff50a 100644 --- a/math/vtk9/distinfo +++ b/math/vtk9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629311941 -SHA256 (VTK-9.0.3.tar.gz) = bc3eb9625b2b8dbfecb6052a2ab091fc91405de4333b0ec68f3323815154ed8a -SIZE (VTK-9.0.3.tar.gz) = 34684378 +TIMESTAMP = 1637434253 +SHA256 (VTK-9.1.0.tar.gz) = 8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96 +SIZE (VTK-9.1.0.tar.gz) = 47871165 diff --git a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.cxx b/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.cxx deleted file mode 100644 index b3870218a2f8..000000000000 --- a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.cxx +++ /dev/null @@ -1,44 +0,0 @@ ---- Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.orig 2020-06-26 13:24:40 UTC -+++ Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx -@@ -61,10 +61,22 @@ typedef ptrdiff_t GLsizeiptr; - - #include - -+// Patch from upstream b3b088e8 -+#include -+#include -+ - #include - #include --#include - -+/* -+ * Work-around to get forward declarations of C typedef of anonymous -+ * structs working. We do not want to include XUtil.h in the header as -+ * it populates the global namespace. -+ */ -+struct vtkXVisualInfo : public XVisualInfo -+{ -+}; -+ - #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 - #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 - typedef GLXContext (*glXCreateContextAttribsARBProc)( -@@ -224,7 +236,7 @@ int XEventTypeEquals(Display*, XEvent* event, XPointer - return event->type == EventType; - } - --XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo() -+vtkXVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo() - { - XVisualInfo* v = nullptr; - -@@ -258,7 +270,7 @@ XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualI - vtkErrorMacro(<< "Could not find a decent visual\n"); - } - } -- return (v); -+ return reinterpret_cast(v); - } - - vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow() diff --git a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.h b/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.h deleted file mode 100644 index 59457634d2ba..000000000000 --- a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.h +++ /dev/null @@ -1,24 +0,0 @@ ---- Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.orig 2020-06-26 13:24:40 UTC -+++ Rendering/OpenGL2/vtkXOpenGLRenderWindow.h -@@ -28,11 +28,11 @@ - #include "vtkOpenGLRenderWindow.h" - #include "vtkRenderingOpenGL2Module.h" // For export macro - #include // Needed for X types used in the public interface --#include // Needed for X types used in the public interface - #include // for ivar - - class vtkIdList; - class vtkXOpenGLRenderWindowInternal; -+struct vtkXVisualInfo; - - class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderWindow - { -@@ -112,7 +112,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindo - */ - virtual Colormap GetDesiredColormap(); - virtual Visual* GetDesiredVisual(); -- virtual XVisualInfo* GetDesiredVisualInfo(); -+ virtual vtkXVisualInfo* GetDesiredVisualInfo(); - virtual int GetDesiredDepth(); - //@} - diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index e3911bb4dafc..ca7a1c9c605f 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -1,111 +1,112 @@ # Created by: Pedro Giffuni PORTNAME= elmerfem DISTVERSIONPREFIX= release- DISTVERSION= 9.0 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= henrik@gulbra.net COMMENT= Multiphysical simulation software LICENSE= GPLv2 LIB_DEPENDS= libblas.so:math/blas \ libmetis.so:math/metis \ libmpich.so:net/mpich \ libopenblas.so:math/openblas \ libparpack.so:math/arpack-ng USES= cmake compiler:c++11-lang fortran USE_LDCONFIG= ${PREFIX}/lib/elmersolver USE_GITHUB= yes GH_ACCOUNT= ElmerCSC CMAKE_ARGS= -DELMER_FEM_REVISION:STRING=${GH_TAGNAME} ALL_TARGET= # empty LDFLAGS+= -L${LOCALBASE}/lib PORTSCOUT= limit:^release-[1-9] CMAKE_ARGS+= -DHAVE_INTTYPES_H=ON .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev .endif OPTIONS_DEFINE= GUI OCC OPTIONS_DEFAULT= GUI OCC OPTIONS_SUB= yes GUI_DESC= Build with ElmerGUI (Graphical User Interface) OCC_DESC= Use OpenCASCADE for CAD import in ElmerGUI GUI_LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6 GUI_USES= gl jpeg qt:5 xorg GUI_USE= gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${_QT5_LIBS:ts,} GUI_CMAKE_BOOL= WITH_ELMERGUI WITH_PARAVIEW GUI_CMAKE_ON= -DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \ -DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \ -DDESIRED_QT_VERSION=5 \ -DWITH_QT5:BOOL=TRUE \ -DQT_FOUND:BOOL=TRUE OCC_IMPLIES= GUI OCC_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \ libtiff.so:graphics/tiff \ libTKernel.so:cad/opencascade \ - libvtksys-9.0.so:math/vtk9 + libvtksys-9.1.so:math/vtk9 OCC_USES= python OCC_CMAKE_BOOL= WITH_OCC OCC_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 _LIBSTAGEDIR= ${STAGEDIR}/${PREFIX}/lib/elmersolver _PYVERSION= ${PYTHON_VER}${PYTHON_ABIVER} _QT5_LIBS= buildtools_build concurrent core declarative gui location \ network opengl printsupport qmake_build script sensors \ sql svg webchannel webkit widgets xml .include .if ${ARCH} == "amd64" CFLAGS_${ARCH}= -fPIC CXXFLAGS_${ARCH}= -fPIC FCFLAGS+= -fPIC FFLAGS+= -fPIC .endif .if ${GCC_DEFAULT} >= 10 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/COMPLEX(8)). # in theory, this should set FCFLAGS, but the port does not conform FFLAGS+= -fallow-argument-mismatch .endif post-patch: @${RM} ${WRKSRC}/cmake/Modules/CMakeParseArguments.cmake @${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0 @${REINPLACE_CMD} -e 's,"metis.*/metis\.h",,' \ ${WRKSRC}/elmergrid/src/egparallel.c post-patch-OCC-on: @${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" @${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" post-install: ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver ${LN} -sf libelmersolver.so ${_LIBSTAGEDIR}/libelmersolver.so.0 ${LN} -sf libfhuti.so ${_LIBSTAGEDIR}/libfhuti.so.0 ${LN} -sf libmatc.so ${_LIBSTAGEDIR}/libmatc.so.0 ${LN} -sf libmpi_stubs.so ${_LIBSTAGEDIR}/libmpi_stubs.so.0 @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid do-test: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} .include