git: 9afced56643d - main - graphics/cimg: 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=9afced56643d76c48d9fac24ede0e1e39f3478cd

commit 9afced56643d76c48d9fac24ede0e1e39f3478cd
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-11 04:41:04 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:44 +0000

    graphics/cimg: make compatible with OpenEXR/Imath 3.0
---
 graphics/cimg/Makefile                       | 6 ++++--
 graphics/cimg/files/patch-examples__Makefile | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 1934340d4a4e..3f084382634a 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v.
 DISTVERSION=	2.9.7
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
@@ -49,9 +50,9 @@ LIB_DEPENDS+=	libboard.so:graphics/libboard
 LIB_DEPENDS+=	libcurl.so:ftp/curl			\
 		libpng.so:graphics/png			\
 		libtiff.so:graphics/tiff		\
-		libHalf.so:graphics/ilmbase		\
+		libImath.so:math/Imath			\
 		libheif.so:graphics/libheif		\
-		libIlmImf.so:graphics/openexr		\
+		libOpenEXR.so:graphics/openexr		\
 		libgimp-2.0.so:graphics/gimp-app	\
 		libfftw3.so:math/fftw3			\
 		libopencv_core.so:graphics/opencv	\
@@ -83,6 +84,7 @@ USE_XORG+=	xext
 . endif
 
 DOCBASE=	README.txt
+CFLAGS+=	-I${LOCALBASE}/include/Imath -I${LOCALBASE}/include/OpenEXR
 MAKE_ARGS+=	CPPFLAGS="${CFLAGS}" FREEBSD_LDFLAGS="${LDFLAGS}"
 PROGS=		CImg_demo captcha curve_editor2d dtmri_view3d			\
 	edge_explorer2d fade_images gaussian_fit1d generate_loop_macros		\
diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile
index 91b8048819cb..01f6af383905 100644
--- a/graphics/cimg/files/patch-examples__Makefile
+++ b/graphics/cimg/files/patch-examples__Makefile
@@ -58,7 +58,8 @@
 -OPENEXR_INCDIR = -I/usr/include/OpenEXR
 +OPENEXR_INCDIR = -I$(LOCALBASE)/include/OpenEXR
  OPENEXR_CFLAGS = $(OPENEXR_DEFINE) $(OPENEXR_INCDIR)
- OPENEXR_LIBS = -lIlmImf -lHalf
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_LIBS = -lOpenEXR -lImath
  
  # Flags to enable native support for various video files, using the FFMPEG library.
  # ( http://www.ffmpeg.org/ )