openexr: backport gcc-13 fix
Without the change `openexr` build on `gcc-13` fails as: [ 99%] Building CXX object src/test/OpenEXRTest/CMakeFiles/OpenEXRTest.dir/testInputPart.cpp.o openexr/src/bin/exrcheck/main.cpp: In function 'bool exrCheck(const char*, bool, bool, bool, bool)': openexr/src/bin/exrcheck/main.cpp:65:15: error: 'uintptr_t' does not name a type 65 | const uintptr_t kMaxSize = uintptr_t (-1) / 4; | ^~~~~~~~~
This commit is contained in:
parent
a16b394543
commit
d55edbca4a
|
@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
|
|||
extraPrefix = "OpenEXR/IlmImf/";
|
||||
sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ=";
|
||||
})
|
||||
|
||||
# Backport gcc-13 fix:
|
||||
# https://github.com/AcademySoftwareFoundation/openexr/pull/1264
|
||||
./gcc-13.patch
|
||||
];
|
||||
|
||||
# tests are determined to use /var/tmp on unix
|
||||
|
|
33
pkgs/development/libraries/openexr/gcc-13.patch
Normal file
33
pkgs/development/libraries/openexr/gcc-13.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
https://github.com/AcademySoftwareFoundation/openexr/pull/1264
|
||||
https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch
|
||||
|
||||
--- 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.cpp
|
||||
+++ b/OpenEXR/IlmImf/ImfHuf.cpp
|
||||
@@ -53,6 +53,7 @@
|
||||
#include <cstring>
|
||||
#include <cassert>
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
|
||||
|
||||
using namespace std;
|
||||
--- a/OpenEXR/IlmImf/ImfMisc.cpp
|
||||
+++ b/OpenEXR/IlmImf/ImfMisc.cpp
|
||||
@@ -52,6 +52,7 @@
|
||||
#include <ImfConvert.h>
|
||||
#include <ImfPartType.h>
|
||||
#include <ImfTileDescription.h>
|
||||
+#include <cstdint>
|
||||
#include "ImfNamespace.h"
|
||||
|
||||
OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
|
Loading…
Reference in a new issue