ilmbase, openexr: Update to 2.5.1

Changelog:
2.5.1:

A patch release that corrects the SO version for the v2.5 release, which missed getting bumped in v2.5.0.

This release also fixes an improper failure in IlmImfTest when running on ARMv7 and AAarch64.

2.5.0:
Minor release with miscellaneous bug fixes and small features

## Summary

* No more build-time header generation: toFloat.h, eLut.h,
  b44ExpLogTable.h, and dwaLookups.h are now ordinary header files, no
  longer generated on the fly.
* New StdISSTream class, an "input" stringstream version of StdOSStream
* New Matrix22 class in Imath
* Chromaticity comparison operator now includes white (formerly ignored)
* Various cmake fixes
* Bug fixes for various memory leaks
* Bug fixes for various invalid memory accesses
* New checks to detect damaged input files
* OpenEXR_Viewers has been deprecated, removed from the top-level
  cmake build and documentation.

7 files changed, 33 insertions, 19 deletions

diff --git a/graphics/ilmbase/buildlink3.mk b/graphics/ilmbase/buildlink3.mk
index cb5bf6fb711..b332dc6116e 100644
--- a/graphics/ilmbase/buildlink3.mk
+++ b/graphics/ilmbase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/08/22 11:24:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2020/05/21 20:58:32 ryoon Exp $
 
 BUILDLINK_TREE+=	ilmbase
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ilmbase
 ILMBASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ilmbase+=	ilmbase>=1.0.1
-BUILDLINK_ABI_DEPENDS.ilmbase+=	ilmbase>=2.2.0nb1
+BUILDLINK_ABI_DEPENDS.ilmbase+=	ilmbase>=2.5.1
 BUILDLINK_PKGSRCDIR.ilmbase?=	../../graphics/ilmbase
 .endif # ILMBASE_BUILDLINK3_MK
 
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index 6edd66a0526..1f93eb2eac9 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2020/02/13 21:13:16 nia Exp $
+$NetBSD: distinfo,v 1.20 2020/05/21 20:58:32 ryoon Exp $
 
-SHA1 (openexr-2.4.1.tar.gz) = 7a5fc26f7b383fec8bc5a3638ceb7d0b0d1913f7
-RMD160 (openexr-2.4.1.tar.gz) = 0c24bedb7adb3db54952a13962c12dec419c51c5
-SHA512 (openexr-2.4.1.tar.gz) = 23c0c07fafa42f832e67cbfeeeb12b6b9e373dd0a5b858f463bf5c4d0661c58fad662cef64ef6a3053f0db2f69aee46816568b814872d617284664d1effbbbab
-Size (openexr-2.4.1.tar.gz) = 26809861 bytes
+SHA1 (openexr-2.5.1.tar.gz) = c32ffdf5a2f11e588562c268c873f96fa5ab8c1c
+RMD160 (openexr-2.5.1.tar.gz) = 5a12003fda09e145964a9235a1a56767455aab1e
+SHA512 (openexr-2.5.1.tar.gz) = d7ff156481a0b0c26282b5b839e8d88e3f19a9d11c8d16113faa38409145670b379d8c5629efa2c6bd7719e095c07fe2bcd9fc8bedd15f48da77c1ce94705714
+Size (openexr-2.5.1.tar.gz) = 27522285 bytes
 SHA1 (patch-IlmBase_configure.ac) = 563b483c24c1fa75f7fd203082ff872266d48d50
