| 1 |
commit: 9933f6370e9e1af96dad6f922449da5988e2a576 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Sun Jun 6 08:03:37 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 9 21:33:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9933f637 |
| 7 |
|
| 8 |
media-libs/gegl: fix USE="openexr" build against media-libs/openexr-3.0.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/788400 |
| 11 |
|
| 12 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/21135 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/gegl-0.4.30-fix-build-openexr-3.patch | 22 ++++++++++++++++++++++ |
| 17 |
media-libs/gegl/gegl-0.4.26-r1.ebuild | 1 + |
| 18 |
media-libs/gegl/gegl-0.4.28.ebuild | 1 + |
| 19 |
media-libs/gegl/gegl-0.4.30.ebuild | 4 ++++ |
| 20 |
4 files changed, 28 insertions(+) |
| 21 |
|
| 22 |
diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..e0e938acc22 |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch |
| 27 |
@@ -0,0 +1,22 @@ |
| 28 |
+From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Antonio Rojas <arojas@×××××××××.org> |
| 30 |
+Date: Sat, 24 Apr 2021 10:51:09 +0000 |
| 31 |
+Subject: [PATCH] Fix build with OpenEXR 3 |
| 32 |
+ |
| 33 |
+Add a header that is no longer transitively included |
| 34 |
+--- |
| 35 |
+ operations/external/exr-save.cc | 1 + |
| 36 |
+ 1 file changed, 1 insertion(+) |
| 37 |
+ |
| 38 |
+diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc |
| 39 |
+index 1e8c09d96..87abed511 100644 |
| 40 |
+--- a/operations/external/exr-save.cc |
| 41 |
++++ b/operations/external/exr-save.cc |
| 42 |
+@@ -45,6 +45,7 @@ extern "C" { |
| 43 |
+ #include <ImfChromaticities.h> |
| 44 |
+ #include <ImfStandardAttributes.h> |
| 45 |
+ #include <ImfArray.h> |
| 46 |
++#include <ImfFrameBuffer.h> |
| 47 |
+ #include "ImathRandom.h" |
| 48 |
+ |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild |
| 52 |
index bc7777e314b..71107e34e87 100644 |
| 53 |
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild |
| 54 |
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild |
| 55 |
@@ -79,6 +79,7 @@ PATCHES=( |
| 56 |
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
| 57 |
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
| 58 |
"${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch |
| 59 |
+ "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch |
| 60 |
) |
| 61 |
|
| 62 |
python_check_deps() { |
| 63 |
|
| 64 |
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild |
| 65 |
index ba46251dad9..db9f50a4fb7 100644 |
| 66 |
--- a/media-libs/gegl/gegl-0.4.28.ebuild |
| 67 |
+++ b/media-libs/gegl/gegl-0.4.28.ebuild |
| 68 |
@@ -79,6 +79,7 @@ PATCHES=( |
| 69 |
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
| 70 |
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
| 71 |
"${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch |
| 72 |
+ "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch |
| 73 |
) |
| 74 |
|
| 75 |
python_check_deps() { |
| 76 |
|
| 77 |
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild |
| 78 |
index 62fe72b1c9a..0f6d0b73825 100644 |
| 79 |
--- a/media-libs/gegl/gegl-0.4.30.ebuild |
| 80 |
+++ b/media-libs/gegl/gegl-0.4.30.ebuild |
| 81 |
@@ -75,6 +75,10 @@ BDEPEND=" |
| 82 |
|
| 83 |
DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) |
| 84 |
|
| 85 |
+PATCHES=( |
| 86 |
+ "${FILESDIR}"/${P}-fix-build-openexr-3.patch |
| 87 |
+) |
| 88 |
+ |
| 89 |
python_check_deps() { |
| 90 |
use test || return 0 |
| 91 |
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" |
Archives