diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index e6d3800dec07..01af90380431 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,83 +1,83 @@ PORTNAME= openexr -PORTVERSION= 3.1.10 -PORTREVISION= 1 +PORTVERSION= 3.1.11 +PORTREVISION= 0 CATEGORIES= graphics devel MAINTAINER= mandree@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format WWW= https://www.openexr.com/ LICENSE= BSD3CLAUSE # exact version required to avoid hard-to-debug issues LIB_DEPENDS= libImath-3_1.so.29:math/Imath USES= cmake compiler:c++14-lang cpe pathfix pkgconfig USE_GITHUB= yes GH_TUPLE= AcademySoftwareFoundation:openexr:v${PORTVERSION} USE_LDCONFIG= yes CMAKE_ARGS+= -DCMAKE_DEBUG_POSTFIX= CPPFLAGS+= -I. # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread _MAJORVER= 3_1 _VER= 30 -_MINVER= 10 +_MINVER= 11 _PLVER= 1 PLIST_SUB+= MAJORVER=${_MAJORVER} \ VER=${_VER} \ MINVER=${_MINVER} \ PLVER=${_PLVER} PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes DOCS_BUILD_DEPENDS=breathe-apidoc:devel/py-breathe \ ${PYTHON_PKGNAMEPREFIX}sphinx_press_theme>=0:textproc/py-sphinx_press_theme DOCS_USES= python:build DOCS_CMAKE_BOOL=BUILD_DOCS DOCS_CMAKE_ON= -DPython_EXECUTABLE:STRING=${PYTHON_CMD} _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++} 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} ( cd ${BUILD_WRKSRC}/docs/sphinx && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} ) ${RM} -r ${STAGEDIR}${DOCSDIR}/.??* ${STAGEDIR}${DOCSDIR}/../OpenEXR/sphinx post-install-DOCS-off: @${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 ea8996993236..99036e2f4375 100644 --- a/graphics/openexr/distinfo +++ b/graphics/openexr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691148231 -SHA256 (AcademySoftwareFoundation-openexr-3.1.10-v3.1.10_GH0.tar.gz) = 6e0fd3f0eb1cb907bd3593830ea2b3431b85f22a6f18f99f8cfa099fec70067d -SIZE (AcademySoftwareFoundation-openexr-3.1.10-v3.1.10_GH0.tar.gz) = 20539019 +TIMESTAMP = 1692028953 +SHA256 (AcademySoftwareFoundation-openexr-3.1.11-v3.1.11_GH0.tar.gz) = 06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1 +SIZE (AcademySoftwareFoundation-openexr-3.1.11-v3.1.11_GH0.tar.gz) = 20539852 diff --git a/graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h b/graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h deleted file mode 100644 index 342cf10762d9..000000000000 --- a/graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/AcademySoftwareFoundation/openexr/pull/1507/files - ---- src/lib/OpenEXRCore/internal_cpuid.h.orig 2023-07-31 18:17:50 UTC -+++ src/lib/OpenEXRCore/internal_cpuid.h -@@ -39,14 +39,16 @@ static inline void check_for_x86_simd (int *f16c, int - *f16c = 0; - # endif - --#elif OPENEXR_ENABLE_X86_SIMD_CHECK -+#elif defined(__AVX__) && defined(__F16C__) - - // shortcut if everything is turned on / compiled in --# if defined(__AVX__) && defined(__F16C__) - *f16c = 1; - *avx = 1; - *sse2 = 1; --# elif defined(_MSC_VER) && defined(_WIN32) -+ -+#elif OPENEXR_ENABLE_X86_SIMD_CHECK -+ -+# if defined(_MSC_VER) && defined(_WIN32) - int regs[4], osxsave; - - __cpuid (regs, 0);