Fix OpenEXR build with GCC13
This commit is contained in:
parent
58e9996105
commit
fbe776aaaa
2 changed files with 34 additions and 2 deletions
31
deps/OpenEXR/0001-OpenEXR-GCC13.patch
vendored
Normal file
31
deps/OpenEXR/0001-OpenEXR-GCC13.patch
vendored
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
||||||
|
+++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
||||||
|
@@ -159,6 +159,7 @@
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
+#include <cstdint>
|
||||||
|
|
||||||
|
|
||||||
|
// Windows specific addition to prevent the indirect import of the redefined min/max macros
|
||||||
|
--- a/OpenEXR/IlmImf/ImfHuf.h
|
||||||
|
+++ b/OpenEXR/IlmImf/ImfHuf.h
|
||||||
|
@@ -40,6 +40,8 @@
|
||||||
|
#include "ImfExport.h"
|
||||||
|
#include "ImfNamespace.h"
|
||||||
|
|
||||||
|
+#include <cstdint>
|
||||||
|
+
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// 16-bit Huffman compression and decompression:
|
||||||
|
--- a/OpenEXR/IlmImf/ImfMisc.h
|
||||||
|
+++ b/OpenEXR/IlmImf/ImfMisc.h
|
||||||
|
@@ -51,6 +51,7 @@
|
||||||
|
#include "ImfForward.h"
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
+#include <cstdint>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
|
5
deps/OpenEXR/OpenEXR.cmake
vendored
5
deps/OpenEXR/OpenEXR.cmake
vendored
|
@ -2,12 +2,13 @@ bambustudio_add_cmake_project(OpenEXR
|
||||||
# GIT_REPOSITORY https://github.com/openexr/openexr.git
|
# GIT_REPOSITORY https://github.com/openexr/openexr.git
|
||||||
URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
|
URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
|
||||||
URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
|
URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
|
||||||
|
PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OpenEXR-GCC13.patch
|
||||||
DEPENDS ${ZLIB_PKG}
|
DEPENDS ${ZLIB_PKG}
|
||||||
GIT_TAG v2.5.5
|
GIT_TAG v2.5.5
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
||||||
-DBUILD_TESTING=OFF
|
-DBUILD_TESTING=OFF
|
||||||
-DPYILMBASE_ENABLE:BOOL=OFF
|
-DPYILMBASE_ENABLE:BOOL=OFF
|
||||||
-DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
|
-DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
|
||||||
-DOPENEXR_BUILD_UTILS:BOOL=OFF
|
-DOPENEXR_BUILD_UTILS:BOOL=OFF
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue