From nobody Fri Sep 09 05:17:44 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MP44m6G9Cz4bkl1; Fri, 9 Sep 2022 05:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MP44m5ZHJz4Kg4; Fri, 9 Sep 2022 05:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662700664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60eMebRV423nQvHqBcgPq6PWPQ2WyFVi3wJM78C88zE=; b=atFsaPoBmMkn7LMYW7AzBDG9y8cQtDMaJR2z4wTY3R7/mU3IOCbUfp7vEDJAl5kiOwYiqK ca9aNvV611FT+OITy3IISXA2Vh+UxK7PvsMJiJXcw6sWdXmbD9Myg7QCgBzMFD7IkU/Mns m39gxJeaEl2872geOyi1HYk9wVc3P1jftS/tS5BGDHxkVnZRV+xV6d+v0UBmA2dgySb8X2 +EUtWEiJ368jATlMEUtXg/KK/iTwCVwzfCiF8RWKZRcCdgWmZxCZ2GPDlyWvT8VSwACOWn /OAnmUx6Pu4wnS8EP4CZyhpXRLM1HFawozQ2Znc7WX+Wl5KhdHI28O5VoZCDqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MP44m4dVFz16GG; Fri, 9 Sep 2022 05:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2895HifF044177; Fri, 9 Sep 2022 05:17:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2895HiUB044176; Fri, 9 Sep 2022 05:17:44 GMT (envelope-from git) Date: Fri, 9 Sep 2022 05:17:44 GMT Message-Id: <202209090517.2895HiUB044176@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 29210b73e946 - main - graphics/f3d: Update 1.2.1 -> 1.3.1; Add options for modules; Add tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29210b73e94643c774af1d43b30d92cac3096b14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662700664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60eMebRV423nQvHqBcgPq6PWPQ2WyFVi3wJM78C88zE=; b=f7x8p8S/ubYcACjk6B+qJVXlAw+gosCJs+WhgqR6hgVJORv5kAEyWj2vn+Pl6LlSgmKXRw JQhIxU1OrEYN+nmtQkp5FLGn8F79lC5jbKKSCNNIbypmh31lwLkonBhrD8Z9pAXuiXG4eC BWqc2nubBhL/b83B7hQ9X9cKUroLC0dtYhDs/ir8CGZy4Wq5lNpXL5kzZDHyfGI/UwRb3a zcXaTqFUrwR4v6O1ApCG9wKYkvckgy3BTe3Erw9rF24Op7IvQwjUjbZmvTzCcJW6YPl9Hf U2gQxLMQ1EK24iD8Hk24Hr1amrm5f5JPXtkUGLlvZL0RZhv/CXDEbOPZV9yMcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662700664; a=rsa-sha256; cv=none; b=RKFEvicSfeu+0AeFjGx7BasYmSo+SbRsPMM/HBJNDC/pP4D8xjYygnoukJtEL5o//S1eIr eYPDoxxqAM9jOAHJHqZoj5rPiz7RV5K1FWaI66l7pQyBe5BATbXxsoshyLrl5K4XBBNp42 0w9mOiIPNZTeczwxJQL3jR47kIhzgneOHK9sqIz+Kn66YplK6Yc4MSZdq8UTg/Zy/Mfi1b N4JYidghUVWLSoiS3WW+XCGyPiaeUg5BwxUT3OqPqcc2idKW3MwAKM3edzeNr7v4eAVMSr SEabGyPqObkuzcH4Rpsbq4qcB/9OnhApFK2hsVHbea8y6I5SpB+716UOfKWrhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=29210b73e94643c774af1d43b30d92cac3096b14 commit 29210b73e94643c774af1d43b30d92cac3096b14 Author: Yuri Victorovich AuthorDate: 2022-09-09 04:33:49 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-09 05:17:42 +0000 graphics/f3d: Update 1.2.1 -> 1.3.1; Add options for modules; Add tests --- graphics/f3d/Makefile | 48 +++++++++++++++------- graphics/f3d/distinfo | 6 +-- .../f3d/files/patch-application_CMakeLists.txt | 11 +++++ .../f3d/files/patch-library_testing_CMakeLists.txt | 11 +++++ graphics/f3d/pkg-plist | 31 ++++++++++++++ 5 files changed, 89 insertions(+), 18 deletions(-) diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index bef28933c198..4d27cf697548 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,7 +1,6 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 1.2.1 -PORTREVISION= 2 +DISTVERSION= 1.3.1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -16,26 +15,45 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libnetcdf.so:science/netcdf \ libvtkCommonMisc-9.1.so:math/vtk9 -USES= cmake compiler:c++11-lang desktop-file-utils gl tar:bzip2 xorg +USES= cmake:testing compiler:c++17-lang desktop-file-utils gl xorg USE_GL= gl glu USE_XORG= ice sm x11 xt USE_GITHUB= yes GH_ACCOUNT= f3d-app -PLIST_FILES= bin/f3d \ - lib/libf3d.so \ - share/applications/f3d.desktop \ - share/bash-completion/completions/f3d \ - 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/io.github.f3d_app.f3d.metainfo.xml \ - share/zsh/site-functions/_f3d +OPTIONS_GROUP= MODULES +OPTIONS_GROUP_MODULES= ALEMBIC ASSIMP EXODUS EXTERNAL_RENDERING OCCT RAYTRACING +OPTIONS_DEFAULT= ALEMBIC ASSIMP EXODUS + +MODULES_DESC= Build modules: + +ALEMBIC_DESC= Alembic module (ABC files) +ALEMBIC_CMAKE_BOOL= F3D_MODULE_ALEMBIC +ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic + +ASSIMP_DESC= Assimp module (FBX, OFF, DAE and DXF files) +ASSIMP_CMAKE_BOOL= F3D_MODULE_ASSIMP +ASSIMP_LIB_DEPENDS= libassimp.so:multimedia/assimp + +EXODUS_DESC= ExodusII module +EXODUS_CMAKE_BOOL= F3D_MODULE_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 module (STEP and IGES files) +OCCT_CMAKE_BOOL= F3D_MODULE_OCCT +OCCT_LIB_DEPENDS= libTKBRep.so:cad/opencascade +OCCT_CMAKE_ON= -DOpenCASCADE_DIR=${LOCALBASE}/lib/cmake +OCCT_BROKEN= configure fails, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266280 + +RAYTRACING_DESC= Raytracing module +RAYTRACING_CMAKE_BOOL= F3D_MODULE_RAYTRACING +RAYTRACING_BROKEN= Requires VTK::RenderingRayTracing enabled in VTK post-install: - @cd ${STAGEDIR}${PREFIX} && ${RM} LICENSE README.md + @${RM} -r ${STAGEDIR}${DOCSDIR} .include diff --git a/graphics/f3d/distinfo b/graphics/f3d/distinfo index f2c0075d042f..07fcead13c5e 100644 --- a/graphics/f3d/distinfo +++ b/graphics/f3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639618089 -SHA256 (f3d-app-f3d-v1.2.1_GH0.tar.gz) = 0d72cc465af1adefdf71695481ceea95d4a94ee9e00125bc98c9f32b14ac2bf4 -SIZE (f3d-app-f3d-v1.2.1_GH0.tar.gz) = 34590696 +TIMESTAMP = 1662604096 +SHA256 (f3d-app-f3d-v1.3.1_GH0.tar.gz) = 653dc4044e14d0618c1d947a8ee85d2513e100b3fc24bd6e51830131a13e795d +SIZE (f3d-app-f3d-v1.3.1_GH0.tar.gz) = 35586414 diff --git a/graphics/f3d/files/patch-application_CMakeLists.txt b/graphics/f3d/files/patch-application_CMakeLists.txt new file mode 100644 index 000000000000..f219486bd740 --- /dev/null +++ b/graphics/f3d/files/patch-application_CMakeLists.txt @@ -0,0 +1,11 @@ +--- application/CMakeLists.txt.orig 2022-09-07 16:38:14 UTC ++++ application/CMakeLists.txt +@@ -29,7 +29,7 @@ endif() + add_executable(f3d ${F3D_SOURCE_FILES}) + target_link_libraries(f3d PUBLIC libf3d) + +-if (UNIX AND NOT APPLE) ++if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + target_link_libraries(f3d PRIVATE stdc++fs) + endif () + diff --git a/graphics/f3d/files/patch-library_testing_CMakeLists.txt b/graphics/f3d/files/patch-library_testing_CMakeLists.txt new file mode 100644 index 000000000000..828882a5d08a --- /dev/null +++ b/graphics/f3d/files/patch-library_testing_CMakeLists.txt @@ -0,0 +1,11 @@ +--- library/testing/CMakeLists.txt.orig 2022-09-07 16:39:43 UTC ++++ library/testing/CMakeLists.txt +@@ -112,7 +112,7 @@ if(Qt5_FOUND) + target_link_libraries(libf3dSDKTests Qt5::OpenGL) + endif() + +-if (UNIX AND NOT APPLE) ++if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + target_link_libraries(libf3dSDKTests stdc++fs) + endif () + diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist new file mode 100644 index 000000000000..a6718b1a0e68 --- /dev/null +++ b/graphics/f3d/pkg-plist @@ -0,0 +1,31 @@ +bin/f3d +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/types.h +include/f3d/window.h +lib/cmake/f3d/f3dConfig.cmake +lib/cmake/f3d/f3dConfigVersion.cmake +lib/cmake/f3d/f3dEmbed.cmake +lib/cmake/f3d/f3dTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/f3d/f3dTargets.cmake +lib/libVTKExtensionsApplicative.a +lib/libVTKExtensionsCore.a +lib/libVTKExtensionsReaders.a +lib/libVTKExtensionsRendering.a +lib/libf3d.so +share/applications/f3d.desktop +share/bash-completion/completions/f3d +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/io.github.f3d_app.f3d.metainfo.xml +share/zsh/site-functions/_f3d