mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
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>
|