From nobody Tue Jan 21 09:21:43 2025 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 4YchY40L59z5kp9J; Tue, 21 Jan 2025 09:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YchY327kgz3Lxc; Tue, 21 Jan 2025 09:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737451303; 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=I8DgNcY4xTehS/HbnZhRNiSf7qq1TZ3bSFfA9XIbqiI=; b=LAw4AwZVqU1iPyJORJd9y7KktsWS2RjJ4X6rT81jUFWHrJJWua7TgPs9hoVl3lQUoRM68v 78sep+8EiHZqVuRixpYU5MKfkkGgFU07g0p6N4ElXIfNmrD5tHHlW/om3Ycms483g+gsxE kp4r8fclgZ5f5V72zWTuSL4dfdU44Ioh6By4LQIiuq220DbGIj9WJAUyFk81k9kDqy9uFI XciiFQZHtvP7LWY8JuTo4mOBt+BLM46q2TCN64+9JSreSVJiIWQhYj2D+kj8IWuWnnHKFP nGbzVVAKDMunVF/G3bBSQgU4LNrNFnsCiOsfRcytcK0vQeT+itxld3VAwmxDyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737451303; 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=I8DgNcY4xTehS/HbnZhRNiSf7qq1TZ3bSFfA9XIbqiI=; b=UUlENIu/Js9EAn/uf9rHWa6LRiSY8mXTEb5kLEjLMydOpzbDZHSimEJC9wVO2R5lQ1JyhW O2ooNAJUwOuXc7/TnBbPHfTDkgnMzyr8mIaqdBvqUcYzqGPbYIGoYtw2H3dK5fDHTuzUXL Z5XwXHKn90zUiaSM//4WfYWzY//3A044QBRcYxD4OwAJXwHu41hdT3YlqXaV7byACPYxn2 euvQonOswQDQge9XUY9UC7PMS05KcUNxq3IKM/+qn/sVP7KatnpXQfThmoy9CKiQ4DNaHf zk7/Q470UFPHBYyCz/IeAs0lsBQGsSpu0d50t8r9LPxt6Ytm+64x6OXoZbsVWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737451303; a=rsa-sha256; cv=none; b=qbd9QMgx2SJZ/Sr0Y1OCAaS9dlo5JMEg6uroFo9XckJLwC877IyxajKNBJafNxfOe7rceN Iq0VhNaknhMwKtmimPqG1gLA4ppfCjJPSbooQwoAakfNQWR6kUMdgbDmAV1wI9QEOAMZQV oML5lYTtMpVLZHwfZtUdN4vvgTzmR4OF7R29RZ5262AGY/DQxYgbdgOkJr+rVGoXZ0DEWn 2OnibWjh14PDhOzOQphOgkx6stMos6eRYxDg68cYfqvl76axvmtAf5zBuUiQymTB8TTAj4 Rgnl69EE6nnemWErwRCIKXUPAP9SECpQ/BtSsBpXlphG8NSMTihtXeoQMVPoyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YchY31k0Pz11Lp; Tue, 21 Jan 2025 09:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50L9LhIY019839; Tue, 21 Jan 2025 09:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50L9Lh0l019836; Tue, 21 Jan 2025 09:21:43 GMT (envelope-from git) Date: Tue, 21 Jan 2025 09:21:43 GMT Message-Id: <202501210921.50L9Lh0l019836@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: 15789faf5941 - main - =?utf-8?Q?graphics/{,py-}f3d: update 2.5.1 =E2=86=92 3.0.0?= 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 15789faf59416e80ec208c5db21ff027cd663e70 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=15789faf59416e80ec208c5db21ff027cd663e70 commit 15789faf59416e80ec208c5db21ff027cd663e70 Author: Yuri Victorovich AuthorDate: 2025-01-21 08:10:13 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-21 09:21:21 +0000 graphics/{,py-}f3d: update 2.5.1 → 3.0.0 --- graphics/f3d/Makefile | 9 +++++-- graphics/f3d/distinfo | 8 +++--- graphics/f3d/pkg-plist | 41 +++++++++++++++++------------- graphics/py-f3d/Makefile | 2 +- graphics/py-f3d/distinfo | 6 ++--- graphics/py-f3d/files/patch-CMakeLists.txt | 8 +++--- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index 9e148432671a..82034d6dd95d 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,11 +1,15 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 2.5.1 +DISTVERSION= 3.0.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/ +WWW= https://f3d.app/ \ + https://github.com/f3d-app/f3d LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md @@ -29,6 +33,7 @@ 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 diff --git a/graphics/f3d/distinfo b/graphics/f3d/distinfo index 8e9b362155fc..507b1521ad30 100644 --- a/graphics/f3d/distinfo +++ b/graphics/f3d/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1733899939 -SHA256 (f3d-app-f3d-v2.5.1_GH0.tar.gz) = 55ea01931f90f066df1abc0ae4e9575672e80b83b241f51884224baa8dccac24 -SIZE (f3d-app-f3d-v2.5.1_GH0.tar.gz) = 45656138 +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 diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist index c24dd51474a1..0e39dc2b0bf6 100644 --- a/graphics/f3d/pkg-plist +++ b/graphics/f3d/pkg-plist @@ -1,32 +1,21 @@ 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/context.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/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 @@ -42,8 +31,8 @@ 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.2 -lib/libf3d.so.2.5 +lib/libf3d.so.3 +lib/libf3d.so.3.0 lib/libvtkext.so %%ALEMBIC%%lib/libvtkextAlembic.a %%ASSIMP%%lib/libvtkextAssimp.a @@ -62,6 +51,20 @@ 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 @@ -69,6 +72,10 @@ share/doc/F3D/THIRD_PARTY_LICENSES.md %%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 diff --git a/graphics/py-f3d/Makefile b/graphics/py-f3d/Makefile index 0b7c28da84b1..1869425210a3 100644 --- a/graphics/py-f3d/Makefile +++ b/graphics/py-f3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 2.5.1 +DISTVERSION= 3.0.0 CATEGORIES= graphics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-f3d/distinfo b/graphics/py-f3d/distinfo index 4419ed6aeba9..7e7b0c99d510 100644 --- a/graphics/py-f3d/distinfo +++ b/graphics/py-f3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733900218 -SHA256 (f3d-app-f3d-v2.5.1_GH0.tar.gz) = 55ea01931f90f066df1abc0ae4e9575672e80b83b241f51884224baa8dccac24 -SIZE (f3d-app-f3d-v2.5.1_GH0.tar.gz) = 45656138 +TIMESTAMP = 1737445695 +SHA256 (f3d-app-f3d-v3.0.0_GH0.tar.gz) = 7ea83830d1c8158a1f01e5ac9edd00b81de3e0b4cbdbc4a4bb60a113728b7b7a +SIZE (f3d-app-f3d-v3.0.0_GH0.tar.gz) = 59780102 diff --git a/graphics/py-f3d/files/patch-CMakeLists.txt b/graphics/py-f3d/files/patch-CMakeLists.txt index af6b519205ed..c1cd98364aa5 100644 --- a/graphics/py-f3d/files/patch-CMakeLists.txt +++ b/graphics/py-f3d/files/patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2024-03-29 06:17:35 UTC +--- CMakeLists.txt.orig 2025-01-18 16:41:08 UTC +++ CMakeLists.txt -@@ -6,7 +6,7 @@ include(f3dPython) +@@ -13,7 +13,7 @@ include(f3dPython) include(GNUInstallDirs) include(f3dPython) --find_package(Python 3.8 COMPONENTS Interpreter Development) -+find_package(Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Interpreter Development) +-find_package(Python 3.9 COMPONENTS Interpreter Development) ++find_package(Python ${FREEBSD_PYTHON_VER} COMPONENTS Interpreter Development) find_package(pybind11 2.2 REQUIRED) pybind11_add_module(pyf3d MODULE F3DPythonBindings.cxx)