Thursday, December 03, 2020

UPDATE: opencolorio

Merge in a diff to fix building with newer yaml-cpp.

Upstream indicates this bit of code was to workaround a symbol collision
issue if linking with an embedded copy of yaml-cpp but does not matter
for an external copy. Builds fine with yaml-cpp as is.



Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/opencolorio/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 12 Jul 2019 20:47:04 -0000 1.10
+++ Makefile 2 Dec 2020 04:52:21 -0000
@@ -5,7 +5,7 @@ COMMENT = color management library
V = 20140911
DISTNAME = OpenColorIO-$V
PKGNAME = opencolorio-$V
-REVISION = 2
+REVISION = 3

SHARED_LIBS += OpenColorIO 1.0 # 1.0

Index: patches/patch-src_core_OCIOYaml_cpp
===================================================================
RCS file: patches/patch-src_core_OCIOYaml_cpp
diff -N patches/patch-src_core_OCIOYaml_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_OCIOYaml_cpp 2 Dec 2020 04:53:06 -0000
@@ -0,0 +1,51 @@
+$OpenBSD$
+
+Fix the build with newer yaml-cpp.
+
+Index: src/core/OCIOYaml.cpp
+--- src/core/OCIOYaml.cpp.orig
++++ src/core/OCIOYaml.cpp
+@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
+
+ #include <OpenColorIO/OpenColorIO.h>
+
+-#ifndef WINDOWS
+-
+-// 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
+-
+-

No comments:

Post a Comment