commit: cfbae17669d5be64dd7e9e6337c294e935fb984e Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Dec 23 01:58:51 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Dec 23 02:02:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfbae176
media-libs/freeimage: adjust libraw patch style for consistency Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> ....18.0-libraw-0.21.patch => freeimage-3.18.0-libraw-0.21.0.patch} | 6 +++--- media-libs/freeimage/freeimage-3.18.0-r10.ebuild | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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.0.patch similarity index 83% rename from media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch rename to media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.0.patch index 3005bf44d623..906590bbd329 100644 --- 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.0.patch @@ -3,9 +3,9 @@ https://bugs.gentoo.org/887467 +++ 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) ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) + RawProcessor->imgdata.rawparams.shot_select = 0; -+ #else ++#else RawProcessor->imgdata.params.shot_select = 0; -+ #endif ++#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 24e12d89db37..502ee0298dbe 100644 --- a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild @@ -57,7 +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 + "${FILESDIR}"/${PN}-3.18.0-libraw-0.21.0.patch ) src_prepare() {
