diff options
| author | nia <nia@pkgsrc.org> | 2021-09-10 12:21:57 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-09-10 12:21:57 +0000 |
| commit | d33729326935a70c3b739ca7ac37404062491ac7 (patch) | |
| tree | d100f2182e1dd967e5da3e3c056f98fc7f9a62b5 | |
| parent | 49effd6ef6ded4e536d79a22cdacf9a248e4104c (diff) | |
| download | pkgsrc-d33729326935a70c3b739ca7ac37404062491ac7.tar.gz | |
opencolorio: Unbreak with latest yaml-cpp
| -rw-r--r-- | graphics/opencolorio/distinfo | 4 | ||||
| -rw-r--r-- | graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/graphics/opencolorio/distinfo b/graphics/opencolorio/distinfo index 1facaccae97..378fb397ce5 100644 --- a/graphics/opencolorio/distinfo +++ b/graphics/opencolorio/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2019/09/18 22:30:49 nia Exp $ +$NetBSD: distinfo,v 1.5 2021/09/10 12:21:57 nia Exp $ 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_OCIOYaml.cpp) = b471f546ebaea375ee28ad3b690b39221f3737ff SHA1 (patch-src_core_Platform.h) = ff731e912354126992e30fbdc2a6ce39da6df082 diff --git a/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp b/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp index 161629435c4..e629643be2c 100644 --- a/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp +++ b/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-src_core_OCIOYaml.cpp,v 1.1 2019/09/18 22:30:49 nia Exp $ +$NetBSD: patch-src_core_OCIOYaml.cpp,v 1.2 2021/09/10 12:21:57 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 @@ -58,3 +58,16 @@ Bug: https://github.com/imageworks/OpenColorIO/issues/517 #ifdef WIN32 #pragma warning( push ) #pragma warning( disable: 4146 ) +@@ -1439,11 +1402,7 @@ OCIO_NAMESPACE_ENTER + + // check profile version + int profile_version = 0; +-#ifdef OLDYAML +- if(node.FindValue("ocio_profile_version") == NULL) +-#else +- if(node["ocio_profile_version"] == NULL) +-#endif ++ if(!node["ocio_profile_version"].IsDefined()) + { + std::ostringstream os; + os << "The specified file "; |