diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2021-06-04 12:31:28 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2021-06-04 18:18:33 -0400 |
| commit | 45053883787874ad515dfcc21faaf2b5b4ccf5fb (patch) | |
| tree | 1cc0b46e70a28ff8bffa22c8727a394f3b0b7c6f /libre/blender/blender-openexr3.patch | |
| parent | 6051e1bb3bcda859daea265c76694c1934d4fdb3 (diff) | |
| download | abslibre-45053883787874ad515dfcc21faaf2b5b4ccf5fb.tar.gz abslibre-45053883787874ad515dfcc21faaf2b5b4ccf5fb.tar.bz2 abslibre-45053883787874ad515dfcc21faaf2b5b4ccf5fb.zip | |
[blender]: upgrade to v2.93.0
Diffstat (limited to 'libre/blender/blender-openexr3.patch')
| -rw-r--r-- | libre/blender/blender-openexr3.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/blender/blender-openexr3.patch b/libre/blender/blender-openexr3.patch new file mode 100644 index 000000000..73a727a3d --- /dev/null +++ b/libre/blender/blender-openexr3.patch @@ -0,0 +1,42 @@ +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 382d86f2645..eff50b19c31 100644 +--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp ++++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp +@@ -38,8 +38,10 @@ + #include <ImfChannelList.h> + #include <ImfCompression.h> + #include <ImfCompressionAttribute.h> ++#include <ImfFrameBuffer.h> + #include <ImfIO.h> + #include <ImfInputFile.h> ++#include <ImfInt64.h> + #include <ImfOutputFile.h> + #include <ImfPixelType.h> + #include <ImfStandardAttributes.h> |