Date: Tue, 9 Jan 2024 17:38:29 GMT
From: Yuri Victorovich <yuri@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 08d823076bed - main - graphics/{,py-}f3d: update 2.1.0 =?utf-8?Q?=E2=86=92?= 2.2.1
Message-ID: <202401091738.409HcTYK046683@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=08d823076bed51a9afaa80fcbd84a0e793ec07e1 commit 08d823076bed51a9afaa80fcbd84a0e793ec07e1 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-01-09 17:24:06 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-01-09 17:38:19 +0000 graphics/{,py-}f3d: update 2.1.0 → 2.2.1 Reported by: portscout --- graphics/f3d/Makefile | 5 +---- graphics/f3d/distinfo | 8 +++----- graphics/f3d/pkg-plist | 2 +- graphics/py-f3d/Makefile | 3 ++- graphics/py-f3d/distinfo | 6 +++--- graphics/py-f3d/files/patch-CMakeLists.txt | 26 ++++++++++++-------------- graphics/py-f3d/pkg-plist | 3 ++- 7 files changed, 24 insertions(+), 29 deletions(-) diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index e0811ac8dfc6..981ed2bb3181 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,11 +1,8 @@ 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/ 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 @@ -47,7 +47,7 @@ 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 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,6 +1,6 @@ PORTNAME= f3d DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 +DISTVERSION= 2.2.1 CATEGORIES= graphics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,6 +23,7 @@ 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 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}:/$<CONFIG>>/${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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401091738.409HcTYK046683>