+SHA1 (patch-IlmBase_m4_threads.m4) = 7b1f38dbc733a2f324fd5800e9def6f040f33393
diff --git a/graphics/ilmbase/patches/patch-IlmBase_m4_threads.m4 b/graphics/ilmbase/patches/patch-IlmBase_m4_threads.m4
new file mode 100644
index 00000000000..acc74c48e09
--- /dev/null
+++ b/graphics/ilmbase/patches/patch-IlmBase_m4_threads.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-IlmBase_m4_threads.m4,v 1.1 2020/05/21 20:58:32 ryoon Exp $
+
+* Improve POSIX shell portability.
+
+--- IlmBase/m4/threads.m4.orig	2020-05-11 15:53:42.000000000 +0000
++++ IlmBase/m4/threads.m4
+@@ -258,7 +258,7 @@ if test "${enable_posix_sem:-yes}" != "n
+     AC_CHECK_HEADERS([semaphore.h], [
+ 	AC_SEARCH_LIBS(sem_init, [posix4 pthread], [
+ 	    AC_MSG_CHECKING([whether to use POSIX unnamed semaphores])
+-		if test "${cross_compiling}" == "yes"; then
++		if test "${cross_compiling}" = "yes"; then
+ 			AC_LINK_IFELSE([
+ 			AC_LANG_PROGRAM([#include <semaphore.h>], [
+ 				sem_t mysem;
diff --git a/graphics/openexr/Makefile.common b/graphics/openexr/Makefile.common
index e26e6e1241f..156a7162145 100644
--- a/graphics/openexr/Makefile.common
+++ b/graphics/openexr/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2020/03/13 19:14:39 tnn Exp $
+# $NetBSD: Makefile.common,v 1.6 2020/05/21 20:58:32 ryoon Exp $
 # used by graphics/ilmbase/Makefile
-# used by graphics/opencv/Makefile
 
-DISTNAME=	openexr-2.4.1
+DISTNAME=	openexr-2.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
 GITHUB_PROJECT=	openexr
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index 43ef991655b..b797709b467 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2020/02/13 21:13:16 nia Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/05/21 20:58:32 ryoon Exp $
 bin/exr2aces
 bin/exrenvmap
 bin/exrheader
@@ -99,7 +99,6 @@ include/OpenEXR/OpenEXRConfigInternal.h
 lib/libIlmImf.la
 lib/libIlmImfUtil.la
 lib/pkgconfig/OpenEXR.pc
-share/aclocal/openexr.m4
 share/doc/openexr/InterpretingDeepPixels.pdf
 share/doc/openexr/MultiViewOpenEXR.pdf
 share/doc/openexr/OpenEXRFileLayout.pdf
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index 0b42a839d75..ac756fe9e6d 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/08/22 11:24:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2020/05/21 20:58:32 ryoon Exp $
 
 BUILDLINK_TREE+=	openexr
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openexr
 OPENEXR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openexr+=	openexr>=1.6.1
-BUILDLINK_ABI_DEPENDS.openexr+=	openexr>=2.2.0nb3
+BUILDLINK_ABI_DEPENDS.openexr+=	openexr>=2.5.1
 BUILDLINK_PKGSRCDIR.openexr?=	../../graphics/openexr
 
 PTHREAD_OPTS+=	require
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 3da3ae15bf2..385b98741a1 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.33 2020/02/13 21:13:16 nia Exp $
+$NetBSD: distinfo,v 1.34 2020/05/21 20:58:32 ryoon Exp $
 
-SHA1 (openexr-2.4.1.tar.gz) = 7a5fc26f7b383fec8bc5a3638ceb7d0b0d1913f7
-RMD160 (openexr-2.4.1.tar.gz) = 0c24bedb7adb3db54952a13962c12dec419c51c5
-SHA512 (openexr-2.4.1.tar.gz) = 23c0c07fafa42f832e67cbfeeeb12b6b9e373dd0a5b858f463bf5c4d0661c58fad662cef64ef6a3053f0db2f69aee46816568b814872d617284664d1effbbbab
-Size (openexr-2.4.1.tar.gz) = 26809861 bytes
+SHA1 (openexr-2.5.1.tar.gz) = c32ffdf5a2f11e588562c268c873f96fa5ab8c1c
+RMD160 (openexr-2.5.1.tar.gz) = 5a12003fda09e145964a9235a1a56767455aab1e
+SHA512 (openexr-2.5.1.tar.gz) = d7ff156481a0b0c26282b5b839e8d88e3f19a9d11c8d16113faa38409145670b379d8c5629efa2c6bd7719e095c07fe2bcd9fc8bedd15f48da77c1ce94705714
+Size (openexr-2.5.1.tar.gz) = 27522285 bytes
 SHA1 (patch-OpenEXR_IlmImf_ImfSystemSpecific.h) = a07e8ba50084e642a2f53371cdc53738b3e75995