opencolorio: Update to 1.1.1

Changes:

    Added optional compatibility for building apps with OpenImageIO 1.9+
    Added USE_SSE checks to fix Linux build failure
    getDisplays() result ordering now matches the active_displays config
    definition or OCIO_ACTIVE_DISPLAYS env var override.
    Fixed incorrect getDefaultDisplay()/getDefaultView() result when
    OCIO_ACTIVE_DISPLAYS or OCIO_ACTIVE_VIEWS env vars are unset.
    Fixed Windows-specific GetEnv() bug
    Fixed Windows and MacOS CI failure cases
    libc++ build fixes
    Added support for YAML > 5.0.1
    YAML and TinyXML patch fixes
    Clang visibility fix
    Added write support for Truelight LUTs
    Improved OCIOYaml
    Python string corruption fix
    Added support for CDL
    Updated documentation
    Added args/kwargs support to Python MatrixTransform
    Added description field to Look objects
    Improved Python 3 compatibility
    CSP file read fix
    Added Linux, MacOS, and Windows continuos integration
    Improved 1D LUT extrapolation
    Improved 1D LUT negative handling
    Improved Windows build system
    Improved cross-platform build system
    Undefined role crash fix
    After Effects plugin updated
    Added reference Photoshop plugin
    Added reference Docker image

7 files changed, 108 insertions, 31 deletions

diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index ce02f84363c..c43e5962dc3 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/06/02 19:06:55 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/18 22:30:49 nia Exp $
 
-DISTNAME=	OpenColorIO-1.0.9
-PKGREVISION=	1
+DISTNAME=	OpenColorIO-1.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=imageworks/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -15,6 +14,9 @@ USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++11
 
+# C++11
+GCC_REQD+=	4.8
+
 CMAKE_ARGS+=	-DUSE_EXTERNAL_TINYXML:BOOL=ON
 CMAKE_ARGS+=	-DUSE_EXTERNAL_YAML:BOOL=ON
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF
@@ -23,9 +25,12 @@ CMAKE_ARGS+=	-DOCIO_BUILD_PYGLUE:BOOL=OFF
 
 PKGCONFIG_OVERRIDE+=	export/pkgconfig/OpenColorIO.pc.in
 
