Thu Jul 8 21:26:12 2021 UTC ()
freeimage: build with openexr3


(markd)
diff -r1.14 -r1.15 pkgsrc/graphics/freeimage/Makefile
diff -r1.10 -r1.11 pkgsrc/graphics/freeimage/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp
diff -r1.1 -r1.2 pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp
cvs diff -r1.14 -r1.15 pkgsrc/graphics/freeimage/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/freeimage/Makefile 2020/05/25 12:24:37 1.14
+++ pkgsrc/graphics/freeimage/Makefile 2021/07/08 21:26:12 1.15
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile,v 1.14 2020/05/25 12:24:37 nia Exp $ 1# $NetBSD: Makefile,v 1.15 2021/07/08 21:26:12 markd Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= freeimage-3.18.0 5PKGNAME= freeimage-3.18.0
6PKGREVISION= 2 6PKGREVISION= 3
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Library for supporting PNG, BMP, JPEG, and TIFF 9COMMENT= Library for supporting PNG, BMP, JPEG, and TIFF
10 10
11MAKE_FILE= Makefile.gnu 11MAKE_FILE= Makefile.gnu
12 12
13.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/graphics/freeimage/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/freeimage/distinfo 2020/05/25 12:24:37 1.10
+++ pkgsrc/graphics/freeimage/distinfo 2021/07/08 21:26:12 1.11
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.10 2020/05/25 12:24:37 nia Exp $ 1$NetBSD: distinfo,v 1.11 2021/07/08 21:26:12 markd Exp $
2 2
3SHA1 (FreeImage3180.zip) = 38daa9d8f1bca2330a2eaa42ec66fbe6ede7dce9 3SHA1 (FreeImage3180.zip) = 38daa9d8f1bca2330a2eaa42ec66fbe6ede7dce9
4RMD160 (FreeImage3180.zip) = b791715fccf49355a3cb27b6250d8ed809c2454e 4RMD160 (FreeImage3180.zip) = b791715fccf49355a3cb27b6250d8ed809c2454e
5SHA512 (FreeImage3180.zip) = 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 5SHA512 (FreeImage3180.zip) = 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
6Size (FreeImage3180.zip) = 7415716 bytes 6Size (FreeImage3180.zip) = 7415716 bytes
7SHA1 (patch-Makefile.fip) = f16e2f589f9433472cd67e5485f7c34ed30a887e 7SHA1 (patch-Makefile.fip) = f16e2f589f9433472cd67e5485f7c34ed30a887e
8SHA1 (patch-Makefile.gnu) = f3528c8004ccab5067d9957387f6686ea8cef58a 8SHA1 (patch-Makefile.gnu) = f3528c8004ccab5067d9957387f6686ea8cef58a
9SHA1 (patch-Source_FreeImage.h) = 9b648a8734a0c3391850e2dd7eaa501d29e99689 9SHA1 (patch-Source_FreeImage.h) = 9b648a8734a0c3391850e2dd7eaa501d29e99689
10SHA1 (patch-Source_FreeImageToolkit_JPEGTransform.cpp) = 4e7372c8947b4359de4d428bcfcfa2f55210f2e8 10SHA1 (patch-Source_FreeImageToolkit_JPEGTransform.cpp) = 4e7372c8947b4359de4d428bcfcfa2f55210f2e8
11SHA1 (patch-Source_FreeImage_J2KHelper.cpp) = a479a373f5a584978129c00d723251a784210603 11SHA1 (patch-Source_FreeImage_J2KHelper.cpp) = a479a373f5a584978129c00d723251a784210603
12SHA1 (patch-Source_FreeImage_PSDParser.cpp) = ee4f3e1bb2b6644033a93ac58e12b9126d0dd060 12SHA1 (patch-Source_FreeImage_PSDParser.cpp) = ee4f3e1bb2b6644033a93ac58e12b9126d0dd060
13SHA1 (patch-Source_FreeImage_Plugin.cpp) = 58f5d7ca78a66ad7109b0e8dff219c26dfe50a86 13SHA1 (patch-Source_FreeImage_Plugin.cpp) = 58f5d7ca78a66ad7109b0e8dff219c26dfe50a86
14SHA1 (patch-Source_FreeImage_PluginEXR.cpp) = 6c4f6ea9a413d27dee940f24588bdf6f7ae38038 14SHA1 (patch-Source_FreeImage_PluginEXR.cpp) = ce97b25f8968eea7c3216143b766b1c51ccd5e43
15SHA1 (patch-Source_FreeImage_PluginJ2K.cpp) = bbc44884aba8be3af2aa824da5cf788d91c27fb6 15SHA1 (patch-Source_FreeImage_PluginJ2K.cpp) = bbc44884aba8be3af2aa824da5cf788d91c27fb6
16SHA1 (patch-Source_FreeImage_PluginJP2.cpp) = 9a6d27e039b2050004a2d331389bdfa32dffe681 16SHA1 (patch-Source_FreeImage_PluginJP2.cpp) = 9a6d27e039b2050004a2d331389bdfa32dffe681
17SHA1 (patch-Source_FreeImage_PluginJPEG.cpp) = a3998454b11c2f73890828b24c0ea276bff7ee7f 17SHA1 (patch-Source_FreeImage_PluginJPEG.cpp) = a3998454b11c2f73890828b24c0ea276bff7ee7f
18SHA1 (patch-Source_FreeImage_PluginPNG.cpp) = 0d9c71856a9355f56c3e9a571a414098d8af2e88 18SHA1 (patch-Source_FreeImage_PluginPNG.cpp) = 0d9c71856a9355f56c3e9a571a414098d8af2e88
19SHA1 (patch-Source_FreeImage_PluginRAW.cpp) = 1d67ad2b634e2a5b1fa82be240a4d6edfad7c05d 19SHA1 (patch-Source_FreeImage_PluginRAW.cpp) = 1d67ad2b634e2a5b1fa82be240a4d6edfad7c05d
20SHA1 (patch-Source_FreeImage_PluginTIFF.cpp) = 5fc6f4a9debf555ba41ff7bd4311ed76ec3f1b51 20SHA1 (patch-Source_FreeImage_PluginTIFF.cpp) = 2b1a899471139059d928c46db5d1f8dee0856a6d
21SHA1 (patch-Source_FreeImage_PluginWebP.cpp) = d7b57cfcb1379c6a849edb219c8a59edae83ff5c 21SHA1 (patch-Source_FreeImage_PluginWebP.cpp) = d7b57cfcb1379c6a849edb219c8a59edae83ff5c
22SHA1 (patch-Source_FreeImage_ZLibInterface.cpp) = 73211e8ecefb7972f1fcb579dc4a17409c81c480 22SHA1 (patch-Source_FreeImage_ZLibInterface.cpp) = 73211e8ecefb7972f1fcb579dc4a17409c81c480
23SHA1 (patch-Source_Metadata_TagConversion.cpp) = 0785cc5dd395bca538e9a82cadbb7ef450eebe86 23SHA1 (patch-Source_Metadata_TagConversion.cpp) = 0785cc5dd395bca538e9a82cadbb7ef450eebe86
24SHA1 (patch-Source_Metadata_XTIFF.cpp) = bfcafc31b8407258c52f30fa0c62d062ce108c00 24SHA1 (patch-Source_Metadata_XTIFF.cpp) = bfcafc31b8407258c52f30fa0c62d062ce108c00
25SHA1 (patch-Source_Utilities.h) = bb9cdd7d72c46e72cd3a636beb27541783609191 25SHA1 (patch-Source_Utilities.h) = bb9cdd7d72c46e72cd3a636beb27541783609191
26SHA1 (patch-genfipsrclist.sh) = 9b22593e0ca5ff869ea22ddb91f46785ae45d5cd 26SHA1 (patch-genfipsrclist.sh) = 9b22593e0ca5ff869ea22ddb91f46785ae45d5cd
27SHA1 (patch-gensrclist.sh) = 2582848736654138b3ebdda9d8469046e992745b 27SHA1 (patch-gensrclist.sh) = 2582848736654138b3ebdda9d8469046e992745b
cvs diff -r1.1 -r1.2 pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp 2020/05/14 16:42:14 1.1
+++ pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp 2021/07/08 21:26:12 1.2
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1$NetBSD: patch-Source_FreeImage_PluginEXR.cpp,v 1.1 2020/05/14 16:42:14 nia Exp $ 1$NetBSD: patch-Source_FreeImage_PluginEXR.cpp,v 1.2 2021/07/08 21:26:12 markd Exp $
2 2
3Unbundle image libraries. 3Unbundle image libraries.
4 4
5--- Source/FreeImage/PluginEXR.cpp.orig 2015-03-04 00:07:08.000000000 +0000 5--- Source/FreeImage/PluginEXR.cpp.orig 2015-03-04 00:07:08.000000000 +0000
6+++ Source/FreeImage/PluginEXR.cpp 6+++ Source/FreeImage/PluginEXR.cpp
7@@ -28,16 +28,16 @@ 7@@ -28,16 +28,17 @@
8 #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) 8 #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
9 #endif  9 #endif
10  10
11-#include "../OpenEXR/IlmImf/ImfIO.h" 11-#include "../OpenEXR/IlmImf/ImfIO.h"
12-#include "../OpenEXR/Iex/Iex.h" 12-#include "../OpenEXR/Iex/Iex.h"
13-#include "../OpenEXR/IlmImf/ImfOutputFile.h" 13-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
14-#include "../OpenEXR/IlmImf/ImfInputFile.h" 14-#include "../OpenEXR/IlmImf/ImfInputFile.h"
15-#include "../OpenEXR/IlmImf/ImfRgbaFile.h" 15-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
16-#include "../OpenEXR/IlmImf/ImfChannelList.h" 16-#include "../OpenEXR/IlmImf/ImfChannelList.h"
17-#include "../OpenEXR/IlmImf/ImfRgba.h" 17-#include "../OpenEXR/IlmImf/ImfRgba.h"
18-#include "../OpenEXR/IlmImf/ImfArray.h" 18-#include "../OpenEXR/IlmImf/ImfArray.h"
19-#include "../OpenEXR/IlmImf/ImfPreviewImage.h" 19-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
20-#include "../OpenEXR/Half/half.h" 20-#include "../OpenEXR/Half/half.h"
21+#include <OpenEXR/ImfIO.h> 21+#include <OpenEXR/ImfIO.h>
22+#include <OpenEXR/Iex.h> 22+#include <OpenEXR/Iex.h>
23+#include <OpenEXR/ImfOutputFile.h> 23+#include <OpenEXR/ImfOutputFile.h>
24+#include <OpenEXR/ImfInputFile.h> 24+#include <OpenEXR/ImfInputFile.h>
25+#include <OpenEXR/ImfRgbaFile.h> 25+#include <OpenEXR/ImfRgbaFile.h>
26+#include <OpenEXR/ImfChannelList.h> 26+#include <OpenEXR/ImfChannelList.h>
27+#include <OpenEXR/ImfRgba.h> 27+#include <OpenEXR/ImfRgba.h>
28+#include <OpenEXR/ImfArray.h> 28+#include <OpenEXR/ImfArray.h>
29+#include <OpenEXR/ImfPreviewImage.h> 29+#include <OpenEXR/ImfPreviewImage.h>
30+#include <OpenEXR/half.h> 30+#include <Imath/half.h>
 31+#include <Imath/ImathInt64.h>
