- Update to 1.0.6

- Convert to new options framework
- Make DOCS options default to on, as per maintainer request

PR:		ports/169288
Submitted by:	Shane Ambler <FreeBSD@Shaneware.biz>
Approved by:	crees (mentor)

5 files changed, 17 insertions, 47 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index a4b059282eab..e0b677c594af 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openimageio
-PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTVERSION=	1.0.6
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
 DISTNAME=	Release-${PORTVERSION}
@@ -19,13 +18,13 @@ COMMENT=	OpenImageIO graphics library
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
+		boost_thread:${PORTSDIR}/devel/boost-libs \
 		hdf5:${PORTSDIR}/science/hdf5 \
-		opencv_legacy.2:${PORTSDIR}/graphics/opencv \
+		opencv_legacy:${PORTSDIR}/graphics/opencv \
 		openjpeg:${PORTSDIR}/graphics/openjpeg \
-		tbb.4:${PORTSDIR}/devel/tbb \
-		webp.2:${PORTSDIR}/graphics/webp
+		tbb:${PORTSDIR}/devel/tbb \
+		webp:${PORTSDIR}/graphics/webp
 
 FETCH_ARGS=	-pRr
 USE_CMAKE=	yes
@@ -37,19 +36,21 @@ CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DUSE_TBB:BOOL=ON
 LDFLAGS+=	-ltbb
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/OpenImageIO-oiio-2388ebf/src
+WRKSRC=		${WRKDIR}/OpenImageIO-oiio-f0a566a/src
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	IMAGEVIEWER "Build image viewer" on \
-		NOTHREADS "Disable thread support" off
+OPTIONS_DEFINE=	IMAGEVIEWER THREADS
+OPTIONS_DEFAULT=	DOCS IMAGEVIEWER THREADS
+
+IMAGEVIEWER_DESC=	Build image viewer
 
 .include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
 .endif
 
-.if defined(WITH_IMAGEVIEWER)
+.if ${PORT_OPTIONS:MIMAGEVIEWER}
 USE_GL=		glew
 USE_QT4=	corelib gui opengl qmake_build moc_build rcc_build uic_build
 CMAKE_ARGS+=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
@@ -60,7 +61,7 @@ CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
 PLIST_SUB+=	IMAGEVIEWER="@comment "
 .endif
 
-.if defined(WITH_NOTHREADS)
+.if empty(PORT_OPTIONS:MTHREADS)
 CMAKE_ARGS+=	-DNOTHREADS:BOOL=ON
 .else
 CMAKE_ARGS+=	-DNOTHREADS:BOOL=OFF
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 696f59061b05..b04594f5f5c7 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openimageio/Release-1.0.3) = 44408cf458554c3969a3a4335019373bdf27f40388cfff0b051ccf9ea464a459
-SIZE (openimageio/Release-1.0.3) = 4158972
+SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e
+SIZE (openimageio/Release-1.0.6) = 4196479
diff --git a/graphics/openimageio/files/patch-src_iv_imageviewer.cpp b/graphics/openimageio/files/patch-src_iv_imageviewer.cpp
deleted file mode 100644
index ebf592bd8e59..000000000000
--- a/graphics/openimageio/files/patch-src_iv_imageviewer.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- iv/imageviewer.cpp.orig	2012-04-17 17:04:57.000000000 +0930
-+++ iv/imageviewer.cpp	2012-04-17 17:05:43.000000000 +0930
-@@ -49,6 +49,11 @@
- #include "sysutil.h"
- #include "filesystem.h"
- 
-+#if !defined(log2f)
-+
-+inline float log2f(float x) {return logf(x)*(float)1.4426950408889634;}
-+
-+#endif /* log2f */
- 
- namespace
- {
diff --git a/graphics/openimageio/files/patch-src_ptex.imageio_ptex_Ptexture.h b/graphics/openimageio/files/patch-src_ptex.imageio_ptex_Ptexture.h
deleted file mode 100644
index eca1279958ec..000000000000
--- a/graphics/openimageio/files/patch-src_ptex.imageio_ptex_Ptexture.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- ptex.imageio/ptex/Ptexture.h.orig	2012-03-30 22:01:12.000000000 +1030
-+++ ptex.imageio/ptex/Ptexture.h	2012-03-30 22:01:35.000000000 +1030
-@@ -41,6 +41,14 @@
-   @brief Public API classes for reading, writing, caching, and filtering Ptex files.
- */
- 
-+#include "fmath.h"
-+
-+#if !defined(log2)
-+
-+inline double log2(double x) {return log(x)*(double)1.4426950408889634;}
-+
-+#endif /* log2 */
-+
- #if defined(_WIN32) || defined(_WINDOWS) || defined(_MSC_VER)
- # ifndef PTEXAPI
- #  ifndef PTEX_STATIC
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index ae44ca36251e..de3b056be333 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -60,7 +60,7 @@ include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
 lib/libOpenImageIO.so.1.0
-lib/libOpenImageIO.so.1.0.3
+lib/libOpenImageIO.so.1.0.6
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf