1 files changed, 93 insertions, 0 deletions
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
new file mode 100644
index 000000000000..c2ecac0bf82d
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -0,0 +1,93 @@
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt	2018-08-07 21:21:02.000000000 +0100
++++ b/openvdb/CMakeLists.txt	2018-08-07 21:47:02.355277361 +0100
+@@ -83,11 +83,12 @@
+   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
+ ENDIF ()
+ 
++FIND_PACKAGE ( PkgConfig REQUIRED )
+ FIND_PACKAGE ( Blosc REQUIRED )
+ FIND_PACKAGE ( TBB REQUIRED )
+ FIND_PACKAGE ( ZLIB REQUIRED )
+-FIND_PACKAGE ( ILMBase REQUIRED )
+-FIND_PACKAGE ( OpenEXR REQUIRED )
++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
++PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
+ FIND_PACKAGE ( OpenGL REQUIRED )
+ IF (OPENVDB_BUILD_DOCS)
+   FIND_PACKAGE ( Doxygen REQUIRED )
+@@ -111,8 +112,8 @@
+   INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
+ ENDIF ()
+ 
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
+ 
+ IF (WIN32)
+@@ -184,7 +185,7 @@
+   ${Boost_IOSTREAMS_LIBRARY}
+   ${Boost_SYSTEM_LIBRARY}
+   ${Tbb_TBB_LIBRARY}
+-  ${Ilmbase_HALF_LIBRARY}
++  ${ILMBASE_LIBS_LDFLAGS}
+   ${ZLIB_LIBRARY}
+   ${BLOSC_blosc_LIBRARY}
+   )
+@@ -192,7 +193,7 @@
+   ${Boost_IOSTREAMS_LIBRARY}
+   ${Boost_SYSTEM_LIBRARY}
+   ${Tbb_TBB_LIBRARY}
+-  ${Ilmbase_HALF_LIBRARY}
++  ${ILMBASE_LIBS_LDFLAGS}
+   ${ZLIB_LIBRARY}
+   ${BLOSC_blosc_LIBRARY}
+   )
+@@ -246,9 +247,8 @@
+   openvdb_shared
+   ${CMAKE_THREAD_LIBS_INIT}
+   ${BLOSC_blosc_LIBRARY}
+-  ${Openexr_ILMIMF_LIBRARY}
+-  ${Ilmbase_ILMTHREAD_LIBRARY}
+-  ${Ilmbase_IEX_LIBRARY}
++  ${OPENEXR_LIBS_LDFLAGS}
++  ${ILMBASE_LIBS_LDFLAGS}
+   m
+   stdc++
+   )
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt	2018-08-07 21:20:56.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt	2018-08-07 21:31:55.508016795 +0100
+@@ -9,8 +9,8 @@
+ IF ( NOT OPENVDB_BUILD_CORE )
+   FIND_PACKAGE ( OpenVDB REQUIRED )
+ 
+-  FIND_PACKAGE ( ILMBase REQUIRED )
+-  FIND_PACKAGE ( OpenEXR REQUIRED )
++  PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
++  PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
+   FIND_PACKAGE ( Blosc REQUIRED )
+   FIND_PACKAGE ( TBB REQUIRED )
+   FIND_PACKAGE ( ZLIB REQUIRED )
+@@ -29,8 +29,8 @@
+   SET ( OPENVDB_LIB openvdb_shared)
+ ENDIF ( NOT OPENVDB_BUILD_CORE )
+ 
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
+@@ -96,7 +96,7 @@
+   ${GLEW_GLEW_LIBRARY}
+   ${Boost_PYTHON_LIBRARY}
+   ${PYTHON_LIBRARY}
+-  ${Ilmbase_HALF_LIBRARY}
++  ${ILMBASE_LIBS_LDFLAGS}
+   )
+ 
+ SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES