pyrox.dev
lol
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;
| ^~~~~~~~~
+4
pkgs/development/libraries/openexr/default.nix
+4
pkgs/development/libraries/openexr/default.nix
···
35
35
extraPrefix = "OpenEXR/IlmImf/";
36
36
sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ=";
37
37
})
38
+
39
+
# Backport gcc-13 fix:
40
+
# https://github.com/AcademySoftwareFoundation/openexr/pull/1264
41
+
./gcc-13.patch
38
42
];
39
43
40
44
# tests are determined to use /var/tmp on unix
+33
pkgs/development/libraries/openexr/gcc-13.patch
+33
pkgs/development/libraries/openexr/gcc-13.patch
···
1
+
https://github.com/AcademySoftwareFoundation/openexr/pull/1264
2
+
https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch
3
+
4
+
--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
5
+
+++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
6
+
@@ -159,6 +159,7 @@
7
+
#include <limits>
8
+
9
+
#include <cstddef>
10
+
+#include <cstdint>
11
+
12
+
13
+
// Windows specific addition to prevent the indirect import of the redefined min/max macros
14
+
--- a/OpenEXR/IlmImf/ImfHuf.cpp
15
+
+++ b/OpenEXR/IlmImf/ImfHuf.cpp
16
+
@@ -53,6 +53,7 @@
17
+
#include <cstring>
18
+
#include <cassert>
19
+
#include <algorithm>
20
+
+#include <cstdint>
21
+
22
+
23
+
using namespace std;
24
+
--- a/OpenEXR/IlmImf/ImfMisc.cpp
25
+
+++ b/OpenEXR/IlmImf/ImfMisc.cpp
26
+
@@ -52,6 +52,7 @@
27
+
#include <ImfConvert.h>
28
+
#include <ImfPartType.h>
29
+
#include <ImfTileDescription.h>
30
+
+#include <cstdint>
31
+
#include "ImfNamespace.h"
32
+
33
+
OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER