diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index b3fcee6e8918..03f2bee25755 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,91 +1,87 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 3.0.0 -PORTREVISION= 1 +DISTVERSION= 3.1.0 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= af299dfc670160f01886461b5904797f0aa67cb1.patch:-p1 # https://github.com/f3d-app/f3d/pull/1936 - MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and minimalist 3D viewer WWW= https://f3d.app/ \ https://github.com/f3d-app/f3d LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg4 \ +LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libfontconfig.so:x11-fonts/fontconfig \ libfreeimage.so:graphics/freeimage \ libfreetype.so:print/freetype2 \ libhdf5.so:science/hdf5 \ libinotify.so:devel/libinotify \ libnetcdf.so:science/netcdf \ libtbb.so:devel/onetbb \ libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake:testing compiler:c++17-lang desktop-file-utils gl \ localbase:ldflags shared-mime-info tcl tk xorg USE_GL= gl USE_XORG= ice sm x11 xt USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= f3d-app CMAKE_ON= F3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX CMAKE_OFF= F3D_STRICT_BUILD # disable -Werror CMAKE_OFF+= F3D_LINUX_APPLICATION_LINK_FILESYSTEM LDFLAGS+= -linotify # dependency descroptions are in https://f3d.app/doc/dev/BUILD.html OPTIONS_GROUP= MODULES PLUGINS OPTIONS_GROUP_MODULES= EXTERNAL_RENDERING RAYTRACING OPTIONS_GROUP_PLUGINS= ALEMBIC ASSIMP DRACO EXODUS OCCT OPTIONS_DEFAULT= ALEMBIC ASSIMP DRACO EXODUS OCCT OPTIONS_SUB= yes MODULES_DESC= Build modules: ALEMBIC_DESC= Alembic plugin (for ABC files) ALEMBIC_CMAKE_BOOL= F3D_PLUGIN_BUILD_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic \ libImath-3_1.so:math/Imath ASSIMP_DESC= Assimp plugin (for FBX, OFF, DAE and DXF files) ASSIMP_CMAKE_BOOL= F3D_PLUGIN_BUILD_ASSIMP ASSIMP_LIB_DEPENDS= libassimp.so:multimedia/assimp DRACO_DESC= Draco plugin DRACO_CMAKE_BOOL= F3D_PLUGIN_BUILD_DRACO DRACO_LIB_DEPENDS= libdraco.so:archivers/draco EXODUS_DESC= ExodusII plugin EXODUS_CMAKE_BOOL= F3D_PLUGIN_BUILD_EXODUS EXTERNAL_RENDERING_DESC= External rendering module EXTERNAL_RENDERING_CMAKE_BOOL= F3D_MODULE_EXTERNAL_RENDERING EXTERNAL_RENDERING_BROKEN= Requires VTK::RenderingExternal enabled in VTK OCCT_DESC= OpenCASCADE plugin (for STEP and IGES files) OCCT_USES= localbase:ldflags OCCT_CMAKE_BOOL= F3D_PLUGIN_BUILD_OCCT OCCT_LIB_DEPENDS= libTKBRep.so:cad/opencascade OCCT_CMAKE_ON= -DOpenCASCADE_DIR=${LOCALBASE}/lib/cmake RAYTRACING_DESC= Raytracing module RAYTRACING_CMAKE_BOOL= F3D_MODULE_RAYTRACING RAYTRACING_BROKEN= Requires VTK::RenderingRayTracing enabled in VTK post-install: @${RM} -r ${STAGEDIR}${DOCSDIR} # component-based install cd ${BUILD_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component configuration && \ ${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component sdk && \ ${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --install . --component mimetypes .include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/f3d/distinfo b/graphics/f3d/distinfo index 507b1521ad30..531cd6078de7 100644 --- a/graphics/f3d/distinfo +++ b/graphics/f3d/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1737405692 -SHA256 (f3d-app-f3d-v3.0.0_GH0.tar.gz) = 7ea83830d1c8158a1f01e5ac9edd00b81de3e0b4cbdbc4a4bb60a113728b7b7a -SIZE (f3d-app-f3d-v3.0.0_GH0.tar.gz) = 59780102 -SHA256 (af299dfc670160f01886461b5904797f0aa67cb1.patch) = 9633f417ee2a23772c99a77ad25dc3d2e08a3e8b3ab299b832b88ab8ae71705d -SIZE (af299dfc670160f01886461b5904797f0aa67cb1.patch) = 820 +TIMESTAMP = 1748893025 +SHA256 (f3d-app-f3d-v3.1.0_GH0.tar.gz) = 93ba23078133122e929d9c1e2946c86da1f08fe56b9ffae40ebfd8185e91380a +SIZE (f3d-app-f3d-v3.1.0_GH0.tar.gz) = 61473994 diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist index 0e39dc2b0bf6..9d0032765f26 100644 --- a/graphics/f3d/pkg-plist +++ b/graphics/f3d/pkg-plist @@ -1,98 +1,99 @@ bin/f3d +include/f3d/F3DUtils.h include/f3d/camera.h include/f3d/context.h include/f3d/engine.h include/f3d/exception.h include/f3d/export.h include/f3d/image.h include/f3d/interactor.h include/f3d/log.h include/f3d/options.h include/f3d/plugin.h include/f3d/reader.h include/f3d/scene.h include/f3d/types.h include/f3d/utils.h include/f3d/vtkF3DFaceVaryingPointDispatcher.h include/f3d/vtkF3DGLTFImporter.h include/f3d/vtkF3DImporter.h include/f3d/vtkextModule.h include/f3d/window.h lib/cmake/f3d/application-config.cmake lib/cmake/f3d/f3dConfig.cmake lib/cmake/f3d/f3dConfigVersion.cmake lib/cmake/f3d/f3dEmbed.cmake lib/cmake/f3d/f3dLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/f3d/f3dLibraryTargets.cmake lib/cmake/f3d/f3dTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/f3d/f3dTargets.cmake lib/cmake/f3d/library-config.cmake lib/cmake/f3d_vtkext/f3d_vtkext-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/f3d_vtkext/f3d_vtkext-targets.cmake lib/cmake/f3d_vtkext/f3d_vtkext-vtk-module-properties.cmake lib/libf3d.so lib/libf3d.so.3 -lib/libf3d.so.3.0 +lib/libf3d.so.3.1 lib/libvtkext.so %%ALEMBIC%%lib/libvtkextAlembic.a %%ASSIMP%%lib/libvtkextAssimp.a %%DRACO%%lib/libvtkextDraco.a lib/libvtkextNative.a %%OCCT%%lib/libvtkextOCCT.a lib/libvtkextPrivate.a lib/vtk/hierarchy/f3d_vtkext/vtkext-hierarchy.txt %%ALEMBIC%%share/applications/f3d-plugin-alembic.desktop %%ASSIMP%%share/applications/f3d-plugin-assimp.desktop %%DRACO%%share/applications/f3d-plugin-draco.desktop %%EXODUS%%share/applications/f3d-plugin-exodus.desktop share/applications/f3d-plugin-native.desktop %%OCCT%%share/applications/f3d-plugin-occt.desktop share/applications/f3d.desktop share/bash-completion/completions/f3d share/doc/F3D/LICENSE.md share/doc/F3D/THIRD_PARTY_LICENSES.md %%DATADIR%%/configs/config.d/05_all.json %%ALEMBIC%%%%DATADIR%%/configs/config.d/10_alembic.json %%ASSIMP%%%%DATADIR%%/configs/config.d/10_assimp.json %%DRACO%%%%DATADIR%%/configs/config.d/10_draco.json %%EXODUS%%%%DATADIR%%/configs/config.d/10_exodus.json %%DATADIR%%/configs/config.d/10_native.json %%OCCT%%%%DATADIR%%/configs/config.d/10_occt.json %%DATADIR%%/configs/thumbnail.d/05_all.json %%ALEMBIC%%%%DATADIR%%/configs/thumbnail.d/10_alembic.json %%ASSIMP%%%%DATADIR%%/configs/thumbnail.d/10_assimp.json %%DRACO%%%%DATADIR%%/configs/thumbnail.d/10_draco.json %%EXODUS%%%%DATADIR%%/configs/thumbnail.d/10_exodus.json %%DATADIR%%/configs/thumbnail.d/10_native.json %%OCCT%%%%DATADIR%%/configs/thumbnail.d/10_occt.json %%ALEMBIC%%%%DATADIR%%/plugins/alembic.json %%ASSIMP%%%%DATADIR%%/plugins/assimp.json %%DRACO%%%%DATADIR%%/plugins/draco.json %%EXODUS%%%%DATADIR%%/plugins/exodus.json %%DATADIR%%/plugins/native.json %%OCCT%%%%DATADIR%%/plugins/occt.json share/fish/vendor_completions.d/f3d.fish share/icons/HighContrast/scalable/apps/f3d.svg share/icons/hicolor/16x16/apps/f3d.png share/icons/hicolor/24x24/apps/f3d.png share/icons/hicolor/256x256/apps/f3d.png share/icons/hicolor/32x32/apps/f3d.png share/icons/hicolor/48x48/apps/f3d.png share/icons/hicolor/64x64/apps/f3d.png share/icons/hicolor/scalable/apps/f3d.svg share/metainfo/app.f3d.F3D.metainfo.xml share/mime/packages/f3d-3d-formats.xml share/mime/packages/f3d-3d-image-formats.xml %%ALEMBIC%%share/mime/packages/f3d-alembic-formats.xml %%ASSIMP%%share/mime/packages/f3d-assimp-formats.xml %%DRACO%%share/mime/packages/f3d-draco-formats.xml %%EXODUS%%share/mime/packages/f3d-exodus-formats.xml %%OCCT%%share/mime/packages/f3d-occt-formats.xml share/mime/packages/f3d-vtk-formats.xml %%ALEMBIC%%share/thumbnailers/f3d-plugin-alembic.thumbnailer %%ASSIMP%%share/thumbnailers/f3d-plugin-assimp.thumbnailer %%DRACO%%share/thumbnailers/f3d-plugin-draco.thumbnailer %%EXODUS%%share/thumbnailers/f3d-plugin-exodus.thumbnailer share/thumbnailers/f3d-plugin-native.thumbnailer %%OCCT%%share/thumbnailers/f3d-plugin-occt.thumbnailer share/zsh/site-functions/_f3d diff --git a/graphics/py-f3d/Makefile b/graphics/py-f3d/Makefile index 1869425210a3..22af77e74471 100644 --- a/graphics/py-f3d/Makefile +++ b/graphics/py-f3d/Makefile @@ -1,30 +1,30 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 3.0.0 +DISTVERSION= 3.1.0 CATEGORIES= graphics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and minimalist 3D viewer WWW= https://f3d.app/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE.md BUILD_DEPENDS= pybind11>0:devel/pybind11 LIB_DEPENDS= libf3d.so:graphics/f3d USES= cmake:testing compiler:c++17-lang localbase:ldflags python USE_GITHUB= yes GH_ACCOUNT= f3d-app WRKSRC_SUBDIR= python CMAKE_ARGS= -DFREEBSD_PYTHON_VER=${PYTHON_VER} \ -DCMAKE_INSTALL_LIBDIR=lib #CMAKE_OFF= F3D_MULTI_CONFIG_GENERATOR # for https://github.com/f3d-app/f3d/issues/1149 but didn't help CXXFLAGS+= -I${LOCALBASE}/include/f3d .include diff --git a/graphics/py-f3d/distinfo b/graphics/py-f3d/distinfo index 7e7b0c99d510..2fa9f5ca6487 100644 --- a/graphics/py-f3d/distinfo +++ b/graphics/py-f3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737445695 -SHA256 (f3d-app-f3d-v3.0.0_GH0.tar.gz) = 7ea83830d1c8158a1f01e5ac9edd00b81de3e0b4cbdbc4a4bb60a113728b7b7a -SIZE (f3d-app-f3d-v3.0.0_GH0.tar.gz) = 59780102 +TIMESTAMP = 1748895401 +SHA256 (f3d-app-f3d-v3.1.0_GH0.tar.gz) = 93ba23078133122e929d9c1e2946c86da1f08fe56b9ffae40ebfd8185e91380a +SIZE (f3d-app-f3d-v3.1.0_GH0.tar.gz) = 61473994 diff --git a/graphics/py-f3d/files/patch-CMakeLists.txt b/graphics/py-f3d/files/patch-CMakeLists.txt index c1cd98364aa5..07462e7387eb 100644 --- a/graphics/py-f3d/files/patch-CMakeLists.txt +++ b/graphics/py-f3d/files/patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2025-01-18 16:41:08 UTC +--- CMakeLists.txt.orig 2025-04-16 06:15:03 UTC +++ CMakeLists.txt @@ -13,7 +13,7 @@ include(f3dPython) include(GNUInstallDirs) include(f3dPython) -find_package(Python 3.9 COMPONENTS Interpreter Development) +find_package(Python ${FREEBSD_PYTHON_VER} COMPONENTS Interpreter Development) - find_package(pybind11 2.2 REQUIRED) + find_package(pybind11 2.9.2 REQUIRED) pybind11_add_module(pyf3d MODULE F3DPythonBindings.cxx)