From 5d87153ae82380525119aa7c162863086f043de1 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Wed, 5 Jul 2023 15:00:27 +0800 Subject: [PATCH] Fix compilation failure caused by LibRaw upgrade --- Fix-build-failure-with-LibRaw-0.21.1.patch | 13 +++++++++++++ freeimage.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Fix-build-failure-with-LibRaw-0.21.1.patch diff --git a/Fix-build-failure-with-LibRaw-0.21.1.patch b/Fix-build-failure-with-LibRaw-0.21.1.patch new file mode 100644 index 0000000..14569fb --- /dev/null +++ b/Fix-build-failure-with-LibRaw-0.21.1.patch @@ -0,0 +1,13 @@ +diff -rupN --no-dereference freeimage-svn-r1889-FreeImage-trunk/Source/FreeImage/PluginRAW.cpp freeimage-svn-r1889-FreeImage-trunk-new/Source/FreeImage/PluginRAW.cpp +--- freeimage-svn-r1889-FreeImage-trunk/Source/FreeImage/PluginRAW.cpp 2023-04-13 15:28:11.206544177 +0200 ++++ freeimage-svn-r1889-FreeImage-trunk-new/Source/FreeImage/PluginRAW.cpp 2023-04-13 15:28:11.524544641 +0200 +@@ -701,7 +701,7 @@ Load(FreeImageIO *io, fi_handle handle, + // -------------------------------------------- + + // (-s [0..N-1]) Select one raw image from input file +- RawProcessor->imgdata.params.shot_select = 0; ++ RawProcessor->imgdata.rawparams.shot_select = 0; + // (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb) + RawProcessor->imgdata.params.use_camera_wb = 1; + // (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras. + diff --git a/freeimage.spec b/freeimage.spec index 1edf28e..f5a61ea 100644 --- a/freeimage.spec +++ b/freeimage.spec @@ -4,7 +4,7 @@ Name: freeimage Version: 3.18.0 -Release: 9 +Release: 10 Summary: FreeImage is a library project for developers who would like to support popular graphics image formats (PNG, JPEG, TIFF, BMP and others) License: GPLv2 or GPLv3 and FIPL URL: https://freeimage.sourceforge.io/ @@ -22,6 +22,7 @@ Patch4: FreeImage_bigendian.patch Patch5: substream.patch Patch6: Fix-build-failure-with-OpenEXR-3.0.patch Patch7: freeimage-libtiff45.patch +Patch8: Fix-build-failure-with-LibRaw-0.21.1.patch BuildRequires: doxygen gcc-c++ make jxrlib-devel libjpeg-devel libmng-devel libpng-devel libtiff-devel libwebp-devel LibRaw-devel OpenEXR-devel openjpeg2-devel @@ -106,6 +107,9 @@ ldconfig -n %{buildroot}%{_libdir} %changelog +* Wed Jul 5 2023 liyanan - 3.18.0-10 +- Fix compilation failure caused by LibRaw upgrade + * Mon Feb 13 2023 wulei - 3.18.0-9 - Add patch for libtiff-4.5.0 comptability