freeimage: build with openexr3

4 files changed, 21 insertions, 37 deletions

diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index 561eafa7c8b..39a1c7c6bb7 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2020/05/25 12:24:37 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/07/08 21:26:12 markd Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	freeimage-3.18.0
-PKGREVISION=	2
+PKGREVISION=	3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Library for supporting PNG, BMP, JPEG, and TIFF
diff --git a/graphics/freeimage/distinfo b/graphics/freeimage/distinfo
index ae6a15fab0f..35d88d67a13 100644
--- a/graphics/freeimage/distinfo
+++ b/graphics/freeimage/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2020/05/25 12:24:37 nia Exp $
+$NetBSD: distinfo,v 1.11 2021/07/08 21:26:12 markd Exp $
 
 SHA1 (FreeImage3180.zip) = 38daa9d8f1bca2330a2eaa42ec66fbe6ede7dce9
 RMD160 (FreeImage3180.zip) = b791715fccf49355a3cb27b6250d8ed809c2454e
@@ -11,13 +11,13 @@ SHA1 (patch-Source_FreeImageToolkit_JPEGTransform.cpp) = 4e7372c8947b4359de4d428
 SHA1 (patch-Source_FreeImage_J2KHelper.cpp) = a479a373f5a584978129c00d723251a784210603
 SHA1 (patch-Source_FreeImage_PSDParser.cpp) = ee4f3e1bb2b6644033a93ac58e12b9126d0dd060
 SHA1 (patch-Source_FreeImage_Plugin.cpp) = 58f5d7ca78a66ad7109b0e8dff219c26dfe50a86
-SHA1 (patch-Source_FreeImage_PluginEXR.cpp) = 6c4f6ea9a413d27dee940f24588bdf6f7ae38038
+SHA1 (patch-Source_FreeImage_PluginEXR.cpp) = ce97b25f8968eea7c3216143b766b1c51ccd5e43
 SHA1 (patch-Source_FreeImage_PluginJ2K.cpp) = bbc44884aba8be3af2aa824da5cf788d91c27fb6
 SHA1 (patch-Source_FreeImage_PluginJP2.cpp) = 9a6d27e039b2050004a2d331389bdfa32dffe681
 SHA1 (patch-Source_FreeImage_PluginJPEG.cpp) = a3998454b11c2f73890828b24c0ea276bff7ee7f
 SHA1 (patch-Source_FreeImage_PluginPNG.cpp) = 0d9c71856a9355f56c3e9a571a414098d8af2e88
 SHA1 (patch-Source_FreeImage_PluginRAW.cpp) = 1d67ad2b634e2a5b1fa82be240a4d6edfad7c05d
-SHA1 (patch-Source_FreeImage_PluginTIFF.cpp) = 5fc6f4a9debf555ba41ff7bd4311ed76ec3f1b51
+SHA1 (patch-Source_FreeImage_PluginTIFF.cpp) = 2b1a899471139059d928c46db5d1f8dee0856a6d
 SHA1 (patch-Source_FreeImage_PluginWebP.cpp) = d7b57cfcb1379c6a849edb219c8a59edae83ff5c
 SHA1 (patch-Source_FreeImage_ZLibInterface.cpp) = 73211e8ecefb7972f1fcb579dc4a17409c81c480
 SHA1 (patch-Source_Metadata_TagConversion.cpp) = 0785cc5dd395bca538e9a82cadbb7ef450eebe86
diff --git a/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp b/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp
index ff3d087cd86..24563264423 100644
--- a/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp
+++ b/graphics/freeimage/patches/patch-Source_FreeImage_PluginEXR.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_FreeImage_PluginEXR.cpp,v 1.1 2020/05/14 16:42:14 nia Exp $
+$NetBSD: patch-Source_FreeImage_PluginEXR.cpp,v 1.2 2021/07/08 21:26:12 markd Exp $
 
 Unbundle image libraries.
 
 --- Source/FreeImage/PluginEXR.cpp.orig	2015-03-04 00:07:08.000000000 +0000
 +++ Source/FreeImage/PluginEXR.cpp
-@@ -28,16 +28,16 @@
+@@ -28,16 +28,17 @@
  #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
  #endif 
  
@@ -27,7 +27,8 @@ Unbundle image libraries.
 +#include <OpenEXR/ImfRgba.h>
 +#include <OpenEXR/ImfArray.h>
 +#include <OpenEXR/ImfPreviewImage.h>
-+#include <OpenEXR/half.h>
++#include <Imath/half.h>
++#include <Imath/ImathInt64.h>
  
  
  // ==========================================================
diff --git a/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp b/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp
index 4db321c43e9..a9e24af6d93 100644
--- a/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp
+++ b/graphics/freeimage/patches/patch-Source_FreeImage_PluginTIFF.cpp
@@ -1,35 +1,18 @@
-$NetBSD: patch-Source_FreeImage_PluginTIFF.cpp,v 1.1 2020/05/14 16:42:14 nia Exp $
+$NetBSD: patch-Source_FreeImage_PluginTIFF.cpp,v 1.2 2021/07/08 21:26:12 markd Exp $
 
 Unbundle image libraries.
 
 --- Source/FreeImage/PluginTIFF.cpp.orig	2018-07-28 23:24:44.000000000 +0000
 +++ Source/FreeImage/PluginTIFF.cpp
 @@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffio.h>
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include <OpenEXR/half.h>
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
-@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char 
- 	return tif;
- }
- 
--/**
--Open a TIFF file for reading or writing
--@param name
--@param mode
--*/
--TIFF*
--TIFFOpen(const char* name, const char* mode) {
--	return 0;
--}
--
- // ----------------------------------------------------------
- //   TIFF library FreeImage-specific routines.
- // ----------------------------------------------------------
+ 

+ #include "FreeImage.h"

+ #include "Utilities.h"

+-#include "../LibTIFF4/tiffiop.h"

++#include <tiffio.h>

+ #include "../Metadata/FreeImageTag.h"

+-#include "../OpenEXR/Half/half.h"

++#include <Imath/half.h>

+ 

+ #include "FreeImageIO.h"

+ #include "PSDParser.h"