diff --git a/math/Imath/Makefile b/math/Imath/Makefile index 4bce7a75402f..0012f39a2294 100644 --- a/math/Imath/Makefile +++ b/math/Imath/Makefile @@ -1,58 +1,58 @@ # Based on the graphics/ilmbase port that was done by: nork@FreeBSD.org PORTNAME= Imath -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.1 CATEGORIES= math devel graphics MAINTAINER= mandree@FreeBSD.org COMMENT= C++/Python lib of 2D/3D vector, matrix, math ops for computer graphics LICENSE= BSD3CLAUSE USES= cmake compiler:c++14-lang pkgconfig USE_GITHUB= yes GH_TUPLE= AcademySoftwareFoundation:Imath:v${PORTVERSION} USE_LDCONFIG= yes CMAKE_ARGS+= -DCMAKE_DEBUG_POSTFIX= \ -DCMAKE_INSTALL_PREFIX=${PREFIX} PATCH_STRIP= -p1 PLIST_SUB= MAJORVER=${_MAJORVER} \ MINVER=${_MINVER} \ PLVER=${_PLVER} \ VER=${_VER} \ PYVER=${PYTHON_VER:S/./_/} PORTDOCS= README.md OPTIONS_DEFINE= DOCS LARGE_STACK PYTHON OPTIONS_SUB= yes LARGE_STACK_DESC= Enable sys-dependent large stack optimizations LARGE_STACK_CMAKE_BOOL= IMATH_ENABLE_LARGE_STACK PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_USES= python PYTHON_CMAKE_BOOL= PYTHON _MAJORVER= 3_1 _VER= 29 -_MINVER= 0 +_MINVER= 1 _PLVER= 0 post-install: .for l in libImath ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${_MAJORVER}.so .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-test: cd ${BUILD_WRKSRC} && ctest -j ${MAKE_JOBS_NUMBER} .include diff --git a/math/Imath/distinfo b/math/Imath/distinfo index c6e81765f58d..4250b0d63223 100644 --- a/math/Imath/distinfo +++ b/math/Imath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626453375 -SHA256 (AcademySoftwareFoundation-Imath-3.1.0-v3.1.0_GH0.tar.gz) = 211c907ab26d10bd01e446da42f073ee7381e1913d8fa48084444bc4e1b4ef87 -SIZE (AcademySoftwareFoundation-Imath-3.1.0-v3.1.0_GH0.tar.gz) = 566048 +TIMESTAMP = 1626943451 +SHA256 (AcademySoftwareFoundation-Imath-3.1.1-v3.1.1_GH0.tar.gz) = a63fe91d8d0917acdc31b0c9344b1d7dbc74bf42de3e3ef5ec982386324b9ea4 +SIZE (AcademySoftwareFoundation-Imath-3.1.1-v3.1.1_GH0.tar.gz) = 568231 diff --git a/math/Imath/files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff b/math/Imath/files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff deleted file mode 100644 index e7732e008c32..000000000000 --- a/math/Imath/files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Imath/half.h b/src/Imath/half.h -index 6b0c7dc..c4a1b03 100644 ---- a/src/Imath/half.h -+++ b/src/Imath/half.h -@@ -177,7 +177,7 @@ - /// floats in question. - /// - --#if defined(__has_include) -+#if defined(__has_include) && defined(__x86_64__) - # if __has_include() - # include - # elif __has_include() diff --git a/math/Imath/pkg-plist b/math/Imath/pkg-plist index 44b2dd139b1f..1d659bd820a1 100644 --- a/math/Imath/pkg-plist +++ b/math/Imath/pkg-plist @@ -1,94 +1,94 @@ include/Imath/ImathBox.h include/Imath/ImathBoxAlgo.h include/Imath/ImathColor.h include/Imath/ImathColorAlgo.h include/Imath/ImathConfig.h include/Imath/ImathEuler.h include/Imath/ImathExport.h include/Imath/ImathForward.h include/Imath/ImathFrame.h include/Imath/ImathFrustum.h include/Imath/ImathFrustumTest.h include/Imath/ImathFun.h include/Imath/ImathGL.h include/Imath/ImathGLU.h include/Imath/ImathInt64.h include/Imath/ImathInterval.h include/Imath/ImathLine.h include/Imath/ImathLineAlgo.h include/Imath/ImathMath.h include/Imath/ImathMatrix.h include/Imath/ImathMatrixAlgo.h include/Imath/ImathNamespace.h include/Imath/ImathPlane.h include/Imath/ImathPlatform.h include/Imath/ImathQuat.h include/Imath/ImathRandom.h include/Imath/ImathRoots.h include/Imath/ImathShear.h include/Imath/ImathSphere.h include/Imath/ImathTypeTraits.h include/Imath/ImathVec.h include/Imath/ImathVecAlgo.h include/Imath/half.h include/Imath/halfFunction.h include/Imath/halfLimits.h lib/cmake/Imath/ImathConfig.cmake lib/cmake/Imath/ImathConfigVersion.cmake lib/cmake/Imath/ImathTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Imath/ImathTargets.cmake lib/libImath-%%MAJORVER%%.so lib/libImath-%%MAJORVER%%.so.%%VER%% -lib/libImath-%%MAJORVER%%.so.%%VER%%.0.%%PLVER%% +lib/libImath-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%% lib/libImath.so libdata/pkgconfig/Imath.pc %%PYTHON%%include/Imath/PyImath.h %%PYTHON%%include/Imath/PyImathAPI.h %%PYTHON%%include/Imath/PyImathAutovectorize.h %%PYTHON%%include/Imath/PyImathBasicTypes.h %%PYTHON%%include/Imath/PyImathBox.h %%PYTHON%%include/Imath/PyImathBoxArrayImpl.h %%PYTHON%%include/Imath/PyImathBufferProtocol.h %%PYTHON%%include/Imath/PyImathColor.h %%PYTHON%%include/Imath/PyImathColor3ArrayImpl.h %%PYTHON%%include/Imath/PyImathColor4Array2DImpl.h %%PYTHON%%include/Imath/PyImathColor4ArrayImpl.h %%PYTHON%%include/Imath/PyImathDecorators.h %%PYTHON%%include/Imath/PyImathEuler.h %%PYTHON%%include/Imath/PyImathExport.h %%PYTHON%%include/Imath/PyImathFixedArray.h %%PYTHON%%include/Imath/PyImathFixedArray2D.h %%PYTHON%%include/Imath/PyImathFixedArrayTraits.h %%PYTHON%%include/Imath/PyImathFixedMatrix.h %%PYTHON%%include/Imath/PyImathFixedVArray.h %%PYTHON%%include/Imath/PyImathFrustum.h %%PYTHON%%include/Imath/PyImathFun.h %%PYTHON%%include/Imath/PyImathLine.h %%PYTHON%%include/Imath/PyImathM44Array.h %%PYTHON%%include/Imath/PyImathMathExc.h %%PYTHON%%include/Imath/PyImathMatrix.h %%PYTHON%%include/Imath/PyImathOperators.h %%PYTHON%%include/Imath/PyImathPlane.h %%PYTHON%%include/Imath/PyImathQuat.h %%PYTHON%%include/Imath/PyImathQuatOperators.h %%PYTHON%%include/Imath/PyImathRandom.h %%PYTHON%%include/Imath/PyImathShear.h %%PYTHON%%include/Imath/PyImathStringArray.h %%PYTHON%%include/Imath/PyImathStringArrayRegister.h %%PYTHON%%include/Imath/PyImathStringTable.h %%PYTHON%%include/Imath/PyImathTask.h %%PYTHON%%include/Imath/PyImathUtil.h %%PYTHON%%include/Imath/PyImathVec.h %%PYTHON%%include/Imath/PyImathVec2Impl.h %%PYTHON%%include/Imath/PyImathVec3ArrayImpl.h %%PYTHON%%include/Imath/PyImathVec3Impl.h %%PYTHON%%include/Imath/PyImathVec4ArrayImpl.h %%PYTHON%%include/Imath/PyImathVec4Impl.h %%PYTHON%%include/Imath/PyImathVecOperators.h %%PYTHON%%lib/cmake/Imath/ImathConfig-%%CMAKE_BUILD_TYPE%%.cmake %%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so %%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%% -%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%%.0.%%PLVER%% +%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/imath.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/imathnumpy.so %%PYTHON%%libdata/pkgconfig/PyImath.pc