diff --git a/misc/ezc3d/Makefile b/misc/ezc3d/Makefile index ede748774176..6695c8134d69 100644 --- a/misc/ezc3d/Makefile +++ b/misc/ezc3d/Makefile @@ -1,28 +1,29 @@ PORTNAME= ezc3d DISTVERSIONPREFIX= Release_ -DISTVERSION= 1.5.19 +DISTVERSION= 1.6.3 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= C3D (biomechanics data format) reader/writer for C++ WWW= https://github.com/pyomeca/ezc3d LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++11-lang python:test USE_GITHUB= yes GH_ACCOUNT= pyomeca -GH_TUPLE= google:googletest:3880b13:googletest/external/gtest # https://github.com/pyomeca/ezc3d/issues/256 +GH_TUPLE= google:googletest:c9461a9:googletest/external/gtest # https://github.com/pyomeca/ezc3d/issues/256 CMAKE_TESTING_ON= BUILD_TESTS CMAKE_TESTING_TARGET= gtest post-test: @cd ${TEST_WRKSRC}/test && ./ezc3d_test -# tests as of 1.5.19: [ PASSED ] 54 tests. +# tests as of 1.6.3: [ PASSED ] 56 tests. + .include diff --git a/misc/ezc3d/distinfo b/misc/ezc3d/distinfo index 47ca9088d8f9..e1b4d4fbbee3 100644 --- a/misc/ezc3d/distinfo +++ b/misc/ezc3d/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1750226735 -SHA256 (pyomeca-ezc3d-Release_1.5.19_GH0.tar.gz) = e2d9ce20c13e0f2167378763b4c76447fce943f2f2ccbb2a9e985835283a622c -SIZE (pyomeca-ezc3d-Release_1.5.19_GH0.tar.gz) = 954560 -SHA256 (google-googletest-3880b13_GH0.tar.gz) = ea3d403a3de3ab084841ec97efa440fb45d5f2fbe4eb09a22ccb9643a6af11ba -SIZE (google-googletest-3880b13_GH0.tar.gz) = 962793 +TIMESTAMP = 1764447169 +SHA256 (pyomeca-ezc3d-Release_1.6.3_GH0.tar.gz) = 49f297b1046214771b5a4b2037621642c7bb8a454ca3976a7f5cacb222670af3 +SIZE (pyomeca-ezc3d-Release_1.6.3_GH0.tar.gz) = 943755 +SHA256 (google-googletest-c9461a9_GH0.tar.gz) = 565ec9eec2bdc9f3e4c35d02c0baafa87806b5a47136ff94d646d02027c660cc +SIZE (google-googletest-c9461a9_GH0.tar.gz) = 834933 diff --git a/misc/ezc3d/pkg-plist b/misc/ezc3d/pkg-plist index b44bbfea18f5..7ea770a697d8 100644 --- a/misc/ezc3d/pkg-plist +++ b/misc/ezc3d/pkg-plist @@ -1,35 +1,37 @@ include/ezc3d/Analogs.h include/ezc3d/AnalogsInfo.h include/ezc3d/AnalogsSubframe.h include/ezc3d/Channel.h include/ezc3d/Data.h include/ezc3d/DataStartInfo.h include/ezc3d/Frame.h include/ezc3d/Group.h include/ezc3d/Header.h +include/ezc3d/Options.h include/ezc3d/Parameter.h include/ezc3d/Parameters.h include/ezc3d/Point.h include/ezc3d/Points.h include/ezc3d/PointsInfo.h include/ezc3d/Rotation.h include/ezc3d/Rotations.h include/ezc3d/RotationsInfo.h include/ezc3d/RotationsSubframe.h +include/ezc3d/WriteOptions.h include/ezc3d/ezc3d.h include/ezc3d/ezc3dConfig.h include/ezc3d/ezc3dNamespace.h include/ezc3d/ezc3d_all.h include/ezc3d/math/Matrix.h include/ezc3d/math/Matrix33.h include/ezc3d/math/Matrix44.h include/ezc3d/math/Matrix66.h include/ezc3d/math/Vector3d.h include/ezc3d/math/Vector6d.h include/ezc3d/math/ezc3dMath.h include/ezc3d/modules/ForcePlatforms.h lib/cmake/ezc3d/ezc3dConfig.cmake lib/cmake/ezc3d/ezc3dConfigVersion.cmake lib/cmake/ezc3d/ezc3dTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ezc3d/ezc3dTargets.cmake lib/libezc3d.so diff --git a/misc/py-ezc3d/Makefile b/misc/py-ezc3d/Makefile index f726e1cd4b87..ff6283c658be 100644 --- a/misc/py-ezc3d/Makefile +++ b/misc/py-ezc3d/Makefile @@ -1,55 +1,56 @@ PORTNAME= ezc3d DISTVERSIONPREFIX= Release_ -DISTVERSION= 1.5.19 +DISTVERSION= 1.6.3 CATEGORIES= misc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= C3D (biomechanics data format) reader/writer WWW= https://github.com/pyomeca/ezc3d LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ cmake:devel/cmake-core \ swig:devel/swig RUN_DEPENDS= ${PYNUMPY} USES= python -USE_PYTHON= distutils autoplist pytest # autoplist is broken due to https://github.com/pyomeca/ezc3d/issues/258 ; 3 tests fail, see https://github.com/pyomeca/ezc3d/issues/291 +USE_PYTHON= pep517 autoplist pytest # autoplist is broken due to https://github.com/pyomeca/ezc3d/issues/258 ; 3 tests fail, see https://github.com/pyomeca/ezc3d/issues/291 USE_GITHUB= yes GH_ACCOUNT= pyomeca GH_TUPLE= google:googletest:3880b13:googletest/external/gtest # https://github.com/pyomeca/ezc3d/issues/256 TEST_ARGS= ${WRKSRC}/test/python3 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: # strip binaries @cd ${STAGEDIR}/${PYTHON_SITELIBDIR} && \ ${STRIP_CMD} \ ezc3d/_ezc3d.so \ ezc3d/libezc3d.so pre-test: # download test c3d files # download archives @${MKDIR} ${WRKSRC}/test/c3dFiles @cd ${WRKDIR} && ${FETCH_CMD} -q https://github.com/pyomeca/ezc3d-testFiles/archive/master.zip -o ${WRKSRC}/test/c3dFiles/ezc3d-testFiles-master.zip .for f in Sample01.zip Sample02.zip @cd ${WRKDIR} && ${FETCH_CMD} -q https://www.c3d.org/data/${f} -o ${WRKSRC}/test/c3dFiles/${f} .endfor # extract archives .for n in ezc3d-testFiles-master Sample01 Sample02 @cd ${WRKSRC}/test/c3dFiles && ${MKDIR} ${n} && cd ${n} && ${TAR} -xf ../${n}.zip .endfor # move *.c3d files into a flat folder @${MKDIR} ${WRKSRC}/test/c3dTestFiles @${CP} `${FIND} ${WRKSRC} -name "*.c3d"` ${WRKSRC}/test/c3dTestFiles # tests as of : 2 failed, 25 passed, 1 error in 4.17s, see https://github.com/pyomeca/ezc3d/issues/368 .include diff --git a/misc/py-ezc3d/distinfo b/misc/py-ezc3d/distinfo index 1d7ff6d3d592..4d2bd441934f 100644 --- a/misc/py-ezc3d/distinfo +++ b/misc/py-ezc3d/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1750226884 -SHA256 (pyomeca-ezc3d-Release_1.5.19_GH0.tar.gz) = e2d9ce20c13e0f2167378763b4c76447fce943f2f2ccbb2a9e985835283a622c -SIZE (pyomeca-ezc3d-Release_1.5.19_GH0.tar.gz) = 954560 +TIMESTAMP = 1764447621 +SHA256 (pyomeca-ezc3d-Release_1.6.3_GH0.tar.gz) = 49f297b1046214771b5a4b2037621642c7bb8a454ca3976a7f5cacb222670af3 +SIZE (pyomeca-ezc3d-Release_1.6.3_GH0.tar.gz) = 943755 SHA256 (google-googletest-3880b13_GH0.tar.gz) = ea3d403a3de3ab084841ec97efa440fb45d5f2fbe4eb09a22ccb9643a6af11ba SIZE (google-googletest-3880b13_GH0.tar.gz) = 962793 diff --git a/misc/py-ezc3d/files/patch-pyproject.toml b/misc/py-ezc3d/files/patch-pyproject.toml new file mode 100644 index 000000000000..f9ae9fdf9b0e --- /dev/null +++ b/misc/py-ezc3d/files/patch-pyproject.toml @@ -0,0 +1,34 @@ +--- pyproject.toml.orig 2025-11-29 13:01:05.743721000 -0800 ++++ pyproject.toml 2025-11-29 13:01:10.079226000 -0800 +@@ -1,30 +1,11 @@ + [build-system] + requires = [ +- "setuptools>=61.0", ++ "setuptools", + "wheel", + "scikit-build", +- "cmake", +- "ninja", +- "swig", + "numpy", + ] + build-backend = "setuptools.build_meta" + +-[project] +-name = "ezc3d" +-dynamic = ["version"] +-dependencies = [ +- "numpy", +-] +-description = "Easy to use C3D reader/writer for C++, Python, and Matlab" +-readme = "README.md" # This links to your README file +-authors = [ +- {name = "Michaud, Benjamin"}, +- {name = "Begon, Mickaël"} +-] +-license-files = ["LICENSE"] +-urls = { "Homepage" = "https://github.com/pyomeca/ezc3d" } +-requires-python = ">=3.10" +- + [tool.cibuildwheel] + build-frontend = "build"