Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Apr 2021 00:34:38 GMT
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8bd75ffd8089 - main - math/curv: make compatible with OpenEXR/Imath 3.0
Message-ID:  <202104120034.13C0YcQN092600@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8bd75ffd808902bb002b3d1c46a89478cfa57d8b

commit 8bd75ffd808902bb002b3d1c46a89478cfa57d8b
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2021-04-11 19:48:52 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2021-04-12 00:33:47 +0000

    math/curv: make compatible with OpenEXR/Imath 3.0
---
 math/curv/files/patch-CMakeLists.txt          |  4 ++--
 math/curv/files/patch-cmake_FindILMBase.cmake | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/math/curv/files/patch-CMakeLists.txt b/math/curv/files/patch-CMakeLists.txt
index 9a67dffa815b..25ece990b936 100644
--- a/math/curv/files/patch-CMakeLists.txt
+++ b/math/curv/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2019-10-15 23:21:21 UTC
+--- CMakeLists.txt.orig	2019-12-08 04:12:07 UTC
 +++ CMakeLists.txt
 @@ -10,18 +10,14 @@ execute_process(COMMAND sh -c "${CMAKE_SOURCE_DIR}/cma
  
@@ -48,7 +48,7 @@
  file(GLOB Src "curv/*.c" "curv/*.cc")
  add_executable(curv ${Src})
 -target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb_static Half tbb dl pthread)
-+target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb Half tbb dl pthread)
++target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb Imath tbb dl pthread)
  
  file(GLOB CurvcSrc "curvc/*.cc")
  add_executable(curvc EXCLUDE_FROM_ALL ${CurvcSrc})
diff --git a/math/curv/files/patch-cmake_FindILMBase.cmake b/math/curv/files/patch-cmake_FindILMBase.cmake
new file mode 100644
index 000000000000..df960f135ab6
--- /dev/null
+++ b/math/curv/files/patch-cmake_FindILMBase.cmake
@@ -0,0 +1,10 @@
+--- cmake/FindILMBase.cmake.orig	2019-12-08 04:12:07 UTC
++++ cmake/FindILMBase.cmake
+@@ -6,6 +6,6 @@
+ 
+ SET( ILMBASE_FOUND TRUE )
+ SET( ILMBASE_INCLUDE_DIR "" )
+-SET( Ilmbase_HALF_LIBRARY -lHalf )
++SET( Ilmbase_HALF_LIBRARY -lImath )
+ SET( Ilmbase_IEX_LIBRARY -lIex )
+ SET( Ilmbase_ILMTHREAD_LIBRARY -lIlmThread )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104120034.13C0YcQN092600>