| 1 |
commit: aa48d2b8434c6b1b5e68039270c001e5552e2028 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Sun Jun 6 08:00:48 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=aa48d2b8 |
| 7 |
|
| 8 |
media-libs/gegl: fix USE="openexr" build against >=dev-libs/glib-2.67.3 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/793998 |
| 11 |
|
| 12 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/gegl-0.4.26-fix-build-glib-2.67.3.patch | 24 ++++++++++++++++++++++ |
| 16 |
media-libs/gegl/gegl-0.4.26-r1.ebuild | 3 ++- |
| 17 |
media-libs/gegl/gegl-0.4.28.ebuild | 3 ++- |
| 18 |
media-libs/gegl/gegl-0.4.30.ebuild | 2 +- |
| 19 |
4 files changed, 29 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..00e1b8ab484 |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch |
| 26 |
@@ -0,0 +1,24 @@ |
| 27 |
+From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Olivier Tilloy <olivier.tilloy@×××××××××.com> |
| 29 |
+Date: Fri, 5 Mar 2021 12:58:18 +0100 |
| 30 |
+Subject: [PATCH] Fix build with glib 2.67.3 (see |
| 31 |
+ https://gitlab.gnome.org/GNOME/glib/-/issues/2331). |
| 32 |
+ |
| 33 |
+--- |
| 34 |
+ operations/external/exr-load.cpp | 2 -- |
| 35 |
+ 1 file changed, 2 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp |
| 38 |
+index e864f7e3e..28403639c 100644 |
| 39 |
+--- a/operations/external/exr-load.cpp |
| 40 |
++++ b/operations/external/exr-load.cpp |
| 41 |
+@@ -29,9 +29,7 @@ property_file_path (path, "File", "") |
| 42 |
+ #define GEGL_OP_NAME exr_load |
| 43 |
+ #define GEGL_OP_C_FILE "exr-load.cpp" |
| 44 |
+ |
| 45 |
+-extern "C" { |
| 46 |
+ #include "gegl-op.h" |
| 47 |
+-} |
| 48 |
+ |
| 49 |
+ #include <ImfInputFile.h> |
| 50 |
+ #include <ImfChannelList.h> |
| 51 |
|
| 52 |
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild |
| 53 |
index 5185fcb9f8e..bc7777e314b 100644 |
| 54 |
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild |
| 55 |
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild |
| 56 |
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )" |
| 57 |
# so there is no chance to support libav right now (Gentoo bug #567638) |
| 58 |
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! |
| 59 |
RDEPEND=" |
| 60 |
- >=dev-libs/glib-2.44:2 |
| 61 |
+ >=dev-libs/glib-2.68.2:2 |
| 62 |
>=dev-libs/json-glib-1.2.6 |
| 63 |
>=media-libs/babl-0.1.78[introspection?,lcms?,vala?] |
| 64 |
media-libs/libnsgif |
| 65 |
@@ -78,6 +78,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) |
| 66 |
PATCHES=( |
| 67 |
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
| 68 |
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
| 69 |
+ "${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch |
| 70 |
) |
| 71 |
|
| 72 |
python_check_deps() { |
| 73 |
|
| 74 |
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild |
| 75 |
index 6efb79792de..ba46251dad9 100644 |
| 76 |
--- a/media-libs/gegl/gegl-0.4.28.ebuild |
| 77 |
+++ b/media-libs/gegl/gegl-0.4.28.ebuild |
| 78 |
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )" |
| 79 |
# so there is no chance to support libav right now (Gentoo bug #567638) |
| 80 |
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! |
| 81 |
RDEPEND=" |
| 82 |
- >=dev-libs/glib-2.44:2 |
| 83 |
+ >=dev-libs/glib-2.68.2:2 |
| 84 |
>=dev-libs/json-glib-1.2.6 |
| 85 |
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?] |
| 86 |
media-libs/libnsgif |
| 87 |
@@ -78,6 +78,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) |
| 88 |
PATCHES=( |
| 89 |
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
| 90 |
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
| 91 |
+ "${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch |
| 92 |
) |
| 93 |
|
| 94 |
python_check_deps() { |
| 95 |
|
| 96 |
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild |
| 97 |
index db958e5516e..62fe72b1c9a 100644 |
| 98 |
--- a/media-libs/gegl/gegl-0.4.30.ebuild |
| 99 |
+++ b/media-libs/gegl/gegl-0.4.30.ebuild |
| 100 |
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )" |
| 101 |
# so there is no chance to support libav right now (Gentoo bug #567638) |
| 102 |
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! |
| 103 |
RDEPEND=" |
| 104 |
- >=dev-libs/glib-2.44:2 |
| 105 |
+ >=dev-libs/glib-2.68.2:2 |
| 106 |
>=dev-libs/json-glib-1.2.6 |
| 107 |
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?] |
| 108 |
media-libs/libnsgif |
Archives