git: 4cb2f6041ce7 - main - graphics/vigra: make compatible with OpenEXR/Imath 3.0

[Matthias Andree]

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4cb2f6041ce71d590b6cad0624639b23f880c1cf

commit 4cb2f6041ce71d590b6cad0624639b23f880c1cf
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-11 18:38:30 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:45 +0000

    graphics/vigra: make compatible with OpenEXR/Imath 3.0
---
 graphics/vigra/Makefile                             |  8 +++++---
 graphics/vigra/files/patch-config_FindOpenEXR.cmake | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index b717e5100be1..f77070e64550 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	vigra
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.11.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 
 MAINTAINER=	ports at FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT=	VIGRA stands for "Vision with Generic Algorithms"
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
+LIB_DEPENDS=	libImath.so:math/Imath \
 		libsz.so:science/szip
 
 USES=		cmake compiler:c++14-lang python:run shebangfix
@@ -21,6 +21,8 @@ GH_ACCOUNT=	ukoethe
 GH_TAGNAME=	8acd73a
 USE_LDCONFIG=	yes
 
+CFLAGS+=	-I${LOCALBASE}/include/Imath
+
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 SHEBANG_FILES=	config/vigra-config.in
@@ -35,7 +37,7 @@ HDF5_CMAKE_BOOL=	WITH_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr
+OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 NUMPY_CMAKE_BOOL=	WITH_VIGRANUMPY
diff --git a/graphics/vigra/files/patch-config_FindOpenEXR.cmake b/graphics/vigra/files/patch-config_FindOpenEXR.cmake
new file mode 100644
index 000000000000..06aae65b6394
--- /dev/null
+++ b/graphics/vigra/files/patch-config_FindOpenEXR.cmake
@@ -0,0 +1,20 @@
+--- config/FindOpenEXR.cmake.orig	2018-10-19 16:12:20 UTC
++++ config/FindOpenEXR.cmake
+@@ -27,7 +27,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFI
+ 
+ FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
+     if(NOT OPENEXR_ILMIMF_LIBRARY)
+-        FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V})
++   	FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES OpenEXR${V})
+         if(OPENEXR_ILMIMF_LIBRARY)
+             set(OPENEXR_VERSION ${V})
+         endif()
+@@ -37,7 +37,7 @@ ENDFOREACH(V)
+ FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION})
+ FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION})
+ FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION})
+-FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half)
++FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Imath)
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG