Date: Mon, 12 Apr 2021 00:34:09 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 398a42d37ac6 - main - graphics/openexr: update to 3.0.1 Message-ID: <202104120034.13C0Y9Rr092044@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=398a42d37ac61f467770241aca00174988f8c923 commit 398a42d37ac61f467770241aca00174988f8c923 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2021-04-10 10:12:36 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2021-04-12 00:33:34 +0000 graphics/openexr: update to 3.0.1 This requires and uses the new Imath 3.0.1 port. --- graphics/openexr/Makefile | 62 ++++++++++------------ graphics/openexr/distinfo | 6 +-- .../openexr/files/patch-config_OpenEXRSetup.cmake | 13 ----- graphics/openexr/pkg-plist | 48 +++++++++++++---- 4 files changed, 70 insertions(+), 59 deletions(-) diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index e7bdcbebf497..4154da66974b 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,7 +1,7 @@ # Created by: nork@FreeBSD.org PORTNAME= openexr -PORTVERSION= 2.5.5 +PORTVERSION= 3.0.1 CATEGORIES= graphics devel MASTER_SITES= LOCAL/mandree/:test DISTFILES= ${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test @@ -12,19 +12,28 @@ COMMENT= High dynamic-range (HDR) image file format LICENSE= BSD3CLAUSE # exact version required to avoid hard-to-debug issues -LIB_DEPENDS= libImath-2_5.so.25:graphics/ilmbase +LIB_DEPENDS= libImath-3_0.so.27:math/Imath -USES= cmake compiler:c++14-lang libtool pathfix pkgconfig +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 # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread -WRKSRC_SUBDIR= OpenEXR +MAJORVER= 3_0 +_VER= 27 +_MINVER= 0 +_PLVER= 0 + +PLIST_SUB+= MAJORVER=${MAJORVER} \ + VER=${_VER} \ + MINVER=${_MINVER} \ + PLVER=${_PLVER} PORTDOCS= * PORTEXAMPLES= * @@ -32,57 +41,42 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes -_DOCSRCDIR1= ${WRKSRC:H}/ -_DOCSRCDIR2= ${WRKSRC}/doc +_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 -MAJORVER= 2_5 -_VER= 25 -_MINVER= 0 -_PLVER= 4 - -PLIST_SUB+= MAJORVER=${MAJORVER} \ - VER=${_VER} \ - MINVER=${_MINVER} \ - PLVER=${_PLVER} - # too many reports about compilation failures, so # sanity check we are using the same C++ standard library -_ilm_libcxx= ${COMPILER_FEATURES:Mlib*c++} +_imath_libcxx= ${COMPILER_FEATURES:Mlib*c++} pre-configure: @${READELF} -d ${LOCALBASE}/lib/libImath.so \ - | ${EGREP} -q '\<NEEDED\>.*\[${_ilm_libcxx:C/\+/\\+/g}\.' \ - || { ${ECHO_CMD} "*** Your ilmbase package uses a different C++ standard library than ***" ; \ - ${ECHO_CMD} "*** OpenEXR would. Please recompile and reinstall ilmbase with the ***" ; \ - ${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR. Abort. ***" ; \ + | ${EGREP} -q '\<NEEDED\>.*\[${_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: - ${STRIP_CMD} \ - ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${_VER} \ - ${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${_VER} - -post-install-DOCS-off: - ${RM} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/*.pdf - @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || : - 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} + #${MV} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/[a-df-zA-Z]* ${STAGEDIR}${DOCSDIR} -post-install-EXAMPLES-off: - ${RM} -R ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ - @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || : +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} diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo index cc31c3d59d5c..f680826815ae 100644 --- a/graphics/openexr/distinfo +++ b/graphics/openexr/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1613162267 +TIMESTAMP = 1618048202 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-2.5.5-v2.5.5_GH0.tar.gz) = 59e98361cb31456a9634378d0f653a2b9554b8900f233450f2396ff495ea76b3 -SIZE (AcademySoftwareFoundation-openexr-2.5.5-v2.5.5_GH0.tar.gz) = 27536865 +SHA256 (AcademySoftwareFoundation-openexr-3.0.1-v3.0.1_GH0.tar.gz) = 6d14a8df938bbbd55dd6e55b24c527fe9323fe6a45f704e56967dfbf477cecc1 +SIZE (AcademySoftwareFoundation-openexr-3.0.1-v3.0.1_GH0.tar.gz) = 25059445 diff --git a/graphics/openexr/files/patch-config_OpenEXRSetup.cmake b/graphics/openexr/files/patch-config_OpenEXRSetup.cmake deleted file mode 100644 index 3fe701732532..000000000000 --- a/graphics/openexr/files/patch-config_OpenEXRSetup.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- config/OpenEXRSetup.cmake.orig 2019-09-18 01:02:06 UTC -+++ config/OpenEXRSetup.cmake -@@ -42,10 +42,6 @@ set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destin - # but is pretty harmless to set globally - set(CMAKE_INCLUDE_CURRENT_DIR ON) - --# Suffix for debug configuration libraries --# (if you should choose to install those) --set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds") -- - # Usual cmake option to build shared libraries or not - option(BUILD_SHARED_LIBS "Build shared library" ON) - # This allows a "double library" setup, where we compile both diff --git a/graphics/openexr/pkg-plist b/graphics/openexr/pkg-plist index 7aeeb5401714..7516d6153c02 100644 --- a/graphics/openexr/pkg-plist +++ b/graphics/openexr/pkg-plist @@ -6,14 +6,34 @@ bin/exrmaketiled bin/exrmultipart bin/exrmultiview bin/exrstdattr +include/OpenEXR/Iex.h +include/OpenEXR/IexBaseExc.h +include/OpenEXR/IexConfig.h +include/OpenEXR/IexErrnoExc.h +include/OpenEXR/IexExport.h +include/OpenEXR/IexForward.h +include/OpenEXR/IexMacros.h +include/OpenEXR/IexMathExc.h +include/OpenEXR/IexMathFloatExc.h +include/OpenEXR/IexMathIeeeExc.h +include/OpenEXR/IexNamespace.h +include/OpenEXR/IexThrowErrnoExc.h +include/OpenEXR/IlmThread.h +include/OpenEXR/IlmThreadConfig.h +include/OpenEXR/IlmThreadExport.h +include/OpenEXR/IlmThreadForward.h +include/OpenEXR/IlmThreadMutex.h +include/OpenEXR/IlmThreadNamespace.h +include/OpenEXR/IlmThreadPool.h +include/OpenEXR/IlmThreadSemaphore.h include/OpenEXR/ImfAcesFile.h include/OpenEXR/ImfArray.h include/OpenEXR/ImfAttribute.h -include/OpenEXR/ImfB44Compressor.h include/OpenEXR/ImfBoxAttribute.h include/OpenEXR/ImfCRgbaFile.h include/OpenEXR/ImfChannelList.h include/OpenEXR/ImfChannelListAttribute.h +include/OpenEXR/ImfCheckFile.h include/OpenEXR/ImfChromaticities.h include/OpenEXR/ImfChromaticitiesAttribute.h include/OpenEXR/ImfCompositeDeepScanLine.h @@ -53,6 +73,8 @@ include/OpenEXR/ImfGenericInputFile.h include/OpenEXR/ImfGenericOutputFile.h include/OpenEXR/ImfHeader.h include/OpenEXR/ImfHuf.h +include/OpenEXR/ImfIDManifest.h +include/OpenEXR/ImfIDManifestAttribute.h include/OpenEXR/ImfIO.h include/OpenEXR/ImfImage.h include/OpenEXR/ImfImageChannel.h @@ -114,12 +136,20 @@ lib/cmake/OpenEXR/OpenEXRConfig.cmake lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake lib/cmake/OpenEXR/OpenEXRTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenEXR/OpenEXRTargets.cmake -lib/libIlmImf-%%MAJORVER%%.so -lib/libIlmImf-%%MAJORVER%%.so.%%VER%% -lib/libIlmImf-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%% -lib/libIlmImf.so -lib/libIlmImfUtil-%%MAJORVER%%.so -lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%% -lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%% -lib/libIlmImfUtil.so +lib/libIex-%%MAJORVER%%.so +lib/libIex-%%MAJORVER%%.so.27 +lib/libIex-%%MAJORVER%%.so.27.0.0 +lib/libIex.so +lib/libIlmThread-%%MAJORVER%%.so +lib/libIlmThread-%%MAJORVER%%.so.27 +lib/libIlmThread-%%MAJORVER%%.so.27.0.0 +lib/libIlmThread.so +lib/libOpenEXR-%%MAJORVER%%.so +lib/libOpenEXR-%%MAJORVER%%.so.27 +lib/libOpenEXR-%%MAJORVER%%.so.27.0.0 +lib/libOpenEXR.so +lib/libOpenEXRUtil-%%MAJORVER%%.so +lib/libOpenEXRUtil-%%MAJORVER%%.so.27 +lib/libOpenEXRUtil-%%MAJORVER%%.so.27.0.0 +lib/libOpenEXRUtil.so libdata/pkgconfig/OpenEXR.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104120034.13C0Y9Rr092044>