1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00

graphics/darktable: make compatible with OpenEXR/Imath 3.0

This commit is contained in:
Matthias Andree 2021-04-10 23:23:06 +02:00
parent f57940a456
commit 309ccb9a4c
3 changed files with 17 additions and 4 deletions

View File

@ -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

View File

@ -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})

View File

@ -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")