git: 02ac12ab4347 - main - graphics/pfstools: make compatible with OpenEXR/Imath 3.0
Matthias Andree
mandree at FreeBSD.org
Mon Apr 12 00:34:42 UTC 2021
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=02ac12ab4347d0b8c512b99d6046e667f70558cb
commit 02ac12ab4347d0b8c512b99d6046e667f70558cb
Author: Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-11 21:38:20 +0000
Commit: Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:49 +0000
graphics/pfstools: make compatible with OpenEXR/Imath 3.0
---
graphics/pfstools/Makefile | 9 ++++----
.../pfstools/files/patch-cmake_FindOpenEXR.cmake | 26 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index ee1a77f825dd..2f22f1385cf1 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pfstools
DISTVERSION= 2.1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF
@@ -16,13 +16,14 @@ RUN_DEPENDS= bash:shells/bash
CONFLICTS= pfstmo-1.* pfscalibration-1.*
+CFLAGS+= -I${LOCALBASE}/include/Imath
LDFLAGS+= -lthr
USES= cmake tar:tgz dos2unix jpeg perl5
USE_PERL5= run
USE_LDCONFIG= yes
-CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON \
+CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \
-DWITH_MATLAB=OFF \
-DBASH_EXECUTABLE:STRING=${LOCALBASE}/bin/bash \
-DPERL_EXECUTABLE:STRING=${PERL}
@@ -50,8 +51,8 @@ TIFF_CMAKE_BOOL= WITH_TIFF
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
OPENEXR_CMAKE_BOOL= WITH_OpenEXR
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
- libIex.so:graphics/ilmbase
+OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \
+ libImath.so:math/Imath
IMAGEMAGICK_CMAKE_BOOL= WITH_ImageMagick
IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6
diff --git a/graphics/pfstools/files/patch-cmake_FindOpenEXR.cmake b/graphics/pfstools/files/patch-cmake_FindOpenEXR.cmake
new file mode 100644
index 000000000000..4b7e15621607
--- /dev/null
+++ b/graphics/pfstools/files/patch-cmake_FindOpenEXR.cmake
@@ -0,0 +1,26 @@
+--- cmake/FindOpenEXR.cmake.orig 2021-04-11 21:35:51 UTC
++++ cmake/FindOpenEXR.cmake
+@@ -35,9 +35,8 @@ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR}
+ ENDIF()
+
+ SET(_openexr_FIND_COMPONENTS
+- Half
+ Iex
+- IlmImf
++ OpenEXR
+ IlmThread
+ Imath
+ )
+@@ -108,10 +107,10 @@ INCLUDE(FindPackageHandleStandardArgs)
+
+ # This is a work-around as passing the list does not work in cmake 2.8.11.2 (cygwin)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
+- OPENEXR_HALF_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_ILMIMF_LIBRARY OPENEXR_ILMTHREAD_LIBRARY OPENEXR_IMATH_LIBRARY ZLIB_LIBRARY OPENEXR_INCLUDE_DIR)
++ OPENEXR_OPENEXR_LIBRARY OPENEXR_IMATH_LIBRARY ZLIB_LIBRARY OPENEXR_INCLUDE_DIR)
+
+ IF(OPENEXR_FOUND)
+- SET(OPENEXR_LIBRARIES ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY})
++ SET(OPENEXR_LIBRARIES ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_OPENEXR_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY})
+ # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${ZLIB_INCLUDE_DIR})
+ ENDIF()
More information about the dev-commits-ports-all
mailing list