From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
Date: Wed, 9 Jun 2021 21:34:16 +0000 (UTC) [thread overview]
Message-ID: <1623274437.aa48d2b8434c6b1b5e68039270c001e5552e2028.sam@gentoo> (raw)
commit: aa48d2b8434c6b1b5e68039270c001e5552e2028
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Jun 6 08:00:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 9 21:33:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa48d2b8
media-libs/gegl: fix USE="openexr" build against >=dev-libs/glib-2.67.3
Closes: https://bugs.gentoo.org/793998
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gegl-0.4.26-fix-build-glib-2.67.3.patch | 24 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.26-r1.ebuild | 3 ++-
media-libs/gegl/gegl-0.4.28.ebuild | 3 ++-
media-libs/gegl/gegl-0.4.30.ebuild | 2 +-
4 files changed, 29 insertions(+), 3 deletions(-)
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
new file mode 100644
index 00000000000..00e1b8ab484
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
@@ -0,0 +1,24 @@
+From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
+From: Olivier Tilloy <olivier.tilloy@canonical.com>
+Date: Fri, 5 Mar 2021 12:58:18 +0100
+Subject: [PATCH] Fix build with glib 2.67.3 (see
+ https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
+
+---
+ operations/external/exr-load.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
+index e864f7e3e..28403639c 100644
+--- a/operations/external/exr-load.cpp
++++ b/operations/external/exr-load.cpp
+@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
+ #define GEGL_OP_NAME exr_load
+ #define GEGL_OP_C_FILE "exr-load.cpp"
+
+-extern "C" {
+ #include "gegl-op.h"
+-}
+
+ #include <ImfInputFile.h>
+ #include <ImfChannelList.h>
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
index 5185fcb9f8e..bc7777e314b 100644
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -78,6 +78,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+ "${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
index 6efb79792de..ba46251dad9 100644
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ b/media-libs/gegl/gegl-0.4.28.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -78,6 +78,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+ "${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild
index db958e5516e..62fe72b1c9a 100644
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ b/media-libs/gegl/gegl-0.4.30.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
media-libs/libnsgif
next reply other threads:[~2021-06-09 21:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 21:34 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-14 0:43 [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/ Sam James
2022-12-21 23:52 Sam James
2022-03-15 4:20 John Helmert III
2021-06-09 21:34 Sam James
2020-08-22 16:07 Andreas Sturmlechner
2020-06-25 8:08 Joonas Niilola
2019-10-28 12:54 Sebastian Pipping
2019-10-27 23:02 Sebastian Pipping
2019-03-09 18:22 Sebastian Pipping
2018-05-13 17:30 Sebastian Pipping
2018-01-10 22:42 Sebastian Pipping
2018-01-10 22:08 Sebastian Pipping
2017-12-04 20:30 Sebastian Pipping
2017-05-20 22:23 Sebastian Pipping
2017-04-01 22:25 Sebastian Pipping
2017-01-09 21:11 Sebastian Pipping
2015-12-05 16:41 Justin Lecher
2015-12-05 9:05 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1623274437.aa48d2b8434c6b1b5e68039270c001e5552e2028.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox