Fri Sep 10 12:21:57 2021 UTC ()
opencolorio: Unbreak with latest yaml-cpp


(nia)
diff -r1.4 -r1.5 pkgsrc/graphics/opencolorio/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp
cvs diff -r1.4 -r1.5 pkgsrc/graphics/opencolorio/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencolorio/distinfo 2019/09/18 22:30:49 1.4
+++ pkgsrc/graphics/opencolorio/distinfo 2021/09/10 12:21:57 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2019/09/18 22:30:49 nia Exp $ 1$NetBSD: distinfo,v 1.5 2021/09/10 12:21:57 nia Exp $
2 2
3SHA1 (OpenColorIO-1.1.1.tar.gz) = 511bbea2ad361ee59b067be85544518f7502fe1c 3SHA1 (OpenColorIO-1.1.1.tar.gz) = 511bbea2ad361ee59b067be85544518f7502fe1c
4RMD160 (OpenColorIO-1.1.1.tar.gz) = cf12012c1b2b56789ce92bd0457553cfbdc17895 4RMD160 (OpenColorIO-1.1.1.tar.gz) = cf12012c1b2b56789ce92bd0457553cfbdc17895
5SHA512 (OpenColorIO-1.1.1.tar.gz) = bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33 5SHA512 (OpenColorIO-1.1.1.tar.gz) = bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
6Size (OpenColorIO-1.1.1.tar.gz) = 13828483 bytes 6Size (OpenColorIO-1.1.1.tar.gz) = 13828483 bytes
7SHA1 (patch-export_OpenColorIO_OpenColorABI.h.in) = cc1bae24995365513ca16dc41be21a7c52d59b5c 7SHA1 (patch-export_OpenColorIO_OpenColorABI.h.in) = cc1bae24995365513ca16dc41be21a7c52d59b5c
8SHA1 (patch-src_core_OCIOYaml.cpp) = 853b28ad6673cb703c286b88c2f1c0cf1a87cccb 8SHA1 (patch-src_core_OCIOYaml.cpp) = b471f546ebaea375ee28ad3b690b39221f3737ff
9SHA1 (patch-src_core_Platform.h) = ff731e912354126992e30fbdc2a6ce39da6df082 9SHA1 (patch-src_core_Platform.h) = ff731e912354126992e30fbdc2a6ce39da6df082
cvs diff -r1.1 -r1.2 pkgsrc/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp 2019/09/18 22:30:49 1.1
+++ pkgsrc/graphics/opencolorio/patches/patch-src_core_OCIOYaml.cpp 2021/09/10 12:21:57 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-src_core_OCIOYaml.cpp,v 1.1 2019/09/18 22:30:49 nia Exp $ 1$NetBSD: patch-src_core_OCIOYaml.cpp,v 1.2 2021/09/10 12:21:57 nia Exp $
2 2
3Description: Fix build with yaml-cpp 0.6 3Description: Fix build with yaml-cpp 0.6
4 One of the changes in yaml-cpp 0.6 was the replacement of some inline 4 One of the changes in yaml-cpp 0.6 was the replacement of some inline
5 virtual functions with out-of-line virtual functions, to ensure a 5 virtual functions with out-of-line virtual functions, to ensure a
6 single definition of the relevant vtable. 6 single definition of the relevant vtable.
7 . 7 .
8 Unfortunately, OpenColorIO forward-declares these classes with a different 8 Unfortunately, OpenColorIO forward-declares these classes with a different
9 GCC visibility attribute. Now that the key function for the vtables is 9 GCC visibility attribute. Now that the key function for the vtables is
10 not inlined into code using yaml-cpp.h that breaks link-time resolution of 10 not inlined into code using yaml-cpp.h that breaks link-time resolution of
11 the vtables. 11 the vtables.
12Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> 12Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
13Bug: https://github.com/imageworks/OpenColorIO/issues/517 13Bug: https://github.com/imageworks/OpenColorIO/issues/517
14 14
@@ -48,13 +48,26 @@ Bug: https://github.com/imageworks/OpenC @@ -48,13 +48,26 @@ Bug: https://github.com/imageworks/OpenC
48- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>; 48- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
49- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>; 49- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
50- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>; 50- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
51- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>; 51- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
52- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>; 52- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
53-} 53-}
54-#pragma GCC visibility pop 54-#pragma GCC visibility pop
55- 55-
56-#endif 56-#endif
57- 57-
58 #ifdef WIN32 58 #ifdef WIN32
59 #pragma warning( push ) 59 #pragma warning( push )
60 #pragma warning( disable: 4146 ) 60 #pragma warning( disable: 4146 )
 61@@ -1439,11 +1402,7 @@ OCIO_NAMESPACE_ENTER
 62
 63 // check profile version
 64 int profile_version = 0;
 65-#ifdef OLDYAML
 66- if(node.FindValue("ocio_profile_version") == NULL)
 67-#else
 68- if(node["ocio_profile_version"] == NULL)
 69-#endif
 70+ if(!node["ocio_profile_version"].IsDefined())
 71 {
 72 std::ostringstream os;
 73 os << "The specified file ";