diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index b577182f98dc..35573f569b57 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,123 +1,126 @@ PORTNAME?= openexr PORTVERSION?= 3.3.5 # ALSO update openexr-website-docs! -- verify sigstore: make makesum verify-sigstore PORTREVISION?= 0 CATEGORIES= graphics devel .if !defined(MASTERDIR) MASTER_SITES= https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images/v1.0/:testimages \ https://github.com/AcademySoftwareFoundation/openexr/releases/download/v${PORTVERSION}/:DEFAULT \ LOCAL/mandree/openexr/:DEFAULT \ LOCAL/mandree/openexr/:testimages DISTFILES= ${EXTRACT_ONLY}:DEFAULT DISTFILES+= Beachball/multipart.0001.exr:testimages DISTFILES+= Beachball/singlepart.0001.exr:testimages DISTFILES+= Chromaticities/Rec709_YC.exr:testimages DISTFILES+= Chromaticities/Rec709.exr:testimages DISTFILES+= Chromaticities/XYZ_YC.exr:testimages DISTFILES+= Chromaticities/XYZ.exr:testimages DISTFILES+= LuminanceChroma/Flowers.exr:testimages DISTFILES+= LuminanceChroma/Garden.exr:testimages DISTFILES+= MultiResolution/ColorCodedLevels.exr:testimages DISTFILES+= MultiResolution/WavyLinesCube.exr:testimages DISTFILES+= MultiResolution/WavyLinesLatLong.exr:testimages DISTFILES+= MultiView/Adjuster.exr:testimages DISTFILES+= TestImages/GammaChart.exr:testimages DISTFILES+= TestImages/GrayRampsHorizontal.exr:testimages DISTFILES+= v2/LeftView/Balls.exr:testimages DISTFILES+= v2/Stereo/Trunks.exr:testimages .endif DIST_SUBDIR= openexr # hardcode - not using ${PORTNAME} - so we can share the distdir with openexr-website-docs, avoiding double download of ... EXTRACT_ONLY= openexr-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= mandree@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format WWW= https://www.openexr.com/ LICENSE= BSD3CLAUSE BUILD_DEPENDS?= help2man:misc/help2man # exact libImath version required to avoid hard-to-debug issues -LIB_DEPENDS?= libImath-3_1.so.29:math/Imath \ +# but this is due to Imath and OpenEXR being close in terms of their +# release engineering, no other port should version pin Imath +# or OpenEXR without extremely good reason +LIB_DEPENDS?= libImath-3_2.so.30:math/Imath \ libdeflate.so:archivers/libdeflate USES?= cmake:testing compiler:c++14-lang cpe pathfix pkgconfig #USE_GITHUB= yes #GH_TUPLE= AcademySoftwareFoundation:openexr:v${PORTVERSION} USE_LDCONFIG= yes CMAKE_ARGS?= -DCMAKE_DEBUG_POSTFIX= CMAKE_OFF= BUILD_TESTING \ OPENEXR_TEST_LIBRARIES \ OPENEXR_TEST_PYTHON \ OPENEXR_TEST_TOOLS CMAKE_TESTING_ON= BUILD_TESTING \ OPENEXR_TEST_LIBRARIES \ OPENEXR_TEST_PYTHON \ OPENEXR_TEST_TOOLS CPPFLAGS+= -I. # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread _MAJORVER= 3_3 _VER= 32 _REL= ${PORTVERSION} PLIST_SUB+= MAJORVER=${_MAJORVER} \ VER=${_VER} \ REL=${_REL} PORTDOCS= * PORTEXAMPLES= * .if !defined(MASTERDIR) OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes DOCS_CMAKE_BOOL=OPENEXR_INSTALL_DOCS INSTALL_DOCS _DOCSRCDIR1= ${WRKSRC} _DOC_FILES1= CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \ CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md # too many reports about compilation failures, so # sanity check we are using the same C++ standard library _imath_libcxx= ${COMPILER_FEATURES:Mlib*c++} # This would be better placed in pre-test to avoid wasting space, # but if we do that, the cmake in src/test/bin will go downloading the files, # so we do not benefit from our checksumming and the distdir caching. post-extract: ${MKDIR} ${CONFIGURE_WRKSRC}/src/test/bin .for i in ${DISTFILES:M*.exr?testimages} d="$$(dirname "${CONFIGURE_WRKSRC}/src/test/bin/${i:S/:testimages//}")" \ && ${MKDIR} "$$d" \ && ${CP} ${DISTDIR}/${DIST_SUBDIR}/${i:S/:testimages//} "$$d" .endfor pre-configure: @${READELF} -d ${LOCALBASE}/lib/libImath.so \ | ${EGREP} -q '\.*\[${_imath_libcxx:C/\+/\\+/g}\.' \ || { ${ECHO_CMD} "*** Your Imath package uses a different C++ standard library than ***" ; \ ${ECHO_CMD} "*** OpenEXR would. Please recompile and reinstall Imath with the ***" ; \ ${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR. Abort. ***" ; \ exit 1; } post-install-EXAMPLES-on: ${MV} \ ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ ${STAGEDIR}${EXAMPLESDIR} @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || : post-install-EXAMPLES-off: ${RM} -R ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || : verify-sigstore: openexr-${PORTVERSION}.tar.gz.sigstore.json sigstore verify github --cert-identity https://github.com/AcademySoftwareFoundation/openexr/.github/workflows/release-sign.yml@refs/tags/v${PORTVERSION} ${DISTDIR}/${DIST_SUBDIR}/openexr-${PORTVERSION}.tar.gz --bundle openexr-${PORTVERSION}.tar.gz.sigstore.json openexr-${PORTVERSION}.tar.gz.sigstore.json: ${FETCH_CMD} https://github.com/AcademySoftwareFoundation/openexr/releases/download/v${PORTVERSION}/openexr-${PORTVERSION}.tar.gz.sigstore.json .endif .include diff --git a/math/Imath/Makefile b/math/Imath/Makefile index ff8253cf8049..fb08353744b0 100644 --- a/math/Imath/Makefile +++ b/math/Imath/Makefile @@ -1,67 +1,63 @@ # Based on the graphics/ilmbase port that was done by: nork@FreeBSD.org PORTNAME= Imath -PORTVERSION= 3.1.12 +PORTVERSION= 3.2.0 CATEGORIES= math devel graphics MASTER_SITES= https://github.com/AcademySoftwareFoundation/${PORTNAME}/releases/download/v${PORTVERSION}/ \ LOCAL/mandree/ # to verify: 'make makesum' and download .sigstore.json to working directory, then: # sigstore verify github --cert-identity \ -# https://github.com/AcademySoftwareFoundation/Imath/.github/workflows/release-sign.yml@refs/tags/v3.1.12 \ -# /usr/ports/distfiles/Imath-3.1.12.tar.gz --bundle Imath-3.1.12.tar.gz.sigstore.json +# https://github.com/AcademySoftwareFoundation/Imath/.github/workflows/release-sign.yml@refs/tags/v3.2.0 \ +# /usr/ports/distfiles/Imath-3.2.0.tar.gz --bundle Imath-3.2.0.tar.gz.sigstore.json MAINTAINER= mandree@FreeBSD.org COMMENT= C++/Python lib of 2D/3D vector, matrix, math ops for computer graphics WWW= https://github.com/AcademySoftwareFoundation/Imath/ LICENSE= BSD3CLAUSE USES= cmake compiler:c++14-lang pathfix pkgconfig 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= 11 -_PLVER= 0 - -post-patch: - ${REINPLACE_CMD} -E 's}find_package\(Python(3?) COMPONENTS}set(Python\1_EXECUTABLE ${PYTHON_CMD})\nfind_package(Python\1 ${PYTHON_VER} EXACT COMPONENTS}' \ - ${WRKSRC}/src/python/CMakeLists.txt +_MAJORVER= 3_2 +_VER= 30 +_MINVER= 3 +_PLVER= 2.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 5ffa111df77e..c88001677377 100644 --- a/math/Imath/distinfo +++ b/math/Imath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725995802 -SHA256 (Imath-3.1.12.tar.gz) = cb8ca9ca77ac4338ebbee911fc90c886011ac5b00088630bacf8ef6c6e522f0a -SIZE (Imath-3.1.12.tar.gz) = 593114 +TIMESTAMP = 1754684183 +SHA256 (Imath-3.2.0.tar.gz) = 176c80dbee6bb2f71998fd007b0de87c94e24b64259288c28ac302a2ee22a563 +SIZE (Imath-3.2.0.tar.gz) = 679219 diff --git a/math/Imath/pkg-plist b/math/Imath/pkg-plist index 04ff9e1bd567..1b982dbb694a 100644 --- a/math/Imath/pkg-plist +++ b/math/Imath/pkg-plist @@ -1,92 +1,95 @@ 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%%.%%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/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%%include/PyImath/PyImath.h +%%PYTHON%%include/PyImath/PyImathAPI.h +%%PYTHON%%include/PyImath/PyImathAutovectorize.h +%%PYTHON%%include/PyImath/PyImathBasicTypes.h +%%PYTHON%%include/PyImath/PyImathBox.h +%%PYTHON%%include/PyImath/PyImathBoxArrayImpl.h +%%PYTHON%%include/PyImath/PyImathBufferProtocol.h +%%PYTHON%%include/PyImath/PyImathColor.h +%%PYTHON%%include/PyImath/PyImathColor3ArrayImpl.h +%%PYTHON%%include/PyImath/PyImathColor4Array2DImpl.h +%%PYTHON%%include/PyImath/PyImathColor4ArrayImpl.h +%%PYTHON%%include/PyImath/PyImathDecorators.h +%%PYTHON%%include/PyImath/PyImathEuler.h +%%PYTHON%%include/PyImath/PyImathExport.h +%%PYTHON%%include/PyImath/PyImathFixedArray.h +%%PYTHON%%include/PyImath/PyImathFixedArray2D.h +%%PYTHON%%include/PyImath/PyImathFixedArrayTraits.h +%%PYTHON%%include/PyImath/PyImathFixedMatrix.h +%%PYTHON%%include/PyImath/PyImathFixedVArray.h +%%PYTHON%%include/PyImath/PyImathFrustum.h +%%PYTHON%%include/PyImath/PyImathFun.h +%%PYTHON%%include/PyImath/PyImathLine.h +%%PYTHON%%include/PyImath/PyImathMathExc.h +%%PYTHON%%include/PyImath/PyImathMatrix.h +%%PYTHON%%include/PyImath/PyImathOperators.h +%%PYTHON%%include/PyImath/PyImathPlane.h +%%PYTHON%%include/PyImath/PyImathQuat.h +%%PYTHON%%include/PyImath/PyImathQuatOperators.h +%%PYTHON%%include/PyImath/PyImathRandom.h +%%PYTHON%%include/PyImath/PyImathShear.h +%%PYTHON%%include/PyImath/PyImathStringArray.h +%%PYTHON%%include/PyImath/PyImathStringArrayRegister.h +%%PYTHON%%include/PyImath/PyImathStringTable.h +%%PYTHON%%include/PyImath/PyImathTask.h +%%PYTHON%%include/PyImath/PyImathUtil.h +%%PYTHON%%include/PyImath/PyImathVec.h +%%PYTHON%%include/PyImath/PyImathVec2Impl.h +%%PYTHON%%include/PyImath/PyImathVec3ArrayImpl.h +%%PYTHON%%include/PyImath/PyImathVec3Impl.h +%%PYTHON%%include/PyImath/PyImathVec4ArrayImpl.h +%%PYTHON%%include/PyImath/PyImathVec4Impl.h +%%PYTHON%%include/PyImath/PyImathVecOperators.h +%%PYTHON%%lib/cmake/Imath/PyImathTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%PYTHON%%lib/cmake/Imath/PyImathTargets.cmake +%%PYTHON%%lib/libPyImath.so %%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so %%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%% %%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