pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/opencolorio opencolorio: Unbreak with latest ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b689d992d809
branches:  trunk
changeset: 458131:b689d992d809
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Sep 10 12:21:57 2021 +0000

description:
opencolorio: Unbreak with latest yaml-cpp

diffstat:

 graphics/opencolorio/distinfo                            |   4 ++--
 graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp |  15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 0da1b33109f2 -r b689d992d809 graphics/opencolorio/distinfo
--- a/graphics/opencolorio/distinfo     Fri Sep 10 12:09:27 2021 +0000
+++ b/graphics/opencolorio/distinfo     Fri Sep 10 12:21:57 2021 +0000
@@ -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 -r 0da1b33109f2 -r b689d992d809 graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp
--- a/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp  Fri Sep 10 12:09:27 2021 +0000
+++ b/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp  Fri Sep 10 12:21:57 2021 +0000
@@ -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 @@
  #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 ";



Home | Main Index | Thread Index | Old Index