openimageio: updated to 2.2.16

Release 2.2.16
* New UDIM texture name patterns recognized: `%(UDIM)d` is the Houdini
  convention, and `_u##v##` is for Animal Logic's internal renderer.
* When doing color space transforms on images with > 4 channels -- the
  additional channels are now copied unaltered, rather than leaving them
  black.
* FFMpeg: fix some encodings that didn't correctly recognize that they were
  more than 8 bits, or had alpha.
* farmhash.h: Clean up all non-namespaced preprocessor symbols that are set
  by this header and may pollute the caller's symbols.
* Fix crashes on M1 (ARM) based Mac.
* Bug fix: avid divide-by-0 error computing chunk size for invalid image
  sizes.
* `make_texture` (and `maketx` and `oiiotool -otex`) no longer crash if you
  try to make a texture out of a "deep" image; instead it will return an
  error message.
* filesystem.h: Improve exception safety in Filesystem directory iteration.
* Build: Improve finding of OpenJPEG.
* Build: Support for building OIIO with gcc 11.
* Build: Fixes to accommodate Imath 3.1 upcoming changes.
* Build: Finding FFMpeg now correctly detects the version.
* Build: clang + C++17 + LibRaw < 0.20 are mutually incompatible. Detect
  this combination and warn / disable libraw under those conditions.
* Build: Fix CMake behavior for `REQUIRED_DEPS` due to a typo.
* Build: Fixes for detecting and using Ptex, among other things got the
  version wrong.
* Testing: If a feature is disabled, skip its tests rather than reporting
  them as broken.
* CI: Test the combination of clang and C++17.

4 files changed, 16 insertions, 18 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 6d2a2698c42..cea5a85d7d5 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2021/07/08 21:19:47 markd Exp $
+# $NetBSD: Makefile,v 1.77 2021/07/14 17:58:21 adam Exp $
 
-DISTNAME=	oiio-2.2.15.1
+DISTNAME=	oiio-2.2.16.0
 PKGNAME=	${DISTNAME:S/oiio/openimageio/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenImageIO/}
@@ -17,11 +17,12 @@ UNLIMIT_RESOURCES=	datasize virtualsize
 USE_CMAKE=		yes
 USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
+TEST_TARGET=		test
 
 CMAKE_ARGS+=		-DSTOP_ON_WARNING=OFF # Disable -Werror
 CMAKE_ARGS+=		-DBUILD_MISSING_FMT=OFF
 CMAKE_ARGS+=		-DBUILD_MISSING_ROBINMAP=OFF
-CMAKE_ARGS+=		-DUSE_EXTERNAL_PUGIXML=OFF
+CMAKE_ARGS+=		-DUSE_EXTERNAL_PUGIXML=ON
 CMAKE_ARGS+=		-DUSE_PYTHON:BOOL=OFF
 CMAKE_ARGS+=		-DROBINMAP_INCLUDE_DIR=${BUILDLINK_PREFIX.robin-map}/include
 CMAKE_ARGS+=		-DOpenJpeg_ROOT=${BUILDLINK_PREFIX.openjpeg}
@@ -57,6 +58,7 @@ pre-configure:
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/robin-map/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/libheif/buildlink3.mk"
 .include "../../graphics/libraw/buildlink3.mk"
@@ -64,9 +66,8 @@ pre-configure:
 .include "../../graphics/opencolorio/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
 .include "../../parallel/threadingbuildingblocks/buildlink3.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openimageio/PLIST b/graphics/openimageio/PLIST
index c7f88c2ec0d..69a61b2fb57 100644
--- a/graphics/openimageio/PLIST
+++ b/graphics/openimageio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2021/07/08 21:19:47 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/07/14 17:58:21 adam Exp $
 bin/iconvert
 bin/idiff
 bin/igrep
@@ -20,9 +20,6 @@ include/OpenImageIO/detail/fmt/format-inl.h
 include/OpenImageIO/detail/fmt/format.h
 include/OpenImageIO/detail/fmt/ostream.h
 include/OpenImageIO/detail/fmt/printf.h
-include/OpenImageIO/detail/pugixml/pugiconfig.hpp
-include/OpenImageIO/detail/pugixml/pugixml.cpp
-include/OpenImageIO/detail/pugixml/pugixml.hpp
 include/OpenImageIO/errorhandler.h
 include/OpenImageIO/export.h
 include/OpenImageIO/filesystem.h
@@ -67,10 +64,10 @@ lib/cmake/OpenImageIO/OpenImageIOTargets-release.cmake
 lib/cmake/OpenImageIO/OpenImageIOTargets.cmake
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.2.2
-lib/libOpenImageIO.so.2.2.15
+lib/libOpenImageIO.so.2.2.16
 lib/libOpenImageIO_Util.so
 lib/libOpenImageIO_Util.so.2.2
-lib/libOpenImageIO_Util.so.2.2.15
+lib/libOpenImageIO_Util.so.2.2.16
 lib/pkgconfig/OpenImageIO.pc
 share/cmake/Modules/FindOpenImageIO.cmake
 share/doc/OpenImageIO/CHANGES-0.x.md
diff --git a/graphics/openimageio/buildlink3.mk b/graphics/openimageio/buildlink3.mk
index 081049b7bad..881ba012bf6 100644
--- a/graphics/openimageio/buildlink3.mk
+++ b/graphics/openimageio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.53 2021/07/08 21:19:47 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.54 2021/07/14 17:58:21 adam Exp $
 
 BUILDLINK_TREE+=	openimageio
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openimageio
 OPENIMAGEIO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openimageio+=	openimageio>=1.8.15
-BUILDLINK_ABI_DEPENDS.openimageio?=	openimageio>=2.2.10.1nb2
+BUILDLINK_ABI_DEPENDS.openimageio+=	openimageio>=2.2.10.1nb2
 BUILDLINK_PKGSRCDIR.openimageio?=	../../graphics/openimageio
 
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 04ef84d4d25..1ab6e287207 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2021/07/08 21:19:47 markd Exp $
+$NetBSD: distinfo,v 1.25 2021/07/14 17:58:21 adam Exp $
 
-SHA1 (oiio-2.2.15.1.tar.gz) = cc16950a425ff8ced7810ac70573cc4bccf469f7
-RMD160 (oiio-2.2.15.1.tar.gz) = 6e8072ab24973e5a71c5de5712f8055bbf1872f2
-SHA512 (oiio-2.2.15.1.tar.gz) = a137fe003dc37de0a192fed5f6f354be3fbe543570eefd19f854a8324bee317abbc52e1a520f433194bd481dad22aa315523b65685b94f7f86105fb6870d2f21
-Size (oiio-2.2.15.1.tar.gz) = 29237129 bytes
+SHA1 (oiio-2.2.16.0.tar.gz) = 38fa3811876b0872151f1937d18be7646e6f0b2f
+RMD160 (oiio-2.2.16.0.tar.gz) = c8152a55b50f37a7be0902d03c92810cdf45598b
+SHA512 (oiio-2.2.16.0.tar.gz) = f4919801ade1de1bf4427ffb7f7e36c0a292b1f374b035cec425921fe8df61f7b5c1fbc961884d21ae41a975d7ccc8da884e9404c9f487232c71ec42e6044ea3
+Size (oiio-2.2.16.0.tar.gz) = 29239455 bytes
 SHA1 (patch-src_cmake_compiler.cmake) = 8c06e8e22eb927bbdec288c166a5dc44fbef5acb
 SHA1 (patch-src_libutil_sysutil.cpp) = f828232fed737ede5013e926630e29efa63c8f04