diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index 4e277e13c208..6462569e4dd6 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,85 +1,82 @@ # Created by: nork@FreeBSD.org PORTNAME= openexr -PORTVERSION= 3.0.2 +PORTVERSION= 3.0.3 CATEGORIES= graphics devel -MASTER_SITES= LOCAL/mandree/:test -DISTFILES= ${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test MAINTAINER= mandree@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format LICENSE= BSD3CLAUSE # exact version required to avoid hard-to-debug issues LIB_DEPENDS= libImath-3_0.so.28:math/Imath USES= cmake compiler:c++14-lang pathfix pkgconfig USE_GITHUB= yes GH_TUPLE= AcademySoftwareFoundation:openexr:v${PORTVERSION} USE_LDCONFIG= yes CMAKE_ARGS+= -DCMAKE_DEBUG_POSTFIX= -CPPFLAGS+= -I. -I../IlmImf +CPPFLAGS+= -I. # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread PATCH_STRIP= -p1 _MAJORVER= 3_0 _VER= 28 _MINVER= 0 _PLVER= 0 PLIST_SUB+= MAJORVER=${_MAJORVER} \ VER=${_VER} \ MINVER=${_MINVER} \ PLVER=${_PLVER} PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes _DOCSRCDIR1= ${WRKSRC} _DOCSRCDIR2= ${WRKSRC}/docs _DOC_FILES1= CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \ CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md _DOC_FILES2= *.odt *.pdf # too many reports about compilation failures, so # sanity check we are using the same C++ standard library _imath_libcxx= ${COMPILER_FEATURES:Mlib*c++} 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-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DOC_FILES1:S|^|${_DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DOC_FILES2:S|^|${_DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR} - #${MV} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/[a-df-zA-Z]* ${STAGEDIR}${DOCSDIR} post-install-DOCS-off: ${RM} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/*.pdf @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || : 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 || : do-test: cd ${BUILD_WRKSRC} && ctest -j ${MAKE_JOBS_NUMBER} .include diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo index cfc0d2520714..650fb683c38f 100644 --- a/graphics/openexr/distinfo +++ b/graphics/openexr/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1621335023 +TIMESTAMP = 1621667416 SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768 -SHA256 (AcademySoftwareFoundation-openexr-3.0.2-v3.0.2_GH0.tar.gz) = afcfaaba700d0bc86a54e9c2e51b22b9dd458527571046f02951ef75ddc7c8e2 -SIZE (AcademySoftwareFoundation-openexr-3.0.2-v3.0.2_GH0.tar.gz) = 25060066 +SHA256 (AcademySoftwareFoundation-openexr-3.0.3-v3.0.3_GH0.tar.gz) = d3526a3ccdca78a94658d5208e1963e4686181087004edd5bb98290e1fd0f389 +SIZE (AcademySoftwareFoundation-openexr-3.0.3-v3.0.3_GH0.tar.gz) = 25060963 diff --git a/graphics/openexr/files/patch-f60b55b1b b/graphics/openexr/files/patch-f60b55b1b deleted file mode 100644 index cdb937bf0e23..000000000000 --- a/graphics/openexr/files/patch-f60b55b1b +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c68ed6414..980f0f1d0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,6 +40,12 @@ set(OPENEXR_VERSION_API "${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}") - - message(STATUS "Configure OpenEXR Version: ${OPENEXR_VERSION} Lib API: ${OPENEXR_LIB_VERSION}") - -+option(OPENEXR_INSTALL "Install OpenEXR libraries" ON) -+option(OPENEXR_INSTALL_TOOLS "Install OpenEXR tools" ON) -+if(OPENEXR_INSTALL_TOOLS AND NOT OPENEXR_INSTALL) -+ message(SEND_ERROR "OPENEXR_INSTALL_TOOLS requires OPENEXR_INSTALL") -+endif() -+ - include(cmake/LibraryDefine.cmake) - include(cmake/OpenEXRSetup.cmake) - add_subdirectory(cmake) diff --git a/math/Imath/Makefile b/math/Imath/Makefile index 0e2abc523b6f..e858a64332e7 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.0.2 +PORTVERSION= 3.0.3 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_0 _VER= 28 _MINVER= 0 _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 d58c15600001..a554fcc3158d 100644 --- a/math/Imath/distinfo +++ b/math/Imath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621270930 -SHA256 (AcademySoftwareFoundation-Imath-3.0.2-v3.0.2_GH0.tar.gz) = 85c9939390afd33e93e7bea9c2b8e5dcd37958daa5d70214c58e9b00320ebf29 -SIZE (AcademySoftwareFoundation-Imath-3.0.2-v3.0.2_GH0.tar.gz) = 528309 +TIMESTAMP = 1621667405 +SHA256 (AcademySoftwareFoundation-Imath-3.0.3-v3.0.3_GH0.tar.gz) = 296c4facd4e5022a937f9ac7c354d62f0d002d3bf47434e91c5ee5f4a4f8ee93 +SIZE (AcademySoftwareFoundation-Imath-3.0.3-v3.0.3_GH0.tar.gz) = 528293