gentoo auto-resync : 22:12:2022 - 13:56:59

3 files changed, 14 insertions, 1 deletions

diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index ea0193bf34ad..7a29662dfc27 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -2,6 +2,7 @@ AUX freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch 6242 BLAKE2B 3deb724b2c
 AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
 AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
 AUX freeimage-3.18.0-libraw-0.20.0.patch 1912 BLAKE2B 56892466e8c8c4a1178c66ba24fa0da0b4218ac883a21eee47ac87044a5cb300182d33c04e91e9ed30a0e3b03c34cd447c0400bb2b6045f96866bb583aeaee06 SHA512 6fde3ee5e0219bdb6cf897e1898dfd0e06dbfceb67f06a935776b96c4688b27e11075958c339c417c3d3490d5778e802b1eafb4c92360c342acf0a2b7ff6345e
+AUX freeimage-3.18.0-libraw-0.21.patch 435 BLAKE2B f6fb2f1b9dac6ee6708059f76e778b1a8a72fb2d3236cf14c9aff4ef53c92814910ba655c16836c5c5a8bfba7f12b8ce9ecc2d2ea5aab05f7a0bf888323ca6b5 SHA512 5061791f95e299b7be83bd55db99c2f6080df4f1fd4cb1bfba85255fe85726a9195aa462e035073160418a37df0ea65ac3903cf73eae3ed41939a0e322f5ec56
 AUX freeimage-3.18.0-null-to-false.patch 679 BLAKE2B e2f23dc328b6fdc9e5f11e0cf097627b9a7c524cb96b58731f38f69921b5f34f7a414b93ab75e0e7fc7620f21688bbc5b6a2ee303c1b05cb02e4cb550f534409 SHA512 0c7ba4969dd718678b87d4a6ad3358b797d2a793831a7e1a29d006e81ea5f7cb4316f456eba05edced65fcb846509a36d5f2e8c487528e1303be346e0564157b
 AUX freeimage-3.18.0-openexr-3-imath.patch 5333 BLAKE2B 9465fb9c9f50f5bfe08d1d337acff27441d2054dbcada9df173f5bbaae5b25dd2d155de141c464e3188cc871a2dc2e25fb8b992151ae1cd9e6134a889e3ab705 SHA512 88ebb72e6b531e4444904789025962d1e4b2b7947c1b353b46db138c55c5f486ed7ee81ee455f084ed4780b6aef0a0afe2f0a8518b5b723c51bfc6dad4ca9fe1
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
@@ -11,5 +12,5 @@ AUX freeimage-3.18.0-tiff-4.4.0.patch 492 BLAKE2B 284ed6a083b982fbc758237ba96812
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
-EBUILD freeimage-3.18.0-r10.ebuild 3385 BLAKE2B 48d8508bf9201f0e1e0c3689ad4ec40474358c35dec9de43929762ab0e07714ff5efff1562e58d8478ac5c4e6a474874b30bbd35d559cf57c68a782acb5592f5 SHA512 51b8ae3047a66448abf6c3fc1dd3de313e54b6cd4e1afba426582d1dd0920e8176af78c182f1d8e128b35e937faf532548ced533b8d173e1eda7ac8e4340ff29
+EBUILD freeimage-3.18.0-r10.ebuild 3431 BLAKE2B 652a1b8152d8fa573bfec0743d5c1e1ba3b985ac0b5924bb779697e18fffe92767a1d18d5bd975a85213d380b3170f02338efbec4c447f31d38b1cf9c517a548 SHA512 da665a6a26f0191cabc9be308299a65fb08fe0217979e76827e0150c9992beece1d137105d1ac9a8830c71fc845ffa8f2dd4863124b2cac5522608a40a43a85b
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
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() {