diff options
| -rw-r--r-- | testing/opencolorio/OpenColorIO-gcc.patch | 81 | ||||
| -rw-r--r-- | testing/opencolorio/ocio-1.1.0-yamlcpp060.patch | 46 |
2 files changed, 127 insertions, 0 deletions
diff --git a/testing/opencolorio/OpenColorIO-gcc.patch b/testing/opencolorio/OpenColorIO-gcc.patch new file mode 100644 index 00000000000..de05849f283 --- /dev/null +++ b/testing/opencolorio/OpenColorIO-gcc.patch @@ -0,0 +1,81 @@ +From f39552d70098a98f7c1fb3b4f020b550ce2dd75a Mon Sep 17 00:00:00 2001 +From: Patrick Hodoul <patrick.hodoul@autodesk.com> +Date: Mon, 27 Nov 2017 17:29:57 -0500 +Subject: [PATCH] Fix Linux compilation Fix gcc 5.4.0 build breaks Fix the temp + filename for Linux + +--- + src/core/Lut1DOp.cpp | 4 +++- + src/core/MathUtils.cpp | 23 ++++++++++++----------- + src/pyglue/PyAllocationTransform.cpp | 1 - + 3 files changed, 15 insertions(+), 13 deletions(-) + +--- a/src/core/Lut1DOp.cpp ++++ b/src/core/Lut1DOp.cpp +@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER + { + return simple_lut[clamp(index, 0.0f, maxIndex)]; + } +- ++ ++#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE) + void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut) + { + float maxIndex[3]; +@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER + rgbaBuffer += 4; + } + } ++#endif + #ifdef USE_SSE + void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut) + { +--- a/src/core/MathUtils.cpp ++++ b/src/core/MathUtils.cpp +@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER + GetV4Sum(vout, vout, v2); + } + +- namespace +- { +- +- void GetMxbResult(float* vout, float* m, float* x, float* v) +- { +- GetM44V4Product(vout, m, x); +- GetV4Sum(vout, vout, v); +- } +- +- } // anon namespace +- + bool GetMxbInverse(float* mout, float* vout, + const float* m_, const float* v_) + { +@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING + + #include "UnitTest.h" + ++namespace ++{ ++ ++ void GetMxbResult(float* vout, float* m, float* x, float* v) ++ { ++ GetM44V4Product(vout, m, x); ++ GetV4Sum(vout, vout, v); ++ } ++ ++} ++ ++ + OIIO_ADD_TEST(MathUtils, M44_is_diagonal) + { + { +--- a/src/pyglue/PyAllocationTransform.cpp ++++ b/src/pyglue/PyAllocationTransform.cpp +@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER + /// + + int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds); +- PyObject * PyOCIO_AllocationTransform_equals(PyObject * self, PyObject * args); + PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self); + PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self, PyObject * args); + PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self); diff --git a/testing/opencolorio/ocio-1.1.0-yamlcpp060.patch b/testing/opencolorio/ocio-1.1.0-yamlcpp060.patch new file mode 100644 index 00000000000..899ffa7cc0d --- /dev/null +++ b/testing/opencolorio/ocio-1.1.0-yamlcpp060.patch @@ -0,0 +1,46 @@ +--- 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 ) |