git: 309ccb9a4c5f - main - graphics/darktable: 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=309ccb9a4c5f4a15c7cb75ba2c826365bb146865

commit 309ccb9a4c5f4a15c7cb75ba2c826365bb146865
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-10 21:23:06 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:38 +0000

    graphics/darktable: make compatible with OpenEXR/Imath 3.0
---
 graphics/darktable/Makefile                                  |  5 +++--
 .../darktable/files/patch-cmake_modules_FindOpenEXR.cmake    | 12 ++++++++++++
 graphics/darktable/files/patch-src_CMakeLists.txt            |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 5c3c867f9f9a..cb8af270a417 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -85,8 +85,9 @@ NLS_USES_OFF=		gettext-runtime
 NLS_CMAKE_OFF=		-DUSE_NLS:BOOL=OFF
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 
-OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr \
-			libIlmThread.so:graphics/ilmbase
+OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
+			libImath.so:math/Imath
+OPENEXR_CFLAGS=		-I${LOCALBASE}/include/Imath
 OPENEXR_CMAKE_OFF=	-DUSE_OPENEXR:BOOL=OFF
 
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
diff --git a/graphics/darktable/files/patch-cmake_modules_FindOpenEXR.cmake b/graphics/darktable/files/patch-cmake_modules_FindOpenEXR.cmake
new file mode 100644
index 000000000000..15b262b00c30
--- /dev/null
+++ b/graphics/darktable/files/patch-cmake_modules_FindOpenEXR.cmake
@@ -0,0 +1,12 @@
+--- cmake/modules/FindOpenEXR.cmake.orig	2021-02-03 13:36:49 UTC
++++ cmake/modules/FindOpenEXR.cmake
+@@ -24,9 +24,6 @@ find_path(_OPENEXR_LIB_DIR OpenEXR
+ set(OpenEXR_LIB_DIR ${_OPENEXR_LIB_DIR})
+ mark_as_advanced(OpenEXR_LIB_DIR)
+ 
+-find_library(_OPENEXR_LIBRARY_IMIMF IlmImf
+-  HINTS ENV OPENEXR_LIB_DIR)
+-set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMIMF})
+ find_library(_OPENEXR_LIBRARY_IMATH Imath
+   HINTS ENV OPENEXR_LIB_DIR)
+ set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMATH})
diff --git a/graphics/darktable/files/patch-src_CMakeLists.txt b/graphics/darktable/files/patch-src_CMakeLists.txt
index 62b5072b839b..d230289e19bc 100644
--- a/graphics/darktable/files/patch-src_CMakeLists.txt
+++ b/graphics/darktable/files/patch-src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig	2020-04-15 07:10:53 UTC
+--- src/CMakeLists.txt.orig	2021-02-03 13:36:49 UTC
 +++ src/CMakeLists.txt
-@@ -360,7 +360,7 @@ if(USE_OPENJPEG)
+@@ -388,7 +388,7 @@ if(USE_OPENJPEG)
      add_definitions("-DHAVE_OPENJPEG")
      list(APPEND SOURCES "common/imageio_j2k.c")