-BUILDLINK_TRANSFORM+=		rm:-fvisibility=hidden
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/lib/static/*.a ${DESTDIR}${PREFIX}/lib
 
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../textproc/tinyxml/buildlink3.mk"
-.include "../../textproc/yaml-cpp03/buildlink3.mk"
+.include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/opencolorio/PLIST b/graphics/opencolorio/PLIST
index 8a9f63a1f00..f875ef4ad37 100644
--- a/graphics/opencolorio/PLIST
+++ b/graphics/opencolorio/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2018/04/06 03:42:19 maya Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/09/18 22:30:49 nia Exp $
+OpenColorIOConfig.cmake
+cmake/OpenColorIO-relwithdebinfo.cmake
+cmake/OpenColorIO.cmake
 include/OpenColorIO/OpenColorABI.h
 include/OpenColorIO/OpenColorIO.h
 include/OpenColorIO/OpenColorTransforms.h
diff --git a/graphics/opencolorio/buildlink3.mk b/graphics/opencolorio/buildlink3.mk
index 03fd1a25c64..160b73ac9cf 100644
--- a/graphics/opencolorio/buildlink3.mk
+++ b/graphics/opencolorio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/04/06 03:42:19 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/09/18 22:30:49 nia Exp $
 
 BUILDLINK_TREE+=	OpenColorIO
 
@@ -8,9 +8,9 @@ OPENCOLORIO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.OpenColorIO+=	OpenColorIO>=1.0.9
 BUILDLINK_PKGSRCDIR.OpenColorIO?=	../../graphics/opencolorio
 
-#.include "../../graphics/lcms2/buildlink3.mk"
-#.include "../../textproc/tinyxml/buildlink3.mk"
-#.include "../../wip/yaml-cpp03/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../textproc/tinyxml/buildlink3.mk"
+.include "../../textproc/yaml-cpp/buildlink3.mk"
 .endif	# OPENCOLORIO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-OpenColorIO
diff --git a/graphics/opencolorio/distinfo b/graphics/opencolorio/distinfo
index 8db1b3485d7..1facaccae97 100644
--- a/graphics/opencolorio/distinfo
+++ b/graphics/opencolorio/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2018/06/02 19:06:55 joerg Exp $
+$NetBSD: distinfo,v 1.4 2019/09/18 22:30:49 nia Exp $
 
-SHA1 (OpenColorIO-1.0.9.tar.gz) = 45efcc24db8f8830b6892830839da085e19eeb6d
-RMD160 (OpenColorIO-1.0.9.tar.gz) = e079dd69392f01fcf995e25639d6acb42580085e
-SHA512 (OpenColorIO-1.0.9.tar.gz) = ac953ba9904aff44de37cc2ee60dbf524bd86d25f699c1eacaa61ca30fed8f077194d47d34a72c05b706da7e1a3974a988d67d60031d424d91b9240f8ab86ed3
-Size (OpenColorIO-1.0.9.tar.gz) = 13620332 bytes
-SHA1 (patch-export_OpenColorIO_OpenColorABI.h.in) = 3c67e56d12de21f22a2a0e5d750462d73b8315fd
-SHA1 (patch-src_core_Platform.h) = beb7c4945e2f59f7d157e1af0f7f76682dcfee2f
+SHA1 (OpenColorIO-1.1.1.tar.gz) = 511bbea2ad361ee59b067be85544518f7502fe1c
+RMD160 (OpenColorIO-1.1.1.tar.gz) = cf12012c1b2b56789ce92bd0457553cfbdc17895
+SHA512 (OpenColorIO-1.1.1.tar.gz) = bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
+Size (OpenColorIO-1.1.1.tar.gz) = 13828483 bytes
+SHA1 (patch-export_OpenColorIO_OpenColorABI.h.in) = cc1bae24995365513ca16dc41be21a7c52d59b5c
+SHA1 (patch-src_core_OCIOYaml.cpp) = 853b28ad6673cb703c286b88c2f1c0cf1a87cccb
+SHA1 (patch-src_core_Platform.h) = ff731e912354126992e30fbdc2a6ce39da6df082
diff --git a/graphics/opencolorio/patches/patch-export_OpenColorIO_OpenColorABI.h.in b/graphics/opencolorio/patches/patch-export_OpenColorIO_OpenColorABI.h.in
index 3a367633661..42d86c82b21 100644
--- a/graphics/opencolorio/patches/patch-export_OpenColorIO_OpenColorABI.h.in
+++ b/graphics/opencolorio/patches/patch-export_OpenColorIO_OpenColorABI.h.in
@@ -1,27 +1,35 @@
-$NetBSD: patch-export_OpenColorIO_OpenColorABI.h.in,v 1.1 2018/06/02 19:06:55 joerg Exp $
+$NetBSD: patch-export_OpenColorIO_OpenColorABI.h.in,v 1.2 2019/09/18 22:30:49 nia Exp $
 
---- export/OpenColorIO/OpenColorABI.h.in.orig	2018-06-02 18:44:34.294762599 +0000
+--- export/OpenColorIO/OpenColorABI.h.in.orig	2019-03-28 05:12:57.000000000 +0000
 +++ export/OpenColorIO/OpenColorABI.h.in
-@@ -50,17 +50,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- #define OCIO_NAMESPACE_EXIT using namespace OCIO_VERSION_NS; }
- #define OCIO_NAMESPACE_USING using namespace OCIO_NAMESPACE;
+@@ -29,6 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #ifndef INCLUDED_OCIO_OPENCOLORABI_H
+ #define INCLUDED_OCIO_OPENCOLORABI_H
  
 +#include <cstddef>
 +
- // shared_ptr / dynamic_pointer_cast
- #if OCIO_USE_BOOST_PTR
+ // Makefile configuration options
+ #define OCIO_NAMESPACE @OCIO_NAMESPACE@
+ #define OCIO_USE_BOOST_PTR @OCIO_USE_BOOST_PTR@
+@@ -55,20 +57,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  #include <boost/shared_ptr.hpp>
  #define OCIO_SHARED_PTR boost::shared_ptr
  #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
+-#elif defined(_LIBCPP_VERSION)
+-#include <memory>
+-#define OCIO_SHARED_PTR std::shared_ptr
+-#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
 -#elif __GNUC__ >= 4
 -#include <tr1/memory>
 -#define OCIO_SHARED_PTR std::tr1::shared_ptr
 -#define OCIO_DYNAMIC_POINTER_CAST std::tr1::dynamic_pointer_cast
- #else
+-#elif (_MSC_VER > 1600)
++#else
+ #include <memory>
+ #define OCIO_SHARED_PTR std::shared_ptr
+ #define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
+-#else
 -#error OCIO needs gcc 4 or later to get access to <tr1/memory> (or specify USE_BOOST_PTR instead)
-+#include <memory>
-+#define OCIO_SHARED_PTR std::shared_ptr
-+#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
  #endif
  
  // If supported, define OCIOEXPORT, OCIOHIDDEN
diff --git a/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp b/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp
new file mode 100644
index 00000000000..161629435c4
--- /dev/null
+++ b/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp
@@ -0,0 +1,60 @@
+$NetBSD: patch-src_core_OCIOYaml.cpp,v 1.1 2019/09/18 22:30:49 nia Exp $
+
+Description: Fix build with yaml-cpp 0.6
+ One of the changes in yaml-cpp 0.6 was the replacement of some inline
+ virtual functions with out-of-line virtual functions, to ensure a
+ single definition of the relevant vtable.
+ .
+ Unfortunately, OpenColorIO forward-declares these classes with a different
+ GCC visibility attribute. Now that the key function for the vtables is
+ not inlined into code using yaml-cpp.h that breaks link-time resolution of
+ the vtables.
+Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+Bug: https://github.com/imageworks/OpenColorIO/issues/517
+
+--- src/core/OCIOYaml.cpp.orig	2019-03-28 05:12:57.000000000 +0000
++++ src/core/OCIOYaml.cpp
+@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-#ifndef WIN32
+-
+-// fwd declare yaml-cpp visibility
+-#pragma GCC visibility push(hidden)
+-namespace YAML {
+-    class Exception;
+-    class BadDereference;
+-    class RepresentationException;
+-    class EmitterException;
+-    class ParserException;
+-    class InvalidScalar;
+-    class KeyNotFound;
+-    template <typename T> class TypedKeyNotFound;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
+-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
+-}
+-#pragma GCC visibility pop
+-
+-#endif
+-
+ #ifdef WIN32
+ #pragma warning( push )
+ #pragma warning( disable: 4146 )
diff --git a/graphics/opencolorio/patches/patch-src_core_Platform.h b/graphics/opencolorio/patches/patch-src_core_Platform.h
index 8037329e83c..b1f272bf1bf 100644
--- a/graphics/opencolorio/patches/patch-src_core_Platform.h
+++ b/graphics/opencolorio/patches/patch-src_core_Platform.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_core_Platform.h,v 1.1 2018/04/06 03:42:19 maya Exp $
+$NetBSD: patch-src_core_Platform.h,v 1.2 2019/09/18 22:30:49 nia Exp $
 
 No alloca on netbsd, too
 
---- src/core/Platform.h.orig	2013-10-08 22:59:34.000000000 +0000
+--- src/core/Platform.h.orig	2019-03-28 05:12:57.000000000 +0000
 +++ src/core/Platform.h
 @@ -85,7 +85,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ // assume linux/unix/posix
  
- // linux/unix/posix
  #include <stdlib.h>
 -#if !defined(__FreeBSD__)
 +#if !defined(__FreeBSD__) && !defined(__NetBSD__)