From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F31A9158020 for ; Wed, 21 Dec 2022 23:52:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9933E0877; Wed, 21 Dec 2022 23:52:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7FCBE0877 for ; Wed, 21 Dec 2022 23:52:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7FE6340D58 for ; Wed, 21 Dec 2022 23:52:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2660F7DE for ; Wed, 21 Dec 2022 23:52:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1671666720.e37f1398f63db9f2a6fe4133599a7169f6780e38.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch media-libs/gegl/gegl-0.4.40-r1.ebuild X-VCS-Directories: media-libs/gegl/files/ media-libs/gegl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e37f1398f63db9f2a6fe4133599a7169f6780e38 X-VCS-Branch: master Date: Wed, 21 Dec 2022 23:52:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d5f917e-f1dc-45b8-b103-40fd6cfbdcf4 X-Archives-Hash: b6701d330fbbfcb87dda16c9c98507b8 commit: e37f1398f63db9f2a6fe4133599a7169f6780e38 Author: Sam James gentoo org> AuthorDate: Wed Dec 21 23:47:22 2022 +0000 Commit: Sam James gentoo 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 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 +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() {