graphics/opencolorio: update to a newer github commit

- Add support for FLAVORS.
- Update to commit 67e455b97e - this includes six of our patch files.
  Remove patches as per above
- Add indirect dependancies

PR:		224380
Submitted by:	FreeBSD@ShaneWare.Biz (maintainer)
Changes:	https://github.com/imageworks/OpenColorIO/commits/master

9 files changed, 19 insertions, 111 deletions

diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 8427c3cfa0b3..1c0a663d1fc1 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencolorio
 PORTVERSION=	1.0.9
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -14,10 +14,12 @@ LICENSE=	BSD3CLAUSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	imageworks
 GH_PROJECT=	OpenColorIO
-GH_TAGNAME=	a557a85454
+GH_TAGNAME=	67e455b97e
 
 OPTIONS_DEFINE=	DOCS
 
+DOCS_CMAKE_BOOL=	OCIO_BUILD_DOCS
+
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		alias cmake:outsource pkgconfig shebangfix
 CMAKE_ARGS=	-DOCIO_BUILD_JNIGLUE:BOOL=OFF \
@@ -29,11 +31,11 @@ SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceCPP.py \
 		share/sphinx/ExtractRstFromSourceSimple.py \
 		src/pyglue/createPyDocH.py
 
-#.if ${MACHINE_CPU:Msse2}
-#CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=ON
-#.else
-#CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=OFF
-#.endif
+.if ${MACHINE_CPU:Msse2}
+CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=ON
+.else
+CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=OFF
+.endif
 
 BROKEN_aarch64=		Does not compile: error: use of undeclared identifier __builtin_ia32_emms
 BROKEN_armv6=		Does not compile: error: use of undeclared identifier __builtin_ia32_emms
@@ -45,18 +47,22 @@ BROKEN_sparc64=		Does not compile: error: unrecognized command line option -msse
 .include <bsd.port.options.mk>
 
 .if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
-LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+		libOpenImageIO.so:graphics/openimageio \
 		libOpenColorIO.so:graphics/opencolorio
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=ON \
 		-DOCIO_BUILD_SHARED:BOOL=OFF \
 		-DOCIO_BUILD_PYGLUE:BOOL=OFF
