- Update to 1.2.2.

- Fix build with libc++.
- Support staging.
- Move bits from py-openimageio to openimageio.

PR:		ports/182007
Submitted by:	Shane Ambler <FreeBSD@ShaneWare.Biz> (maintainer)

6 files changed, 70 insertions, 39 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 9370e22be547..ef2b24d03f31 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,63 +1,59 @@
 # Created by: Shane Ambler <FreeBSD@Shaneware.biz>
 # $FreeBSD$
 
-PORTNAME?=	openimageio
-PORTVERSION=	1.2.1
-PORTREVISION?=	1
+PORTNAME=	openimageio
+PORTVERSION=	1.2.2
+PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
-MAINTAINER=	FreeBSD@Shaneware.biz
-COMMENT=	OpenImageIO graphics library
+MAINTAINER?=	FreeBSD@Shaneware.biz
+COMMENT?=	OpenImageIO graphics library
 
-LICENSE?=	BSD
-
-LIB_DEPENDS?=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libhdf5.so:${PORTSDIR}/science/hdf5-18 \
-		libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
-		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \
-		libwebp.so:${PORTSDIR}/graphics/webp
+LICENSE=	BSD
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 GH_TAGNAME=	Release-${PORTVERSION}
-GH_COMMIT=	f7908a3
+GH_COMMIT=	f9d8f1b
 WRKSRC=		${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src
 
 # fbm also installs bin/idiff
 CONFLICTS=	fbm-[0-9]*
 
 USES=		cmake:outsource
-CMAKE_ARGS?=	-DBUILDSTATIC:BOOL=OFF \
+CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DLINKSTATIC:BOOL=OFF \
 		-DNOTHREADS:BOOL=OFF \
 		-DUSE_TBB:BOOL=OFF \
 		-DSTOP_ON_WARNING:BOOL=OFF
 
-USE_LDCONFIG=	yes
-
-.if defined(OIIO_PYBIND)
-PLIST=		${PKGDIR}/pkg-plist-pybind
-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON
-CMAKE_ARGS+=	-DOIIO_BUILD_TOOLS:BOOL=OFF
-.else
-PLIST=		${PKGDIR}/pkg-plist
-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF
-CMAKE_ARGS+=	-DOIIO_BUILD_TOOLS:BOOL=ON
-.endif
-
-.if !defined(OIIO_PYBIND)
 OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO
-OPTIONS_DEFAULT=	DOCS IMAGEVIEWER OCIO
+OPTIONS_DEFAULT=	IMAGEVIEWER OCIO
+OPTIONS_SUB=		yes
 
 IMAGEVIEWER_DESC=	Build image viewer
 OCIO_DESC=		Colour management support
-.endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+.if ${SLAVE_PORT} == no
+LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
+		libhdf5.so:${PORTSDIR}/science/hdf5-18 \
+		libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
+		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \
+		libwebp.so:${PORTSDIR}/graphics/webp
+USE_LDCONFIG=	yes
+CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON
+.else
+LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
+		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+USE_PYTHON=	2.6+
+PLIST=		${PKGDIR}/pkg-plist-pybind
+CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=ON
 .else
@@ -69,22 +65,20 @@ 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
 CMAKE_ENV+=	QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR}
-PLIST_SUB+=	IMAGEVIEWER=""
 .else
 CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
-PLIST_SUB+=	IMAGEVIEWER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOCIO}
 CMAKE_ARGS+=	-DUSE_OCIO:BOOL=ON
-LIB_DEPENDS+=	OpenColorIO:${PORTSDIR}/graphics/opencolorio
+LIB_DEPENDS+=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
 .else
 CMAKE_ARGS+=	-DUSE_OCIO:BOOL=OFF
 .endif
 
 post-install:
-.if !defined(OIIO_PYBIND)
-	cd ${PREFIX}/lib && ${LN} -sf libOpenImageIO.so.1.2 libOpenImageIO.so.1
+.if ${SLAVE_PORT} == no
+	${LN} -sf libOpenImageIO.so.1.2 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index ff1a14c747e5..ac5726f69e5c 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openimageio-1.2.1.tar.gz) = 030f4247c2c2a576f5611989bf656baf502f3bfaeb6e9ae37f3b5d3a5e5c97b7
-SIZE (openimageio-1.2.1.tar.gz) = 12380093
+SHA256 (openimageio-1.2.2.tar.gz) = 85891b3cac5bcc724ec42b1f46ff990f84ecc3887dd04743ad38961efacf2414
+SIZE (openimageio-1.2.2.tar.gz) = 12383666
diff --git a/graphics/openimageio/files/patch-include_pugixml.hpp b/graphics/openimageio/files/patch-include_pugixml.hpp
new file mode 100644
index 000000000000..18e09b1658e1
--- /dev/null
+++ b/graphics/openimageio/files/patch-include_pugixml.hpp
@@ -0,0 +1,25 @@
+--- include/pugixml.hpp.orig	2013-09-30 19:25:21.000000000 +0200
++++ include/pugixml.hpp	2013-10-27 20:41:36.000000000 +0100
+@@ -27,22 +27,6 @@
+ {
+ 	struct bidirectional_iterator_tag;
+ 
+-#ifdef __SUNPRO_CC
+-	// Sun C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions
+-	template <class _T> class allocator;
+-	template <class _charT> struct char_traits;
+-	template <class _charT, class _Traits> class basic_istream;
+-	template <class _charT, class _Traits> class basic_ostream;
+-	template <class _charT, class _Traits, class _Allocator> class basic_string;
+-#else
+-	// Borland C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions
+-	template <class _Ty> class allocator;
+-	template <class _Ty> struct char_traits;
+-	template <class _Elem, class _Traits> class basic_istream;
+-	template <class _Elem, class _Traits> class basic_ostream;
+-	template <class _Elem, class _Traits, class _Ax> class basic_string;
+-#endif
+-
+ 	// Digital Mars compiler has a bug which requires a forward declaration for explicit instantiation (otherwise type selection is messed up later, producing link errors)
+ 	// Also note that we have to declare char_traits as a class here, since it's defined that way
+ #ifdef __DMC__
diff --git a/graphics/openimageio/files/patch-include_sysutil.h b/graphics/openimageio/files/patch-include_sysutil.h
new file mode 100644
index 000000000000..13e52b9b65a5
--- /dev/null
+++ b/graphics/openimageio/files/patch-include_sysutil.h
@@ -0,0 +1,10 @@
+--- include/sysutil.h.orig	2013-09-24 15:26:10.604215091 +0930
++++ include/sysutil.h	2013-09-24 15:26:16.727214989 +0930
+@@ -41,6 +41,7 @@
+ #define OPENIMAGEIO_SYSUTIL_H
+ 
+ #include <string>
++#include <time.h>
+ 
+ #ifdef __MINGW32__
+ #include <malloc.h> // for alloca
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index c6ca46d3ed13..b2166749717c 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -39,7 +39,7 @@ include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
 lib/libOpenImageIO.so.1.2
-lib/libOpenImageIO.so.1.2.1
+lib/libOpenImageIO.so.1.2.2
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
diff --git a/graphics/openimageio/pkg-plist-pybind b/graphics/openimageio/pkg-plist-pybind
index b649adc8a98e..dfe8fd994b86 100644
--- a/graphics/openimageio/pkg-plist-pybind
+++ b/graphics/openimageio/pkg-plist-pybind
@@ -1 +1,3 @@
 %%PYTHON_SITELIBDIR%%/OpenImageIO.so
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%