31  32
32  33
33 // ========================================================== 34 // ==========================================================
cvs diff -r1.1 -r1.2 pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp 2020/05/14 16:42:14 1.1
+++ pkgsrc/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp 2021/07/08 21:26:12 1.2
@@ -1,35 +1,18 @@ @@ -1,35 +1,18 @@
1$NetBSD: patch-Source_FreeImage_PluginTIFF.cpp,v 1.1 2020/05/14 16:42:14 nia Exp $ 1$NetBSD: patch-Source_FreeImage_PluginTIFF.cpp,v 1.2 2021/07/08 21:26:12 markd Exp $
2 2
3Unbundle image libraries. 3Unbundle image libraries.
4 4
5--- Source/FreeImage/PluginTIFF.cpp.orig 2018-07-28 23:24:44.000000000 +0000 5--- Source/FreeImage/PluginTIFF.cpp.orig 2018-07-28 23:24:44.000000000 +0000
6+++ Source/FreeImage/PluginTIFF.cpp 6+++ Source/FreeImage/PluginTIFF.cpp
7@@ -37,9 +37,9 @@ 7@@ -37,9 +37,9 @@
8  8
9 #include "FreeImage.h" 9 #include "FreeImage.h"
10 #include "Utilities.h" 10 #include "Utilities.h"
11-#include "../LibTIFF4/tiffiop.h" 11-#include "../LibTIFF4/tiffiop.h"
12+#include <tiffio.h> 12+#include <tiffio.h>
13 #include "../Metadata/FreeImageTag.h" 13 #include "../Metadata/FreeImageTag.h"
14-#include "../OpenEXR/Half/half.h" 14-#include "../OpenEXR/Half/half.h"
15+#include <OpenEXR/half.h> 15+#include <Imath/half.h>
16  16
17 #include "FreeImageIO.h" 17 #include "FreeImageIO.h"
18 #include "PSDParser.h" 18 #include "PSDParser.h"
19@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char  
20 return tif; 
21 } 
22  
23-/** 
24-Open a TIFF file for reading or writing 
25-@param name 
26-@param mode 
27-*/ 
28-TIFF* 
29-TIFFOpen(const char* name, const char* mode) { 
30- return 0; 
31-} 
32- 
33 // ---------------------------------------------------------- 
34 // TIFF library FreeImage-specific routines. 
35 // ----------------------------------------------------------