openexr: update to 3.0.5

## Version 3.0.5 (July 1, 2021)

Patch release that fixes problems with library symlinks and
pkg-config, as well as miscellaneous bugs/security issues.

## Version 3.0.4 (June 3, 2021)

Patch release that corrects a problem with the release version number
of v3.0.2/v3.0.3:

## Version 3.0.3 (May 18, 2021)

Patch release that fixes a regression in v3.0.2 the prevented headers
from being installed properly.

# Version 3.0.2 (May 17, 2021)

Patch release with miscellaneous bug/build fixes, including:

* Fix TimeCode.frame max value
* Don't impose C++14 on downstream projects
* Restore fix to macOS universal 2 build lost from #854
* Imath auto-build version defaults to v3.0.2

## Version 3.0.1 (April 1, 2021)

Major release with major build restructing, security improvements, and
new features:

* Restructuring:
  - The IlmBase/PyIlmBase submodules have been separated into the
    Imath project, now included by OpenEXR via a CMake submodule
    dependency, fetched automatically via CMake's FetchContent if
    necessary.
  - The library is now called ``libOpenEXR`` (instead of
    ``libIlmImf``).  No header files have been renamed, they retain
    the ``Imf`` prefix.
  - Symbol linkage visibility is limited to specific public symbols.

* Build improvements:
  - No more simultaneous static/shared build option.
  - Community-provided support for bazel.

