graphics/{,py-}openimageio: update to 2.5.8.0

Changelogs:
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.4.14.0
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.4.15.0
https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/v2.5.3.0-beta1/CHANGES.md
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.3.0-beta1
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.3.1-beta2
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.3.2-rc1
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.4.0
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.5.0
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.6.0
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.7.0
https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/tag/v2.5.8.0

PR:		275818
Tested by:	fluffy, vvd

5 files changed, 17 insertions, 30 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 047b9401446f..f262d2b29ef5 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.13.0
+DISTVERSION=	2.5.8.0
 # 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?=	10
+PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -28,18 +28,18 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
-USES=		cmake jpeg compiler:c++14-lang iconv:wchar_t qt:5
-
-USE_QT+=	buildtools:build qmake:build
+USES=		cmake jpeg compiler:c++17-lang iconv:wchar_t
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	OpenImageIO
-GH_PROJECT=	oiio
+GH_ACCOUNT=	AcademySoftwareFoundation
+GH_PROJECT=	OpenImageIO
 
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD:INTEGER=17 # OpenVDB uses the C++17 STL
+# feature std::tuple_size_v; since the slave port py-openimageio excludes
+# options - this is a global line here
 CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
 		STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA \
 		USE_Package
-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 # OpenVDB uses the C++17 STL feature std::tuple_size_v; since the slave port py-openimageio excludes options - this is a global line here
 
 OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER \
 			OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB
@@ -65,11 +65,10 @@ GIF_CMAKE_BOOL=		USE_GIF
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
-IMAGEVIEWER_USES=	gl
+IMAGEVIEWER_USES=	gl qt:6
 IMAGEVIEWER_IMPLIES=	TOOLS
-IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
-IMAGEVIEWER_USE=	GL=gl,glu,glew \
-			QT=buildtools,core,gui,opengl,qmake:build,widgets
+IMAGEVIEWER_CMAKE_BOOL=	USE_OPENGL USE_QT
+IMAGEVIEWER_USE=	GL=gl,glu,glew QT=base
 
 OPENCV_CMAKE_BOOL=	USE_OPENCV
 OPENCV_IMPLIES=		OPENJPEG
@@ -105,8 +104,7 @@ SHL1=		${PORTVERSION:R:R:R}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," \
-	${WRKSRC}/src/cmake/modules/FindPtex.cmake \
-	${WRKSRC}/src/cmake/modules/FindJPEGTurbo.cmake
+	${WRKSRC}/src/cmake/modules/FindPtex.cmake
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 8a355320d328..735fc6e08df2 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690298322
-SHA256 (OpenImageIO-oiio-v2.4.13.0_GH0.tar.gz) = 72b7d2d5edd1049bb7fc09becad4d8be64a9918cdf79bae98b4b32e1fda762cd
-SIZE (OpenImageIO-oiio-v2.4.13.0_GH0.tar.gz) = 32162551
+TIMESTAMP = 1708218927
+SHA256 (AcademySoftwareFoundation-OpenImageIO-v2.5.8.0_GH0.tar.gz) = 02e2e6680d7f2862f2e4fca7c17f61ce01833ed343f79d5b1b1720e411d75f76
+SIZE (AcademySoftwareFoundation-OpenImageIO-v2.5.8.0_GH0.tar.gz) = 52043358
diff --git a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake b/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake
deleted file mode 100644
index 5eaeb68d1380..000000000000
--- a/graphics/openimageio/files/patch-src_cmake_modules_FindJPEGTurbo.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/cmake/modules/FindJPEGTurbo.cmake.orig	2023-01-30 22:36:11 UTC
-+++ src/cmake/modules/FindJPEGTurbo.cmake
-@@ -9,7 +9,8 @@ find_path(JPEG_INCLUDE_DIR turbojpeg.h
- include (FindPackageHandleStandardArgs)
- 
- find_path(JPEG_INCLUDE_DIR turbojpeg.h
--          HINTS /usr/local/opt/jpeg-turbo/include
-+          HINTS /usr/local
-+                %%LOCALBASE%%
-           PATH_SUFFIXES include)
- set(JPEG_NAMES ${JPEG_NAMES} jpeg libjpeg turbojpeg libturbojpeg)
- 
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index c2854c55622e..1b159cfef4e7 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -15,6 +15,7 @@ include/OpenImageIO/color.h
 include/OpenImageIO/dassert.h
 include/OpenImageIO/deepdata.h
 include/OpenImageIO/detail/farmhash.h
+include/OpenImageIO/detail/fmt/chrono.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 90cf0342bb59..1e173e9fc75f 100644
--- a/graphics/py-openimageio/Makefile
+++ b/graphics/py-openimageio/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}