git: f998e5176d1c - main - graphics/openimageio: update to 2.2.13.1 to make compatible with OpenEXR/Imath 3.0

[Matthias Andree]

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f998e5176d1cbb15ea15ca5c7e879103800f72df

commit f998e5176d1cbb15ea15ca5c7e879103800f72df
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-10 15:55:51 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:36 +0000

    graphics/openimageio: update to 2.2.13.1 to make compatible with OpenEXR/Imath 3.0
---
 graphics/openimageio/Makefile                      |  8 +++---
 graphics/openimageio/distinfo                      |  6 ++--
 .../patch-src_cmake_modules_FindOpenJpeg.cmake     | 32 ----------------------
 graphics/openimageio/pkg-plist                     |  1 +
 graphics/py-openimageio/Makefile                   |  2 +-
 5 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 55046f3fb339..1c6d79fe769b 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.2.10.1
+DISTVERSION=	2.2.13.1
 # PORTREVISION must be set with ?= so as not to stomp over
 # py-openimageio's PORTREVISION.
 # Also, just to be on the safe side, when resetting,
 # best keep PORTREVISION?=	0.
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD at Shaneware.biz
@@ -20,8 +20,8 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
 		libheif.so:graphics/libheif \
-		libImath.so:graphics/ilmbase \
-		libIlmImf.so:graphics/openexr \
+		libImath.so:math/Imath \
+		libOpenEXR.so:graphics/openexr \
 		libpng.so:graphics/png \
 		libsquish.so:graphics/squish \
 		libtiff.so:graphics/tiff \
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 5536610c036a..a6d855710f57 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610675123
-SHA256 (OpenImageIO-oiio-Release-2.2.10.1_GH0.tar.gz) = 625f4ad666f9aa133039c0ae6ade8fc5dab835fadac988cbe65f824463d614dc
-SIZE (OpenImageIO-oiio-Release-2.2.10.1_GH0.tar.gz) = 29215445
+TIMESTAMP = 1618069447
+SHA256 (OpenImageIO-oiio-Release-2.2.13.1_GH0.tar.gz) = 7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+SIZE (OpenImageIO-oiio-Release-2.2.13.1_GH0.tar.gz) = 29265740
diff --git a/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.cmake
deleted file mode 100644
index 4e9789e9e341..000000000000
--- a/graphics/openimageio/files/patch-src_cmake_modules_FindOpenJpeg.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/cmake/modules/FindOpenJpeg.cmake.orig	2021-01-17 14:28:27 UTC
-+++ src/cmake/modules/FindOpenJpeg.cmake
-@@ -56,18 +56,21 @@ endmacro ()
-
- # Generic search paths
- set (OpenJpeg_include_paths
-+     /usr/local/include/openjpeg-2.4
-      /usr/local/include/openjpeg-2.3
-      /usr/local/include/openjpeg-2.2
-      /usr/local/include/openjpeg-2.1
-      /usr/local/include/openjpeg-2.0
-      /usr/local/include/openjpeg
-      /usr/local/include
-+     /usr/include/openjpeg-2.4
-      /usr/include/openjpeg-2.3
-      /usr/include/openjpeg-2.2
-      /usr/include/openjpeg-2.1
-      /usr/include/openjpeg
-      /usr/include
-      /opt/local/include
-+     /opt/local/include/openjpeg-2.4
-      /opt/local/include/openjpeg-2.3
-      /opt/local/include/openjpeg-2.2
-      /opt/local/include/openjpeg-2.1
-@@ -88,6 +91,7 @@ if (OpenJpeg_ROOT)
-        ${OpenJpeg_library_paths}
-       )
-   set (OpenJpeg_include_paths
-+       ${OpenJpeg_ROOT}/include/openjpeg-2.4
-        ${OpenJpeg_ROOT}/include/openjpeg-2.3
-        ${OpenJpeg_ROOT}/include/openjpeg-2.2
-        ${OpenJpeg_ROOT}/include/openjpeg-2.1
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index 906a5d89ad5d..6ea3780f713b 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -13,6 +13,7 @@ include/OpenImageIO/benchmark.h
 include/OpenImageIO/color.h
 include/OpenImageIO/dassert.h
 include/OpenImageIO/deepdata.h
+include/OpenImageIO/detail/farmhash.h
 include/OpenImageIO/detail/fmt/core.h
 include/OpenImageIO/detail/fmt/format-inl.h
 include/OpenImageIO/detail/fmt/format.h
diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile
index 45dcbedf6274..04c03006263b 100644
--- a/graphics/py-openimageio/Makefile
+++ b/graphics/py-openimageio/Makefile
@@ -1,6 +1,6 @@
 # Created by: Shane Ambler
 
-PORTREVISION=	8
+PORTREVISION=	0
 CATEGORIES=	graphics multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}