Merge branch 'lm_openexr_patch'

This commit is contained in:
Lukas Matena 2023-06-07 13:47:36 +02:00
commit e035aa8225
4 changed files with 34 additions and 1 deletions

View File

@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
DEPENDS ${ZLIB_PKG} DEPENDS ${ZLIB_PKG}
GIT_TAG v2.5.5 GIT_TAG v2.5.5
PATCH_COMMAND COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF
@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
if (MSVC) if (MSVC)
add_debug_dep(dep_OpenEXR) add_debug_dep(dep_OpenEXR)
endif () endif ()

30
deps/OpenEXR/OpenEXR.patch vendored Normal file
View File

@ -0,0 +1,30 @@
--- ../OpenEXR-orig/OpenEXR/IlmImf/ImfDwaCompressor.cpp 2021-02-12 17:56:19.000000000 +0100
+++ ./OpenEXR/IlmImf/ImfDwaCompressor.cpp 2023-06-01 13:21:32.666695400 +0200
@@ -159,6 +159,7 @@
#include <limits>
#include <cstddef>
+#include <cstdint>
// Windows specific addition to prevent the indirect import of the redefined min/max macros
--- ../OpenEXR-orig/OpenEXR/IlmImf/ImfHuf.cpp 2021-02-12 17:56:19.000000000 +0100
+++ ./OpenEXR/IlmImf/ImfHuf.cpp 2023-06-01 13:21:53.018583400 +0200
@@ -53,6 +53,7 @@
#include <cstring>
#include <cassert>
#include <algorithm>
+#include <cstdint>
using namespace std;
--- ../OpenEXR-orig/OpenEXR/IlmImf/ImfMisc.cpp 2021-02-12 17:56:19.000000000 +0100
+++ ./OpenEXR/IlmImf/ImfMisc.cpp 2023-06-01 13:22:15.777480000 +0200
@@ -40,6 +40,7 @@
//
//-----------------------------------------------------------------------------
+#include <cstdint>
#include <ImfMisc.h>
#include <ImfHeader.h>
#include <ImfAttribute.h>

View File

@ -5,6 +5,7 @@
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <cstdint>
namespace Slic3r { namespace Slic3r {

View File

@ -4,6 +4,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <istream> #include <istream>
#include <cstdint>
namespace Slic3r { namespace png { namespace Slic3r { namespace png {