[gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/files/, media-libs/freeimage/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     0835197ed52e7862bb0b72172930444a4ae2a421
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 09:51:13 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 09:53:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0835197e

media-libs/freeimage: fix build with libraw-0.21

Closes: https://bugs.gentoo.org/887467
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch | 11 +++++++++++
 media-libs/freeimage/freeimage-3.18.0-r10.ebuild              |  1 +
 2 files changed, 12 insertions(+)

diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch b/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch
new file mode 100644
index 000000000000..3005bf44d623
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/887467
+--- a/Source/FreeImage/PluginRAW.cpp
++++ b/Source/FreeImage/PluginRAW.cpp
+@@ -693,3 +693,7 @@
+ 		// (-s [0..N-1]) Select one raw image from input file
++		#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++		RawProcessor->imgdata.rawparams.shot_select = 0;
++		#else
+ 		RawProcessor->imgdata.params.shot_select = 0;
++		#endif
+ 		// (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
index bdfe70e999ad..24e12d89db37 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
 	"${FILESDIR}"/${PN}-3.18.0-tiff-4.4.0.patch
 	"${FILESDIR}"/${PN}-3.18.0-null-to-false.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.21.patch
 )
 
 src_prepare() {