- Update to version 1.5.16

OpenImageIO 1.5 comes with many new features and bug fixes:
* lots of new functions for image handling (API and command line tools),
  such as rotations, median filters, matrix transformations
* new filters (cubic, rifman, simon, ...)
* image metadata support (EXIF)
* SIMD (SSE) instruction support to speed up processing images
* basic movie file support via ffmpeg

Changelog: https://github.com/OpenImageIO/oiio/blob/RB-1.5/CHANGES

PR:		200818
Submitted by:	Shane Ambler <FreeBSD@ShaneWare.Biz>

4 files changed, 55 insertions, 17 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 764c3188116b..c6621a4f7b88 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
-PORTVERSION=	1.4.15
+PORTVERSION=	1.5.16
 DISTVERSIONPREFIX=	Release-
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -23,42 +23,63 @@ USES=		cmake:outsource
 CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DLINKSTATIC:BOOL=OFF \
 		-DNOTHREADS:BOOL=OFF \
-		-DSTOP_ON_WARNING:BOOL=OFF
+		-DSTOP_ON_WARNING:BOOL=OFF \
+		-DUSE_CPP11:BOOL=OFF \
+		-DUSE_OPENSSL:BOOL=OFF
+CXXFLAGS+=	-D__STDC_CONSTANT_MACROS
 
-OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO TEST
-OPTIONS_DEFAULT=	OCIO
+OPTIONS_DEFINE=		DOCS FFMPEG GIF IMAGEVIEWER OCIO RAW TEST
+OPTIONS_DEFAULT=	OCIO FFMPEG GIF
 OPTIONS_SUB=		yes
 
+FFMPEG_DESC=		Use ffmpeg to support extra file types
 IMAGEVIEWER_DESC=	Build image viewer
 OCIO_DESC=		Colour management support
 
 DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
 DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
 
+FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
+FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
+FFMPEG_LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+
+GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
+GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
+GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+
 OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
 OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
 OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
 
+RAW_CMAKE_ON=		-DUSE_LIBRAW:BOOL=ON
+RAW_CMAKE_OFF=		-DUSE_LIBRAW:BOOL=OFF
+RAW_LIB_DEPENDS=	libraw_r.so:${PORTSDIR}/graphics/libraw
+
 TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
 TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
 
+PLIST_SUB+=		LIBVERS=${PORTVERSION}
+
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
 		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
 		libwebp.so:${PORTSDIR}/graphics/webp
 USE_LDCONFIG=	yes
-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON
+CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \
+		-DOIIO_BUILD_TOOLS:BOOL=ON
 .else
 LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
 		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
-USES+=		python
 PLIST=		${PKGDIR}/pkg-plist-pybind
-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF
+#while oiio supports py3, ports doesn't have py3 support for boost-python yet
+USES+=		python:2
+CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
+		-DOIIO_BUILD_TOOLS:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MIMAGEVIEWER}
@@ -76,8 +97,8 @@ post-patch:
 
 post-install:
 .if ${SLAVE_PORT} == no
-	${LN} -sf libOpenImageIO.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
-	${LN} -sf libOpenImageIO_Util.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
+	${LN} -sf libOpenImageIO.so.1.5 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
+	${LN} -sf libOpenImageIO_Util.so.1.5 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index dfa15c8a566c..71abb62851f5 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenImageIO-oiio-Release-1.4.15_GH0.tar.gz) = 3554b649b9c3cf4c2d61e419b6d4ab4575000994192464bd0f725a9489f8a816
-SIZE (OpenImageIO-oiio-Release-1.4.15_GH0.tar.gz) = 17551912
+SHA256 (OpenImageIO-oiio-Release-1.5.16_GH0.tar.gz) = 6c676ae5ddc3b2a8f8d37b521c670d8b3f82d1af583801027d44cf61e1550d6b
+SIZE (OpenImageIO-oiio-Release-1.5.16_GH0.tar.gz) = 23136543
diff --git a/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h b/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h
new file mode 100644
index 000000000000..96bcc26416e2
--- /dev/null
+++ b/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h
@@ -0,0 +1,15 @@
+--- src/include/OpenImageIO/simd.h.orig	2015-06-23 11:59:51 UTC
++++ src/include/OpenImageIO/simd.h
+@@ -52,8 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #if (defined(__SSE2__) || (_MSC_VER >= 1300 && !_M_CEE_PURE)) && !defined(OIIO_NO_SSE)
+ #  include <xmmintrin.h>
+ #  include <emmintrin.h>
+-#  if defined(__SSE3__) || defined(__SSSE3__)
++#  if defined(__SSE3__)
+ #    include <pmmintrin.h>
++#  endif
++#  if defined(__SSSE3__)
+ #    include <tmmintrin.h>
+ #  endif
+ #  if (defined(__SSE4_1__) || defined(__SSE4_2__))
+
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index de9ca6c918c9..ee9603b11c16 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -21,6 +21,7 @@ include/OpenImageIO/imagebufalgo_util.h
 include/OpenImageIO/imagebufalgo.h
 include/OpenImageIO/imagecache.h
 include/OpenImageIO/imageio.h
+include/OpenImageIO/missing_math.h
 include/OpenImageIO/oiioversion.h
 include/OpenImageIO/optparser.h
 include/OpenImageIO/osdep.h
@@ -32,6 +33,7 @@ include/OpenImageIO/pugixml.cpp
 include/OpenImageIO/pugixml.hpp
 include/OpenImageIO/refcnt.h
 include/OpenImageIO/SHA1.h
+include/OpenImageIO/simd.h
 include/OpenImageIO/strided_ptr.h
 include/OpenImageIO/string_ref.h
 include/OpenImageIO/string_view.h
@@ -49,12 +51,12 @@ include/OpenImageIO/varyingref.h
 include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
-lib/libOpenImageIO.so.1.4
-lib/libOpenImageIO.so.1.4.15
+lib/libOpenImageIO.so.1.5
+lib/libOpenImageIO.so.%%LIBVERS%%
 lib/libOpenImageIO_Util.so
 lib/libOpenImageIO_Util.so.1
-lib/libOpenImageIO_Util.so.1.4
-lib/libOpenImageIO_Util.so.1.4.15
+lib/libOpenImageIO_Util.so.1.5
+lib/libOpenImageIO_Util.so.%%LIBVERS%%
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf