diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index e0811ac8dfc6..981ed2bb3181 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,83 +1,80 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 +DISTVERSION= 2.2.1 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 9de4c11b62b16519a46f2634eea3385b7c799729.patch:-p1 # FreeBSD compatibility patch, https://github.com/f3d-app/f3d/pull/893 - MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and minimalist 3D viewer WWW= https://f3d-app.github.io/f3d/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg4 \ libfontconfig.so:x11-fonts/fontconfig \ libfreeimage.so:graphics/freeimage \ libfreetype.so:print/freetype2 \ libhdf5.so:science/hdf5 \ libImath-3_1.so:math/Imath \ libnetcdf.so:science/netcdf \ libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake:testing compiler:c++17-lang desktop-file-utils gl shared-mime-info tcl tk xorg USE_GL= gl glu USE_XORG= ice sm x11 xt USE_GITHUB= yes GH_ACCOUNT= f3d-app CMAKE_OFF= F3D_STRICT_BUILD # disable -Werror CMAKE_OFF+= F3D_LINUX_APPLICATION_LINK_FILESYSTEM # 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 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 \ libdraco.so:archivers/draco 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 9e2896e17a0f..c29c4501f9a2 100644 --- a/graphics/f3d/distinfo +++ b/graphics/f3d/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1688349349 -SHA256 (f3d-app-f3d-v2.1.0_GH0.tar.gz) = 3e5e6c2c16da4d7ccce8b6e316ab8007592a2bc0fc11a513f1ebac8c7f0f95d2 -SIZE (f3d-app-f3d-v2.1.0_GH0.tar.gz) = 27422890 -SHA256 (9de4c11b62b16519a46f2634eea3385b7c799729.patch) = a0031213a9f79efbb44a4e47eda7f417bc463ef607ad39b47700a0ca2c62cf1c -SIZE (9de4c11b62b16519a46f2634eea3385b7c799729.patch) = 709 +TIMESTAMP = 1704769349 +SHA256 (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 4d3a73b0107c8db7f0556107c74087d3748232a73981f65f7c5186ac1003ec8d +SIZE (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 29785716 diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist index 02d5e8ec6173..fed49a57c97b 100644 --- a/graphics/f3d/pkg-plist +++ b/graphics/f3d/pkg-plist @@ -1,84 +1,84 @@ bin/f3d %%ALEMBIC%%%%ETCDIR%%/config.d/10_alembic.json %%ASSIMP%%%%ETCDIR%%/config.d/10_assimp.json %%DRACO%%%%ETCDIR%%/config.d/10_draco.json %%EXODUS%%%%ETCDIR%%/config.d/10_exodus.json %%ETCDIR%%/config.d/10_global.json %%ETCDIR%%/config.d/10_native.json %%ALEMBIC%%%%ETCDIR%%/thumbnail.d/10_alembic.json %%ASSIMP%%%%ETCDIR%%/thumbnail.d/10_assimp.json %%DRACO%%%%ETCDIR%%/thumbnail.d/10_draco.json %%EXODUS%%%%ETCDIR%%/thumbnail.d/10_exodus.json %%OCCT%%%%ETCDIR%%/config.d/10_occt.json %%ETCDIR%%/thumbnail.d/10_global.json %%ETCDIR%%/thumbnail.d/10_native.json %%OCCT%%%%ETCDIR%%/thumbnail.d/10_occt.json include/f3d/camera.h include/f3d/engine.h include/f3d/exception.h include/f3d/export.h include/f3d/image.h include/f3d/interactor.h include/f3d/loader.h include/f3d/log.h include/f3d/options.h include/f3d/plugin.h include/f3d/reader.h include/f3d/types.h include/f3d/utils.h include/f3d/window.h lib/cmake/f3d/f3dConfig.cmake lib/cmake/f3d/f3dConfigVersion.cmake lib/cmake/f3d/f3dEmbed.cmake lib/cmake/f3d/f3dPlugin.cmake lib/cmake/f3d/f3dTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/f3d/f3dTargets.cmake lib/cmake/f3d/plugin.cxx.in lib/cmake/f3d/plugin.desktop.in lib/cmake/f3d/plugin.thumbnailer.in lib/cmake/f3d/readerBoilerPlate.h.in %%ALEMBIC%%lib/libVTKExtensionsAlembicReader.a lib/libVTKExtensionsApplicative.a %%ASSIMP%%lib/libVTKExtensionsAssimpReader.a lib/libVTKExtensionsCore.a %%DRACO%%lib/libVTKExtensionsDracoReader.a %%OCCT%%lib/libVTKExtensionsOCCTReader.a lib/libVTKExtensionsReaders.a lib/libVTKExtensionsRendering.a lib/libf3d.so lib/libf3d.so.2 -lib/libf3d.so.2.1 +lib/libf3d.so.2.2 %%ALEMBIC%%share/applications/f3d-plugin-alembic.desktop %%ASSIMP%%share/applications/f3d-plugin-assimp.desktop %%DRACO%%share/applications/f3d-plugin-draco.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 %%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/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 %%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 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 f0ce0fd542b6..f3b9768b1c81 100644 --- a/graphics/py-f3d/Makefile +++ b/graphics/py-f3d/Makefile @@ -1,29 +1,30 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 +DISTVERSION= 2.2.1 CATEGORIES= graphics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and minimalist 3D viewer WWW= https://f3d-app.github.io/f3d/ 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 d5ec3036e7c5..174b9aef2db8 100644 --- a/graphics/py-f3d/distinfo +++ b/graphics/py-f3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688334492 -SHA256 (f3d-app-f3d-v2.1.0_GH0.tar.gz) = 3e5e6c2c16da4d7ccce8b6e316ab8007592a2bc0fc11a513f1ebac8c7f0f95d2 -SIZE (f3d-app-f3d-v2.1.0_GH0.tar.gz) = 27422890 +TIMESTAMP = 1704772200 +SHA256 (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 4d3a73b0107c8db7f0556107c74087d3748232a73981f65f7c5186ac1003ec8d +SIZE (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 29785716 diff --git a/graphics/py-f3d/files/patch-CMakeLists.txt b/graphics/py-f3d/files/patch-CMakeLists.txt index d33b8156f532..68c0fa0f90d4 100644 --- a/graphics/py-f3d/files/patch-CMakeLists.txt +++ b/graphics/py-f3d/files/patch-CMakeLists.txt @@ -1,22 +1,20 @@ ---- CMakeLists.txt.orig 2023-04-20 16:01:48 UTC +--- CMakeLists.txt.orig 2023-10-04 06:49:20 UTC +++ CMakeLists.txt -@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) - - project(pyf3d) +@@ -5,7 +5,7 @@ include(f3dPython) + list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}/cmake") + include(f3dPython) -find_package(Python 3.6 COMPONENTS Interpreter Development) +find_package(Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Interpreter Development) find_package(pybind11 2.2 REQUIRED) pybind11_add_module(pyf3d MODULE F3DPythonBindings.cxx) -@@ -33,6 +33,10 @@ endif() - if (APPLE OR UNIX) - set_target_properties(pyf3d PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - endif () -+ -+set(PYTHON_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages") -+install(TARGETS pyf3d -+ LIBRARY DESTINATION ${PYTHON_INSTALL_PATH} COMPONENT pythonmodule) +@@ -21,7 +21,7 @@ set(f3d_python_package_suffix "python${Python_VERSION_ + + set(f3d_python_package_name "f3d") + set(f3d_python_package_suffix "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages") +-set(f3d_module_dir "${CMAKE_BINARY_DIR}$<${F3D_MULTI_CONFIG_GENERATOR}:/$>/${f3d_python_package_name}") ++set(f3d_module_dir "${CMAKE_BINARY_DIR}/${f3d_python_package_name}") # workaround for https://github.com/f3d-app/f3d/issues/1149 - # testing - if(BUILD_TESTING) + set_target_properties(pyf3d PROPERTIES + CXX_STANDARD 14 diff --git a/graphics/py-f3d/pkg-plist b/graphics/py-f3d/pkg-plist index e570bcd7d382..6e4ce89a1650 100644 --- a/graphics/py-f3d/pkg-plist +++ b/graphics/py-f3d/pkg-plist @@ -1 +1,2 @@ -%%PYTHON_SITELIBDIR%%/f3d%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/f3d/__init__.py +%%PYTHON_SITELIBDIR%%/f3d/pyf3d%%PYTHON_EXT_SUFFIX%%.so