mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-23 19:25:25 +03:00
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From b5a872ee9c64d5b882019fd3028ea6a458a08513 Mon Sep 17 00:00:00 2001
|
|
From: Leon Marz <main@lmarz.org>
|
|
Date: Sat, 7 Aug 2021 16:01:52 +0000
|
|
Subject: [PATCH 4/5] OpenEXR 3
|
|
|
|
---
|
|
build_files/cmake/Modules/FindOpenEXR.cmake | 5 ++---
|
|
source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 ++
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake
|
|
index 090f80b..4f5e9d8 100644
|
|
--- a/build_files/cmake/Modules/FindOpenEXR.cmake
|
|
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
|
|
@@ -34,9 +34,8 @@ ENDIF()
|
|
SET(_openexr_libs_ver_init "2.0")
|
|
|
|
SET(_openexr_FIND_COMPONENTS
|
|
- Half
|
|
+ OpenEXR
|
|
Iex
|
|
- IlmImf
|
|
IlmThread
|
|
Imath
|
|
)
|
|
@@ -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 382d86f..3e1ab70 100644
|
|
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
|
|
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
|
|
@@ -32,6 +32,8 @@
|
|
#include <stdexcept>
|
|
#include <string>
|
|
|
|
+#include <ImfInt64.h>
|
|
+#include <ImfFrameBuffer.h>
|
|
#include <Iex.h>
|
|
#include <ImathBox.h>
|
|
#include <ImfArray.h>
|
|
--
|
|
2.33.0
|
|
|