Received: by mail.netbsd.org (Postfix, from userid 605) id C3D1784D4E; Sat, 18 Mar 2023 05:42:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F056184D24 for ; Sat, 18 Mar 2023 05:42:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id BOzpf-2IF-Ze for ; Sat, 18 Mar 2023 05:42:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5299884D15 for ; Sat, 18 Mar 2023 05:42:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F7DFFA90; Sat, 18 Mar 2023 05:42:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1679118154183020" MIME-Version: 1.0 Date: Sat, 18 Mar 2023 05:42:34 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/graphics/freeimage To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230318054234.3F7DFFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1679118154183020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Mar 18 05:42:34 UTC 2023 Modified Files: pkgsrc/graphics/freeimage: distinfo pkgsrc/graphics/freeimage/patches: patch-Source_FreeImage_PluginRAW.cpp Log Message: freeimage: fix build with libraw-0.21 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/freeimage/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginRAW.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1679118154183020 Content-Disposition: inline Content-Length: 3122 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/freeimage/distinfo diff -u pkgsrc/graphics/freeimage/distinfo:1.17 pkgsrc/graphics/freeimage/distinfo:1.18 --- pkgsrc/graphics/freeimage/distinfo:1.17 Sun Jun 26 10:49:54 2022 +++ pkgsrc/graphics/freeimage/distinfo Sat Mar 18 05:42:33 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2022/06/26 10:49:54 he Exp $ +$NetBSD: distinfo,v 1.18 2023/03/18 05:42:33 wiz Exp $ BLAKE2s (FreeImage3180.zip) = 08cd435f40d668418a710a63bebdd02763d4d7abab1b2eb6958d58c35aab4f7f SHA512 (FreeImage3180.zip) = 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 @@ -17,7 +17,7 @@ SHA1 (patch-Source_FreeImage_PluginJ2K.c SHA1 (patch-Source_FreeImage_PluginJP2.cpp) = 9a6d27e039b2050004a2d331389bdfa32dffe681 SHA1 (patch-Source_FreeImage_PluginJPEG.cpp) = 9ed3ce6d70871c9657a69daa4f68ae8423e100a2 SHA1 (patch-Source_FreeImage_PluginPNG.cpp) = 0d9c71856a9355f56c3e9a571a414098d8af2e88 -SHA1 (patch-Source_FreeImage_PluginRAW.cpp) = 0aad009320f3da38272e17f65576400d97c4d4f5 +SHA1 (patch-Source_FreeImage_PluginRAW.cpp) = 36aeffb73df09dbc62a0f19cb305fcbcaebf329c SHA1 (patch-Source_FreeImage_PluginTIFF.cpp) = bfa869452929f62162c15982b58013b0d43e9f8e SHA1 (patch-Source_FreeImage_PluginWebP.cpp) = d7b57cfcb1379c6a849edb219c8a59edae83ff5c SHA1 (patch-Source_FreeImage_ZLibInterface.cpp) = 73211e8ecefb7972f1fcb579dc4a17409c81c480 Index: pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginRAW.cpp diff -u pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginRAW.cpp:1.2 pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginRAW.cpp:1.3 --- pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginRAW.cpp:1.2 Wed Oct 6 14:48:29 2021 +++ pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginRAW.cpp Sat Mar 18 05:42:34 2023 @@ -1,9 +1,10 @@ -$NetBSD: patch-Source_FreeImage_PluginRAW.cpp,v 1.2 2021/10/06 14:48:29 nia Exp $ +$NetBSD: patch-Source_FreeImage_PluginRAW.cpp,v 1.3 2023/03/18 05:42:34 wiz Exp $ - Unbundle image libraries. - Fix building with libraw-0.20. +- Fix building with libraw-0.21. ---- Source/FreeImage/PluginRAW.cpp.orig 2015-03-10 10:12:04.000000000 +0000 +--- Source/FreeImage/PluginRAW.cpp.orig 2015-03-10 11:12:04.000000000 +0000 +++ Source/FreeImage/PluginRAW.cpp @@ -19,7 +19,7 @@ // Use at your own risk! @@ -62,3 +63,15 @@ $NetBSD: patch-Source_FreeImage_PluginRA return (_io->tell_proc(_handle) >= _eof); } +@@ -694,7 +687,11 @@ Load(FreeImageIO *io, fi_handle handle, + // -------------------------------------------- + + // (-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) + 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. --_----------=_1679118154183020--