vigra: build with openexr3

5 files changed, 71 insertions, 3 deletions

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index d1002a4c697..0a61ca7dfe5 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2020/05/21 20:53:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2021/07/08 21:31:13 markd Exp $
 
 DISTNAME=	vigra-1.11.1-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ukoethe/}
 
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index f06e0dd01d5..d4264003a03 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.14 2017/05/29 12:35:06 wiz Exp $
+$NetBSD: distinfo,v 1.15 2021/07/08 21:31:13 markd Exp $
 
 SHA1 (vigra-1.11.1-src.tar.gz) = b50e8f57116948c85a42770d9188453e6052c8e0
 RMD160 (vigra-1.11.1-src.tar.gz) = 7dfb92a2c9a0e29a5075baa5d491c2f09640697e
 SHA512 (vigra-1.11.1-src.tar.gz) = 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 Size (vigra-1.11.1-src.tar.gz) = 55119047 bytes
+SHA1 (patch-config_FindOpenEXR.cmake) = 8649351dc0a3e1df4827214b53431358c1b70972
 SHA1 (patch-include-vigra-mathutil.hxx) = 45a3e37c24d28a5a5ff9f70281f93c9e0e77348d
+SHA1 (patch-include_vigra_separableconvolution.hxx) = e193577ccd6e75c213403e852a253d15a3187d1f
+SHA1 (patch-include_vigra_stdconvolution.hxx) = 0adf8bd9e9bde2b15463a6a448b0265b5ff95072
diff --git a/graphics/vigra/patches/patch-config_FindOpenEXR.cmake b/graphics/vigra/patches/patch-config_FindOpenEXR.cmake
new file mode 100644
index 00000000000..6e6a71a7880
--- /dev/null
+++ b/graphics/vigra/patches/patch-config_FindOpenEXR.cmake
@@ -0,0 +1,23 @@
+$NetBSD: patch-config_FindOpenEXR.cmake,v 1.1 2021/07/08 21:31:13 markd Exp $
+
+openexr3 patch
+
+--- config/FindOpenEXR.cmake.orig	2017-05-19 15:01:08.000000000 +0000
++++ config/FindOpenEXR.cmake
+@@ -23,6 +23,16 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    find_package(Threads)
++    SET(OPENEXR_FOUND TRUE)
++    SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
++    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++    SET(OPENEXR_VERSION ${OpenEXR_VERSION})
++    return()
++endif()
++
+ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
+ 
+ FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
diff --git a/graphics/vigra/patches/patch-include_vigra_separableconvolution.hxx b/graphics/vigra/patches/patch-include_vigra_separableconvolution.hxx
new file mode 100644
index 00000000000..735dadd6bba
--- /dev/null
+++ b/graphics/vigra/patches/patch-include_vigra_separableconvolution.hxx
@@ -0,0 +1,21 @@
+$NetBSD: patch-include_vigra_separableconvolution.hxx,v 1.1 2021/07/08 21:31:13 markd Exp $
+
+fixed noexcept declaration
+commit/dc730be49fc8def4304a651fa525e43b7754955e
+
+--- include/vigra/separableconvolution.hxx.orig	2017-05-19 15:01:08.000000000 +0000
++++ include/vigra/separableconvolution.hxx
+@@ -1409,10 +1409,10 @@ class Kernel1D
+         {}
+ 
+         ~InitProxy()
+-#ifndef _MSC_VER
+-            throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+             noexcept(false)
++#else
++	    throw(PreconditionViolation)
+ #endif
+         {
+             vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/graphics/vigra/patches/patch-include_vigra_stdconvolution.hxx b/graphics/vigra/patches/patch-include_vigra_stdconvolution.hxx
new file mode 100644
index 00000000000..0acef2f84c8
--- /dev/null
+++ b/graphics/vigra/patches/patch-include_vigra_stdconvolution.hxx
@@ -0,0 +1,21 @@
+$NetBSD: patch-include_vigra_stdconvolution.hxx,v 1.1 2021/07/08 21:31:13 markd Exp $
+
+fixed noexcept declaration
+commit/dc730be49fc8def4304a651fa525e43b7754955e
+
+--- include/vigra/stdconvolution.hxx.orig	2017-05-19 15:01:08.000000000 +0000
++++ include/vigra/stdconvolution.hxx
+@@ -792,10 +792,10 @@ public:
+         {}
+ 
+         ~InitProxy()
+-#ifndef _MSC_VER
+-            throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+             noexcept(false)
++#else
++	    throw(PreconditionViolation)
+ #endif
+         {
+             vigra_precondition(count_ == 1 || count_ == sum_,