diff options
| author | bartus | 2021-06-10 17:30:43 +0200 |
|---|---|---|
| committer | bartus | 2021-06-10 17:30:43 +0200 |
| commit | c5e4968454a427f56621e3b946304183f06ac5b6 (patch) | |
| tree | eed603ecca2b7d955e7699595571a236ce39b0df /opencolorio1.patch | |
| parent | 187b91fd00737fd9e4525351588220dcc57133ed (diff) | |
| download | aur-c5e4968454a427f56621e3b946304183f06ac5b6.tar.gz | |
Build against opencolorio1
Diffstat (limited to 'opencolorio1.patch')
| -rw-r--r-- | opencolorio1.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/opencolorio1.patch b/opencolorio1.patch new file mode 100644 index 000000000000..259d04e8cb71 --- /dev/null +++ b/opencolorio1.patch @@ -0,0 +1,74 @@ +diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake +index 090032e06ec..f5db181d73d 100644 +--- a/build_files/cmake/Modules/FindOpenColorIO.cmake ++++ b/build_files/cmake/Modules/FindOpenColorIO.cmake +@@ -28,7 +28,7 @@ IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "") + ENDIF() + + SET(_opencolorio_FIND_COMPONENTS +- OpenColorIO ++ OpenColorIO1 + yaml-cpp + tinyxml + ) +@@ -40,7 +40,7 @@ SET(_opencolorio_SEARCH_DIRS + + FIND_PATH(OPENCOLORIO_INCLUDE_DIR + NAMES +- OpenColorIO/OpenColorIO.h ++ OpenColorIO1/OpenColorIO.h + HINTS + ${_opencolorio_SEARCH_DIRS} + PATH_SUFFIXES +diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc +index 0e25c89f5d7..f1f99de4bd8 100644 +--- a/intern/opencolorio/ocio_impl.cc ++++ b/intern/opencolorio/ocio_impl.cc +@@ -26,7 +26,7 @@ + # pragma warning(push) + # pragma warning(disable : 4251 4275) + #endif +-#include <OpenColorIO/OpenColorIO.h> ++#include <OpenColorIO1/OpenColorIO.h> + #ifdef _MSC_VER + # pragma warning(pop) + #endif +diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc +index df6adc8f34b..24d1ec8a871 100644 +--- a/intern/opencolorio/ocio_impl_glsl.cc ++++ b/intern/opencolorio/ocio_impl_glsl.cc +@@ -40,7 +40,7 @@ + # pragma warning(push) + # pragma warning(disable : 4251 4275) + #endif +-#include <OpenColorIO/OpenColorIO.h> ++#include <OpenColorIO1/OpenColorIO.h> + #ifdef _MSC_VER + # pragma warning(pop) + #endif +diff --git a/intern/cycles/render/colorspace.cpp b/intern/cycles/render/colorspace.cpp +index 7605fcaf5ff..a491dfdf9d5 100644 +--- a/intern/cycles/render/colorspace.cpp ++++ b/intern/cycles/render/colorspace.cpp +@@ -25,7 +25,7 @@ + #include "util/util_vector.h" + + #ifdef WITH_OCIO +-# include <OpenColorIO/OpenColorIO.h> ++# include <OpenColorIO1/OpenColorIO.h> + namespace OCIO = OCIO_NAMESPACE; + #endif + +diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp +index 8403a636e1c..54abe4cfa3c 100644 +--- a/intern/cycles/render/shader.cpp ++++ b/intern/cycles/render/shader.cpp +@@ -35,7 +35,7 @@ + #include "util/util_murmurhash.h" + + #ifdef WITH_OCIO +-# include <OpenColorIO/OpenColorIO.h> ++# include <OpenColorIO1/OpenColorIO.h> + namespace OCIO = OCIO_NAMESPACE; + #endif + |