1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

graphics/vigra: make compatible with OpenEXR/Imath 3.0

This commit is contained in:
Matthias Andree 2021-04-11 20:38:30 +02:00
parent 8b4cc116f6
commit 4cb2f6041c
2 changed files with 25 additions and 3 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= vigra
DISTVERSIONPREFIX=v
DISTVERSION= 1.11.1
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
@ -12,7 +12,7 @@ COMMENT= VIGRA stands for "Vision with Generic Algorithms"
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libHalf.so:graphics/ilmbase \
LIB_DEPENDS= libImath.so:math/Imath \
libsz.so:science/szip
USES= cmake compiler:c++14-lang python:run shebangfix
@ -21,6 +21,8 @@ GH_ACCOUNT= ukoethe
GH_TAGNAME= 8acd73a
USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include/Imath
CMAKE_ARGS= -DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
-DDOCINSTALL:PATH=${DOCSDIR_REL}
SHEBANG_FILES= config/vigra-config.in
@ -35,7 +37,7 @@ HDF5_CMAKE_BOOL= WITH_HDF5
HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5
OPENEXR_CMAKE_BOOL= WITH_OPENEXR
OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr
NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+)
NUMPY_CMAKE_BOOL= WITH_VIGRANUMPY

View File

@ -0,0 +1,20 @@
--- config/FindOpenEXR.cmake.orig 2018-10-19 16:12:20 UTC
+++ config/FindOpenEXR.cmake
@@ -27,7 +27,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFI
FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
if(NOT OPENEXR_ILMIMF_LIBRARY)
- FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V})
+ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES OpenEXR${V})
if(OPENEXR_ILMIMF_LIBRARY)
set(OPENEXR_VERSION ${V})
endif()
@@ -37,7 +37,7 @@ ENDFOREACH(V)
FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION})
FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION})
FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION})
-FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half)
+FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Imath)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG