diff options
Diffstat (limited to 'openexr3.patch')
| -rw-r--r-- | openexr3.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/openexr3.patch b/openexr3.patch deleted file mode 100644 index a60f5f99bab6..000000000000 --- a/openexr3.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake -index 090f80b8df7..a2f7b4c622b 100644 ---- a/build_files/cmake/Modules/FindOpenEXR.cmake -+++ b/build_files/cmake/Modules/FindOpenEXR.cmake -@@ -34,11 +34,10 @@ ENDIF() - SET(_openexr_libs_ver_init "2.0") - - SET(_openexr_FIND_COMPONENTS -- Half - Iex -- IlmImf -- IlmThread - Imath -+ OpenEXR -+ IlmThread - ) - - SET(_openexr_SEARCH_DIRS -@@ -120,7 +119,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG - IF(OPENEXR_FOUND) - SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES}) - # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :( -- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR) -+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath) - ENDIF() - - MARK_AS_ADVANCED( -diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp -index a254111e489..50aa6d784f6 100644 ---- a/source/blender/imbuf/intern/openexr/openexr_api.cpp -+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp -@@ -37,10 +37,12 @@ - #include <ImfVersion.h> - #include <ImathBox.h> - #include <ImfArray.h> -+#include <ImfFrameBuffer.h> - #include <ImfIO.h> - #include <ImfChannelList.h> - #include <ImfPixelType.h> - #include <ImfInputFile.h> -+#include <ImfInt64.h> - #include <ImfOutputFile.h> - #include <ImfCompression.h> - #include <ImfCompressionAttribute.h> -diff --git a/source/blender/alembic/intern/abc_transform.cc b/source/blender/alembic/intern/abc_transform.cc -index 68eb1652210..679f3deaf8c 100644 ---- a/source/blender/alembic/intern/abc_transform.cc -+++ b/source/blender/alembic/intern/abc_transform.cc -@@ -16,7 +16,7 @@ - - #include "abc_transform.h" - --#include <OpenEXR/ImathBoxAlgo.h> -+#include <Imath/ImathBoxAlgo.h> - - #include "abc_util.h" - |