git: 73ed226ab4b0 - main - graphics/povray37: 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=73ed226ab4b08daa82e2a8ba850f7978d9551f2e

commit 73ed226ab4b08daa82e2a8ba850f7978d9551f2e
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-11 21:51:11 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:49 +0000

    graphics/povray37: make compatible with OpenEXR/Imath 3.0
---
 graphics/povray37/Makefile                                    |  6 +++---
 graphics/povray37/files/patch-source_backend_povray.cpp       | 11 +++++++++++
 .../povray37/files/patch-unix_config_ax__check__openexr.m4    | 11 +++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 972d9e052c02..aba7cd7e3667 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	povray
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.7.0.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	37
 
@@ -78,8 +78,8 @@ CONFIGURE_ARGS+=--without-libtiff
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	openexr>=1.6:graphics/openexr
 .else
-LIB_DEPENDS+=	libIlmImf.so:graphics/openexr
-CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR
+LIB_DEPENDS+=	libOpenEXR.so:graphics/openexr libImath.so:math/Imath
+CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR -I${LOCALBASE}/include/Imath -DInt64=uint64_t
 .endif
 .else
 CONFIGURE_ARGS+=--without-openexr
diff --git a/graphics/povray37/files/patch-source_backend_povray.cpp b/graphics/povray37/files/patch-source_backend_povray.cpp
new file mode 100644
index 000000000000..61bbaf34ab68
--- /dev/null
+++ b/graphics/povray37/files/patch-source_backend_povray.cpp
@@ -0,0 +1,11 @@
+--- source/backend/povray.cpp.orig	2018-05-27 09:54:06 UTC
++++ source/backend/povray.cpp
+@@ -68,7 +68,7 @@
+ 		extern "C" const char* TIFFGetVersion(void);
+ 	#endif
+     #ifndef OPENEXR_MISSING
+-        #include <IlmBaseConfig.h>
++        #include <ImathConfig.h>
+         #include <OpenEXRConfig.h>
+         // NOTE:
+         //  Versions of OpenEXR and IlmImf prior to 1.7.1 do not seem to have a way to get the version number,
diff --git a/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4 b/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4
new file mode 100644
index 000000000000..5bdd9b4deabf
--- /dev/null
+++ b/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4
@@ -0,0 +1,11 @@
+--- unix/config/ax_check_openexr.m4.orig	2018-05-27 09:54:06 UTC
++++ unix/config/ax_check_openexr.m4
+@@ -56,7 +56,7 @@ AC_DEFUN([AX_CHECK_OPENEXR],
+       # check include file
+       AC_CHECK_HEADER(
+         [OpenEXR/ImfCRgbaFile.h],
+-        [AC_CHECK_LIB([IlmImf], [ImfInputReadPixels], [], [ax_check_openexr="not found"])],
++        [AC_CHECK_LIB([OpenEXR], [ImfInputReadPixels], [], [ax_check_openexr="not found"])],
+         [ax_check_openexr="no headers"]
+       )
+     fi