Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
Date: Sun, 07 Nov 2021 23:08:09
Message-Id: 1636326472.919657df943e49b9a5cdc6f709a06568af54c954.sam@gentoo
1 commit: 919657df943e49b9a5cdc6f709a06568af54c954
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 7 23:07:23 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 7 23:07:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919657df
7
8 media-gfx/darktable: add openexr build patch
9
10 Bug: https://bugs.gentoo.org/820041
11 Thanks-to: Bernd Feige <Bernd.Feige <AT> gmx.net>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 media-gfx/darktable/darktable-3.6.1-r1.ebuild | 1 +
15 .../darktable/files/darktable-3.6.1_openexr.patch | 65 ++++++++++++++++++++++
16 2 files changed, 66 insertions(+)
17
18 diff --git a/media-gfx/darktable/darktable-3.6.1-r1.ebuild b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
19 index 21955604165..ffafc552edd 100644
20 --- a/media-gfx/darktable/darktable-3.6.1-r1.ebuild
21 +++ b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
22 @@ -80,6 +80,7 @@ PATCHES=(
23 "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
24 "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
25 "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
26 + "${FILESDIR}"/${PN}-3.6.1_openexr.patch
27 )
28
29 S="${WORKDIR}/${P/_/~}"
30
31 diff --git a/media-gfx/darktable/files/darktable-3.6.1_openexr.patch b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
32 new file mode 100644
33 index 00000000000..a5b1fd173f8
34 --- /dev/null
35 +++ b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
36 @@ -0,0 +1,65 @@
37 +https://bugs.gentoo.org/820041
38 +
39 +--- a/src/common/imageio_exr.cc
40 ++++ b/src/common/imageio_exr.cc
41 +@@ -28,13 +28,13 @@
42 + #include <stdio.h>
43 + #include <string.h>
44 +
45 +-#include <OpenEXR/ImfChannelList.h>
46 +-#include <OpenEXR/ImfFrameBuffer.h>
47 +-#include <OpenEXR/ImfInputFile.h>
48 +-#include <OpenEXR/ImfStandardAttributes.h>
49 +-#include <OpenEXR/ImfTestFile.h>
50 +-#include <OpenEXR/ImfThreading.h>
51 +-#include <OpenEXR/ImfTiledInputFile.h>
52 ++#include <ImfChannelList.h>
53 ++#include <ImfFrameBuffer.h>
54 ++#include <ImfInputFile.h>
55 ++#include <ImfStandardAttributes.h>
56 ++#include <ImfTestFile.h>
57 ++#include <ImfThreading.h>
58 ++#include <ImfTiledInputFile.h>
59 +
60 + extern "C" {
61 + #include "common/colorspaces.h"
62 +--- a/src/common/imageio_exr.hh
63 ++++ b/src/common/imageio_exr.hh
64 +@@ -29,12 +29,12 @@
65 + #include <tr1/memory>
66 + #endif
67 +
68 +-#include <OpenEXR/ImfChannelList.h>
69 +-#include <OpenEXR/ImfFrameBuffer.h>
70 +-#include <OpenEXR/ImfInputFile.h>
71 +-#include <OpenEXR/ImfStandardAttributes.h>
72 +-#include <OpenEXR/ImfTestFile.h>
73 +-#include <OpenEXR/ImfTiledInputFile.h>
74 ++#include <ImfChannelList.h>
75 ++#include <ImfFrameBuffer.h>
76 ++#include <ImfInputFile.h>
77 ++#include <ImfStandardAttributes.h>
78 ++#include <ImfTestFile.h>
79 ++#include <ImfTiledInputFile.h>
80 +
81 + #ifdef OPENEXR_IMF_INTERNAL_NAMESPACE
82 + #define IMF_NS OPENEXR_IMF_INTERNAL_NAMESPACE
83 +--- a/src/imageio/format/exr.cc
84 ++++ b/src/imageio/format/exr.cc
85 +@@ -23,11 +23,11 @@
86 + #include <cstdlib>
87 + #include <memory>
88 +
89 +-#include <OpenEXR/ImfChannelList.h>
90 +-#include <OpenEXR/ImfFrameBuffer.h>
91 +-#include <OpenEXR/ImfStandardAttributes.h>
92 +-#include <OpenEXR/ImfThreading.h>
93 +-#include <OpenEXR/ImfTiledOutputFile.h>
94 ++#include <ImfChannelList.h>
95 ++#include <ImfFrameBuffer.h>
96 ++#include <ImfStandardAttributes.h>
97 ++#include <ImfThreading.h>
98 ++#include <ImfTiledOutputFile.h>
99 +
100 + extern "C" {
101 + #include "bauhaus/bauhaus.h"