me
/
guix
Archived
1
0
Fork 0
Code

gnu: freeimage: Adjust for libraw 0.21. 

* gnu/packages/patches/freeimage-libraw-0.21-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (freeimage)[source](patches): Add it.

Change-Id: Ief930d50be3e1f44074cd772756fb813bbad4389
master
Zheng Junjie 2024-07-08 20:57:19 +08:00
parent a0807675f7
commit e9b97b193a
No known key found for this signature in database
GPG Key ID: 3B5AA993E1A2DFF0
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1248,6 +1248,7 @@ dist_patch_DATA = \
%D%/packages/patches/freecad-vtk-9.3.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freeimage-libtiff-compat.patch \
%D%/packages/patches/freeimage-libraw-0.21-compat.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/freeimage-CVE-2020-21428.patch \
%D%/packages/patches/freeimage-CVE-2020-22524.patch \

3
gnu/packages/image.scm
View File

@ -1268,7 +1268,8 @@ supplies a generic doubly-linked list and some string functions.")
(search-patches "freeimage-unbundle.patch"
"freeimage-libtiff-compat.patch"
"freeimage-CVE-2020-21428.patch"
"freeimage-CVE-2020-22524.patch")
"freeimage-CVE-2020-22524.patch"
"freeimage-libraw-0.21-compat.patch")
;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility.
(list (origin
(method url-fetch)

15
gnu/packages/patches/freeimage-libraw-0.21-compat.patch 100644
View File

@ -0,0 +1,15 @@
from https://gitlab.archlinux.org/archlinux/packaging/packages/freeimage/-/blob/69548d01896b32f30937a71220a9133055d84705/freeimage-libraw-0.21.patch
diff -ru FreeImage.orig/Source/FreeImage/PluginRAW.cpp FreeImage/Source/FreeImage/PluginRAW.cpp
--- FreeImage.orig/Source/FreeImage/PluginRAW.cpp 2022-12-18 21:57:11.447801357 +0100
+++ FreeImage/Source/FreeImage/PluginRAW.cpp 2022-12-18 21:58:05.103433138 +0100
@@ -687,7 +687,7 @@
// --------------------------------------------
// (-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.