c7a8ea7afd
This adds patches that make the thing build with yaml-cpp 0.6 and GCC 8, the latter submitted upstream (the former is a bit too hacky to go upstream as-is), and reverts the changes to try and build with a bundled yaml-cpp. Thanks to Kevin Kofler for helping to figure out both issues.
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
--- OpenColorIO-1.1.0/src/core/OCIOYaml.cpp 2018-01-04 17:38:27.000000000 -0800
|
|
+++ OpenColorIO-1.1.0/src/core/OCIOYaml.cpp.new 2018-02-19 16:37:56.733948242 -0800
|
|
@@ -30,43 +30,6 @@
|
|
|
|
#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 )
|