* New Features:
  - ID Manifest Attributes, as described in ["A Scheme for Storing
    Object ID Manifests in OpenEXR
    Images"](https://doi.org/10.1145/3233085.3233086), Peter Hillman,
    DigiPro 18: Proceedings of the 8th Annual Digital Production
    Symposium, August 2018.
  - New program: exrcheck validates the contents of an EXR file.

* Changes:
  - EXR files with no channels are no longer allowed.
  - Hard limit on the size of deep tile sizes; tiles must be less than
    2^30 pixels.
  - Tiled DWAB files used STATIC_HUFFMAN compression.
  - ``Int64`` and ``SInt64`` types are deprecated in favor of
    ``uint64_t`` and ``int64_t``.
  - Header files have been pruned of extraneous ``#include``'s
    ("Include What You Use"), which may generate compiler errors in
    application source code from undefined symbols or
    partially-defined types. These can be resolved by identifying and
    including the appropriate header.

6 files changed, 113 insertions, 89 deletions

diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 0a242b50023..c1c99058362 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,20 +1,33 @@
-# $NetBSD: Makefile,v 1.40 2019/09/21 21:34:44 nia Exp $
+# $NetBSD: Makefile,v 1.41 2021/07/08 21:13:06 markd Exp $
 
-.include "Makefile.common"
+DISTNAME=	openexr-3.0.5
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
+GITHUB_PROJECT=	openexr
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-CONFIGURE_DIRS=	OpenEXR
-BUILD_DIRS=	OpenEXR
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	https://www.openexr.com/
+COMMENT=	High dynamic-range (HDR) image file format library and tools
+LICENSE=	modified-bsd
 
-USE_TOOLS+=	pkg-config
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++14
 
-LIBS.IRIX+=		-lmx
+# C++14
+GCC_REQD+=	6
 
-PKGCONFIG_OVERRIDE=	OpenEXR.pc.in
+PKGCONFIG_OVERRIDE=	cmake/OpenEXR.pc.in
 
-pre-configure:
-	cd ${WRKSRC}/OpenEXR && ./bootstrap
+PTHREAD_OPTS=	require
+
+CHECK_PORTABILITY_SKIP+=	Contrib/DtexToExr/bootstrap
+
+.include "../../mk/pthread.buildlink3.mk"
+
+#LIBS.SunOS+=	-lm
+#LIBS.IRIX+=	-lmx
 
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ilmbase+=	ilmbase>=1.0.2nb1
-.include "../../graphics/ilmbase/buildlink3.mk"
+.include "../../math/imath/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openexr/Makefile.common b/graphics/openexr/Makefile.common
deleted file mode 100644
index 13dc1fa7bd1..00000000000
--- a/graphics/openexr/Makefile.common
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile.common,v 1.9 2021/03/17 11:46:08 wiz Exp $
-# used by graphics/ilmbase/Makefile
-
-DISTNAME=	openexr-2.5.5
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_PROJECT=	openexr
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	https://www.openexr.com/
-COMMENT=	High dynamic-range (HDR) image file format library and tools
-LICENSE=	modified-bsd
-
-CHECK_PORTABILITY_SKIP+=	util/reformat.sh	# unused file
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_TOOLS+=	autoconf automake aclocal
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++14
-USE_LIBTOOL=	yes
-TEST_TARGET=	check
-
-# C++14
-GCC_REQD+=	6
-
-LIBS.SunOS+=	-lm
-
-PTHREAD_OPTS=	require
-
-# Compatibility
-CONFIGURE_ARGS+=	--disable-namespaceversioning
-
-BUILDLINK_TRANSFORM+=	rm:-Wno-long-double
-
-CHECK_PORTABILITY_SKIP+=	Contrib/DtexToExr/bootstrap
-
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index b797709b467..5fefa7e4aa6 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2020/05/21 20:58:32 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/07/08 21:13:06 markd Exp $
 bin/exr2aces
 bin/exrenvmap
 bin/exrheader
@@ -7,14 +7,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
@@ -23,6 +43,10 @@ include/OpenEXR/ImfCompressionAttribute.h
 include/OpenEXR/ImfConvert.h
 include/OpenEXR/ImfDeepCompositing.h
 include/OpenEXR/ImfDeepFrameBuffer.h
+include/OpenEXR/ImfDeepImage.h
+include/OpenEXR/ImfDeepImageChannel.h
+include/OpenEXR/ImfDeepImageIO.h
+include/OpenEXR/ImfDeepImageLevel.h
 include/OpenEXR/ImfDeepImageState.h
 include/OpenEXR/ImfDeepImageStateAttribute.h
 include/OpenEXR/ImfDeepScanLineInputFile.h
@@ -37,6 +61,10 @@ include/OpenEXR/ImfDoubleAttribute.h
 include/OpenEXR/ImfEnvmap.h
 include/OpenEXR/ImfEnvmapAttribute.h
 include/OpenEXR/ImfExport.h
+include/OpenEXR/ImfFlatImage.h
+include/OpenEXR/ImfFlatImageChannel.h
+include/OpenEXR/ImfFlatImageIO.h
+include/OpenEXR/ImfFlatImageLevel.h
 include/OpenEXR/ImfFloatAttribute.h
 include/OpenEXR/ImfFloatVectorAttribute.h
 include/OpenEXR/ImfForward.h
@@ -46,7 +74,15 @@ 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
+include/OpenEXR/ImfImageChannelRenaming.h
+include/OpenEXR/ImfImageDataWindow.h
+include/OpenEXR/ImfImageIO.h
+include/OpenEXR/ImfImageLevel.h
 include/OpenEXR/ImfInputFile.h
 include/OpenEXR/ImfInputPart.h
 include/OpenEXR/ImfInt64.h
@@ -75,6 +111,7 @@ include/OpenEXR/ImfRationalAttribute.h
 include/OpenEXR/ImfRgba.h
 include/OpenEXR/ImfRgbaFile.h
 include/OpenEXR/ImfRgbaYca.h
+include/OpenEXR/ImfSampleCountChannel.h
 include/OpenEXR/ImfStandardAttributes.h
 include/OpenEXR/ImfStdIO.h
 include/OpenEXR/ImfStringAttribute.h
@@ -90,34 +127,46 @@ include/OpenEXR/ImfTiledOutputPart.h
 include/OpenEXR/ImfTiledRgbaFile.h
 include/OpenEXR/ImfTimeCode.h
 include/OpenEXR/ImfTimeCodeAttribute.h
+include/OpenEXR/ImfUtilExport.h
 include/OpenEXR/ImfVecAttribute.h
 include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
-include/OpenEXR/OpenEXRConfigInternal.h
-lib/libIlmImf.la
-lib/libIlmImfUtil.la
+lib/cmake/OpenEXR/OpenEXRConfig.cmake
+lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
+lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
+lib/cmake/OpenEXR/OpenEXRTargets.cmake
+lib/libIex-3_0.so
+lib/libIex-3_0.so.29
+lib/libIex-3_0.so.29.0.0
+lib/libIex.so
+lib/libIlmThread-3_0.so
+lib/libIlmThread-3_0.so.29
+lib/libIlmThread-3_0.so.29.0.0
+lib/libIlmThread.so
+lib/libOpenEXR-3_0.so
+lib/libOpenEXR-3_0.so.29
+lib/libOpenEXR-3_0.so.29.0.0
+lib/libOpenEXR.so
+lib/libOpenEXRUtil-3_0.so
+lib/libOpenEXRUtil-3_0.so.29
+lib/libOpenEXRUtil-3_0.so.29.0.0
+lib/libOpenEXRUtil.so
 lib/pkgconfig/OpenEXR.pc
-share/doc/openexr/InterpretingDeepPixels.pdf
-share/doc/openexr/MultiViewOpenEXR.pdf
-share/doc/openexr/OpenEXRFileLayout.pdf
-share/doc/openexr/ReadingAndWritingImageFiles.pdf
-share/doc/openexr/TechnicalIntroduction.pdf
-share/doc/openexr/TheoryDeepPixels.pdf
-share/doc/openexr/examples/drawImage.cpp
-share/doc/openexr/examples/drawImage.h
-share/doc/openexr/examples/generalInterfaceExamples.cpp
-share/doc/openexr/examples/generalInterfaceExamples.h
-share/doc/openexr/examples/generalInterfaceTiledExamples.cpp
-share/doc/openexr/examples/generalInterfaceTiledExamples.h
-share/doc/openexr/examples/lowLevelIoExamples.cpp
-share/doc/openexr/examples/lowLevelIoExamples.h
-share/doc/openexr/examples/main.cpp
-share/doc/openexr/examples/namespaceAlias.h
-share/doc/openexr/examples/previewImageExamples.cpp
-share/doc/openexr/examples/previewImageExamples.h
-share/doc/openexr/examples/rgbaInterfaceExamples.cpp
-share/doc/openexr/examples/rgbaInterfaceExamples.h
-share/doc/openexr/examples/rgbaInterfaceTiledExamples.cpp
-share/doc/openexr/examples/rgbaInterfaceTiledExamples.h
+share/doc/OpenEXR/examples/drawImage.cpp
+share/doc/OpenEXR/examples/drawImage.h
+share/doc/OpenEXR/examples/generalInterfaceExamples.cpp
+share/doc/OpenEXR/examples/generalInterfaceExamples.h
+share/doc/OpenEXR/examples/generalInterfaceTiledExamples.cpp
+share/doc/OpenEXR/examples/generalInterfaceTiledExamples.h
+share/doc/OpenEXR/examples/lowLevelIoExamples.cpp
+share/doc/OpenEXR/examples/lowLevelIoExamples.h
+share/doc/OpenEXR/examples/main.cpp
+share/doc/OpenEXR/examples/namespaceAlias.h
+share/doc/OpenEXR/examples/previewImageExamples.cpp
+share/doc/OpenEXR/examples/previewImageExamples.h
+share/doc/OpenEXR/examples/rgbaInterfaceExamples.cpp
+share/doc/OpenEXR/examples/rgbaInterfaceExamples.h
+share/doc/OpenEXR/examples/rgbaInterfaceTiledExamples.cpp
+share/doc/OpenEXR/examples/rgbaInterfaceTiledExamples.h
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index cd0098a227a..fe4803ae10a 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.16 2020/10/18 09:52:32 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2021/07/08 21:13:06 markd Exp $
 
 BUILDLINK_TREE+=	openexr
 
 .if !defined(OPENEXR_BUILDLINK3_MK)
 OPENEXR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openexr+=	openexr>=1.6.1
-BUILDLINK_ABI_DEPENDS.openexr+=	openexr>=2.5.1
+BUILDLINK_API_DEPENDS.openexr+=	openexr>=3.0.5
+BUILDLINK_ABI_DEPENDS.openexr+=	openexr>=3.0.5
 BUILDLINK_PKGSRCDIR.openexr?=	../../graphics/openexr
 
 PTHREAD_OPTS+=	require
@@ -14,7 +14,7 @@ PTHREAD_OPTS+=	require
 # C++14
 GCC_REQD+=	6
 
-.include "../../graphics/ilmbase/buildlink3.mk"
+.include "../../math/imath/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # OPENEXR_BUILDLINK3_MK
 
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 10f24675f2a..7daf5014c18 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.37 2021/03/17 11:46:08 wiz Exp $
+$NetBSD: distinfo,v 1.38 2021/07/08 21:13:06 markd Exp $
 
-SHA1 (openexr-2.5.5.tar.gz) = f55bb2051b409fef1c983cbfa37c72be79038568
-RMD160 (openexr-2.5.5.tar.gz) = 9674c852e2efe80a84968e0e53164dd713baa49d
-SHA512 (openexr-2.5.5.tar.gz) = e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
-Size (openexr-2.5.5.tar.gz) = 27536865 bytes
-SHA1 (patch-OpenEXR_IlmImf_ImfSystemSpecific.h) = a07e8ba50084e642a2f53371cdc53738b3e75995
+SHA1 (openexr-3.0.5.tar.gz) = 5b08fa764606958cc6c0501ae311e66838560670
+RMD160 (openexr-3.0.5.tar.gz) = ac1cbed599b3b29fbeb3a8f23598d548f1f2eab9
+SHA512 (openexr-3.0.5.tar.gz) = 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
+Size (openexr-3.0.5.tar.gz) = 25060148 bytes
+SHA1 (patch-src_lib_OpenEXR_ImfSystemSpecific.h) = 87c234bc497cd1fe34d38dfcdaa943486f8971e5
diff --git a/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h b/graphics/openexr/patches/patch-src_lib_OpenEXR_ImfSystemSpecific.h
index c88e6ab1ab1..a9de0ad7d31 100644
--- a/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h
+++ b/graphics/openexr/patches/patch-src_lib_OpenEXR_ImfSystemSpecific.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-OpenEXR_IlmImf_ImfSystemSpecific.h,v 1.1 2019/09/21 21:34:44 nia Exp $
+$NetBSD: patch-src_lib_OpenEXR_ImfSystemSpecific.h,v 1.1 2021/07/08 21:13:06 markd Exp $
 
 Work around lack of posix_memalign() on (some?) Solaris, from PR 47867.
 
---- OpenEXR/IlmImf/ImfSystemSpecific.h.orig	2019-09-18 01:02:06.000000000 +0000
-+++ OpenEXR/IlmImf/ImfSystemSpecific.h
+--- src/lib/OpenEXR/ImfSystemSpecific.h.orig	2019-09-18 01:02:06.000000000 +0000
++++ src/lib/OpenEXR/ImfSystemSpecific.h
 @@ -59,6 +59,8 @@ EXRAllocAligned (size_t size, size_t ali
      return _aligned_malloc (size, alignment);
  #elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)