commit: e37f1398f63db9f2a6fe4133599a7169f6780e38 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 21 23:47:22 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 21 23:52:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37f1398
media-libs/gegl: fix build w/ libraw-0.21 Closes: https://bugs.gentoo.org/887421 Signed-off-by: Sam James <sam <AT> gentoo.org> .../gegl/files/gegl-0.4.40-libraw-0.21.patch | 26 ++++++++++++++++++++++ media-libs/gegl/gegl-0.4.40-r1.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch new file mode 100644 index 000000000000..84d80d96503c --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/887421 +https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133 + +From ef71b865a301514fcd13f50d421942f7b6b92d5e Mon Sep 17 00:00:00 2001 +From: Chris Mayo <[email protected]> +Date: Wed, 21 Dec 2022 19:32:02 +0000 +Subject: [PATCH] raw-load: make compatible with LibRaw 0.21.0 + +imgdata.params.shot_select moved to imgdata.rawparams.shot_select +https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L182 +--- a/operations/external/raw-load.c ++++ b/operations/external/raw-load.c +@@ -114,7 +114,11 @@ prepare (GeglOperation *operation) + g_warning ("raw-load: Error Initializing raw library"); + else + { ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ p->LibRaw->rawparams.shot_select = o->image_num; ++#else + p->LibRaw->params.shot_select = o->image_num; ++#endif + + p->LibRaw->params.aber[0] = 1.0; + p->LibRaw->params.aber[2] = 1.0; +-- +GitLab diff --git a/media-libs/gegl/gegl-0.4.40-r1.ebuild b/media-libs/gegl/gegl-0.4.40-r1.ebuild index bcb10baa5cb6..a84d7725a292 100644 --- a/media-libs/gegl/gegl-0.4.40-r1.ebuild +++ b/media-libs/gegl/gegl-0.4.40-r1.ebuild @@ -78,6 +78,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc ) PATCHES=( "${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch + "${FILESDIR}"/${PN}-0.4.40-libraw-0.21.patch ) pkg_pretend() {