-USE_GL=		glew glut
+USE_GL=		gl glu glut glew
+USE_XORG=	xi xmu
 PLIST=		${PKGDIR}/pkg-plist-tools
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt \
 		${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
 .elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
-LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
+LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
+		libOpenColorIO.so:graphics/opencolorio
 USES+=		python
+USE_PYTHON=	flavors
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
 		-DOCIO_BUILD_SHARED:BOOL=OFF \
 		-DOCIO_BUILD_PYGLUE:BOOL=ON \
@@ -82,12 +88,6 @@ PLIST=		${PKGDIR}/pkg-plist
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_core_CMakeLists.txt
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-CMAKE_ARGS+=	-DOCIO_BUILD_DOCS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DOCIO_BUILD_DOCS:BOOL=OFF
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
 		${WRKSRC}/CMakeLists.txt
diff --git a/graphics/opencolorio/distinfo b/graphics/opencolorio/distinfo
index 8cab04e7fdff..96ed7c988dac 100644
--- a/graphics/opencolorio/distinfo
+++ b/graphics/opencolorio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = ad530a5ed89305d8daaaa93db1a2c5359d82b32ed55c8661cdcda2976173ab94
-SIZE (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = 13741068
+TIMESTAMP = 1474003473
+SHA256 (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = cc932053f9b91c0f8549fe20bbb5d9ebc4c03e0638feac04b16a45dd73c37bc6
+SIZE (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = 13744688
diff --git a/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt b/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt
index 3164d9879fb7..b598b621f1f4 100644
--- a/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt
+++ b/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt
@@ -1,15 +1,5 @@
 --- src/core/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
 +++ src/core/CMakeLists.txt
-@@ -4,8 +4,8 @@
- include_directories(
-     ${CMAKE_SOURCE_DIR}/export/
-     ${CMAKE_BINARY_DIR}/export/
--    ${EXTERNAL_INCLUDE_DIRS}
-     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
-+    ${EXTERNAL_INCLUDE_DIRS}
- )
- 
- file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
 @@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
  configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
      ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
diff --git a/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt b/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt
index b18af8cafbb1..447a1a187675 100644
--- a/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt
+++ b/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt
@@ -1,15 +1,5 @@
 --- src/core/CMakeLists.txt.orig	2014-09-12 04:38:18.000000000 +0930
 +++ src/core/CMakeLists.txt
-@@ -4,8 +4,8 @@
- include_directories(
-     ${CMAKE_SOURCE_DIR}/export/
-     ${CMAKE_BINARY_DIR}/export/
--    ${EXTERNAL_INCLUDE_DIRS}
-     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
-+    ${EXTERNAL_INCLUDE_DIRS}
- )
- 
- file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
 @@ -81,13 +81,3 @@ if(OCIO_BUILD_STATIC)
      install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)
  endif()
diff --git a/graphics/opencolorio/files/patch-docs_CMakeLists.txt b/graphics/opencolorio/files/patch-docs_CMakeLists.txt
index daf9c3cfeb38..f87ba3dcb976 100644
--- a/graphics/opencolorio/files/patch-docs_CMakeLists.txt
+++ b/graphics/opencolorio/files/patch-docs_CMakeLists.txt
@@ -1,24 +1,5 @@
 --- docs/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
 +++ docs/CMakeLists.txt
-@@ -92,11 +92,16 @@ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTransforms.h developers/api/OpenColorTransforms.rst)
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
- 
-+if(OCIO_BUILD_PYGLUE)
-+        set(DEPLIST OpenColorIO PyOpenColorIO)
-+else()
-+        set(DEPLIST OpenColorIO)
-+endif()
-+
- add_custom_target(doc ALL
-     COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-     DEPENDS
--        OpenColorIO
--        PyOpenColorIO
-+        ${DEPLIST}
-         ${CMAKE_BINARY_DIR}/docs/conf.py
-         developers/api/OpenColorIO.rst
-         developers/api/OpenColorTransforms.rst
 @@ -110,12 +115,11 @@ add_custom_target(doc ALL
  add_dependencies(doc Sphinx) 
  
diff --git a/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt b/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt
deleted file mode 100644
index f9fb8324da5d..000000000000
--- a/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/core_tests/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
-+++ src/core_tests/CMakeLists.txt
-@@ -7,8 +7,8 @@ add_definitions("-DOCIO_SOURCE_DIR=${CMA
- include_directories(
-     ${CMAKE_SOURCE_DIR}/export/
-     ${CMAKE_BINARY_DIR}/export/
--    ${EXTERNAL_INCLUDE_DIRS}
-     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
-+    ${EXTERNAL_INCLUDE_DIRS}
-     )
- 
- file( GLOB_RECURSE core_test_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp" )
diff --git a/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt b/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt
deleted file mode 100644
index f1f183dc58ce..000000000000
--- a/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/jniglue/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
-+++ src/jniglue/CMakeLists.txt
-@@ -1,9 +1,9 @@
- 
- include_directories(
--  ${JNI_INCLUDE_DIRS}
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_SOURCE_DIR}/export/
-   ${CMAKE_BINARY_DIR}/export/
-+  ${JNI_INCLUDE_DIRS}
- )
- 
- set(JNIOCIO_CLASSES
diff --git a/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt b/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt
deleted file mode 100644
index e9649f93dc25..000000000000
--- a/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/pyglue/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
-+++ src/pyglue/CMakeLists.txt
-@@ -31,18 +31,18 @@ add_library(PyOpenColorIO MODULE ${pyglu
- 
- if(OCIO_USE_BOOST_PTR)
-     include_directories(
--        ${PYTHON_INCLUDE}
--        ${Boost_INCLUDE_DIR}
-         ${CMAKE_SOURCE_DIR}/export/
-         ${CMAKE_BINARY_DIR}/export/
-         ${CMAKE_CURRENT_BINARY_DIR}
-+        ${PYTHON_INCLUDE}
-+        ${Boost_INCLUDE_DIR}
-     )
- else()
-     include_directories(
--        ${PYTHON_INCLUDE}
-         ${CMAKE_SOURCE_DIR}/export/
-         ${CMAKE_BINARY_DIR}/export/
-         ${CMAKE_CURRENT_BINARY_DIR}
-+        ${PYTHON_INCLUDE}
-     )
- endif()
- 
diff --git a/graphics/opencolorio/pkg-plist-tools b/graphics/opencolorio/pkg-plist-tools
index ae782a755225..3f3b88901ee0 100644
--- a/graphics/opencolorio/pkg-plist-tools
+++ b/graphics/opencolorio/pkg-plist-tools
@@ -3,8 +3,3 @@ bin/ociocheck
 bin/ocioconvert
 bin/ociodisplay
 bin/ociolutimage
-@comment include/OpenColorIO/OpenColorABI.h
-@comment include/OpenColorIO/OpenColorIO.h
-@comment include/OpenColorIO/OpenColorTransforms.h
-@comment include/OpenColorIO/OpenColorTypes.h
-@comment libdata/pkgconfig/OpenColorIO.pc