diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-07-04 18:32:22 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-07-08 14:25:49 -0400 |
| commit | a827495c22e6809c44c2b0a9c2211d89d9274686 (patch) | |
| tree | ed3fb8b82612ffa40d16f0b10b7d825fe031adcc /libre/blender/blender-openexr3.patch | |
| parent | 6e6f68b7b5d94f505d18e7a6ff88d16a4fb0829d (diff) | |
| download | abslibre-a827495c22e6809c44c2b0a9c2211d89d9274686.tar.gz abslibre-a827495c22e6809c44c2b0a9c2211d89d9274686.tar.bz2 abslibre-a827495c22e6809c44c2b0a9c2211d89d9274686.zip | |
[blender]: upgrade to v3.2.0
Diffstat (limited to 'libre/blender/blender-openexr3.patch')
| -rw-r--r-- | libre/blender/blender-openexr3.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/libre/blender/blender-openexr3.patch b/libre/blender/blender-openexr3.patch deleted file mode 100644 index 73a727a3d..000000000 --- a/libre/blender/blender-openexr3.patch +++ /dev/null @@ -1,42 +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 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> |