summaryrefslogtreecommitdiff
path: root/media-gfx/openvdb
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/openvdb')
-rw-r--r--media-gfx/openvdb/Manifest13
-rw-r--r--media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch16
-rw-r--r--media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch327
-rw-r--r--media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch93
-rw-r--r--media-gfx/openvdb/metadata.xml9
-rw-r--r--media-gfx/openvdb/openvdb-4.0.2-r2.ebuild (renamed from media-gfx/openvdb/openvdb-4.0.2-r1.ebuild)21
-rw-r--r--media-gfx/openvdb/openvdb-4.0.2.ebuild2
-rw-r--r--media-gfx/openvdb/openvdb-5.1.0.ebuild72
8 files changed, 529 insertions, 24 deletions
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index bdb4846cc28e..586b9ca3ea4a 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,6 +1,11 @@
-AUX openvdb-4.0.2-findboost-fix.patch 502 BLAKE2B 3840a5f267c27535654c890d877d050618f2263ada690eb7a0549589dfbf9236cae0b4e04abcad9f1bcfed902ec7d742f81b8ac5d9f60dbf1d0fea07c3b9ba13 SHA512 1e7cd905ee941c8713cf527d6c349127e98b7901c9e853c22abfa8ed691b46780c3817ed61815defaa41c1aa7c4f9895de8d08c3bef847c479af30a4b5f137e6
+AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e
+AUX openvdb-5.1.0-use-gnuinstalldirs.patch 11555 BLAKE2B 3d5ceba96cbd21d58db9d1b76a5ea93f1b4abdb200875c728910d3872d4bba26d1b3ead21df43aab8d6bb7962d56d2585ffd1ae0995643581e4a5464226f1fa3 SHA512 d4a3383f7c757e3fa1380b33f92b5ba4c34719694608f7b8559d53d6b28c1fc183c873dbf88096bc66cd275302c655b528c801012f6de7609020d10b01a884d2
+AUX openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B 4e485c1fd697665949f938f40fe71444c8a2d3dcce7b04a9ebc7142cfd653897c3cc9b23caaf2258c2ee59d1cb36f80aeb7a241f277ab767958af9e692b9bc54 SHA512 c123e51ca0bd6e9f8491fbc1164a5e327672433779a9ce4e607db52a2f2f46c4065ace0ebdf375e0d72be37194186dea360d3f98976cb387ac2dfecfb1eaf0d3
DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
+DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-EBUILD openvdb-4.0.2-r1.ebuild 2002 BLAKE2B 1c1d4ea08177f3d78790501742ab3c6ef41192256cc9f1b99eafa19a66990889e50caac4c66c43834b65fa85e7dcee871c90fa8f0d774c2c3d39bb6745395672 SHA512 c67cb1576bf56eccaee692de2f46bc9998ac4b8c1000fd0f4ce2004b8dd05ae15f46a4a020cf221b9cf25a7fc17cdec8244c501b3617174ef7a8f5b7c053cdab
-EBUILD openvdb-4.0.2.ebuild 1953 BLAKE2B 52acb99e6a74fd2cd0ad7b96518b08acc7ed9fce91c1f0a50947cc9624e3663f44284e1def469870efe3f1b368dad2b036de1c7b4ad25c360f057023c6ca4c3e SHA512 b7a1da36eabbdce27090902769c80d9c72f97353e58b30802274a89553268b7916c2895356fa4563cc25829968c1c4dde83a972fdc863aae75bb724d556fd919
-MISC metadata.xml 1049 BLAKE2B ecb29e1aa1c1e507ee1dbd22b736c252f4013f100e6d47400e130335f2ab37877fa9439ddc73d3a585b44a453f125db37693c251424e92adb6dcf9b965d73d96 SHA512 74cf497d6517b8a9d2e0bf59ed642353a58810bab7727ed07192b3aa125d593a86d95399981e2bb9a5fda858428cc1d79f431d02d974da66001f814dbb9b3c08
+DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6
+EBUILD openvdb-4.0.2-r2.ebuild 2057 BLAKE2B 3890a45eeea15b6627e9b616bc98cad4f40e56a0bf756f48d0a98997d010c86c60e8dfaa4b8e0cfb3481c63432535c8963deca40351d1ba98afe030503b1e9be SHA512 6b708c5eb1041dbb0d9e6642db2fc599610cd8ef35b7892d1caf8d4fa3508f8e84a76730bd72c298ca0e1d69be9e19afa51f58f6ec1b0d38f395e6b1b0183136
+EBUILD openvdb-4.0.2.ebuild 1941 BLAKE2B a31708ae94c2e8b19b958878ee0653f4d1b14b5b4fa272b87c749e27d949211701eccc9508e39ac65d7175b0a39ab17b2ff99015fab8d8ace2c9863f1d0d4bec SHA512 33fc77be6833fa19dfc4783782b83182e4f7f3c5ce09e48fce856be6e3b32e937cc8da5ffb962e891c1b5903a10dba530956dd239644d3d010c301f290dc753e
+EBUILD openvdb-5.1.0.ebuild 1767 BLAKE2B 53e9e42f11bec0306356000c7ce1e6cf851afc1b555eef5cd7f34a39dd093ad6a9f60965488c6db49d1b261b2c4fa68fe517070ef9c7567fbbfd7ed0b32f2908 SHA512 be1a6f9247a068cdfd9cfcb33776c5ff7e5d3e8f04d346bef9303a59dda7a575c8e6127c127c9a252b242d47648d5394205bddc406e951ea2cf33ed3ebfa7318
+MISC metadata.xml 983 BLAKE2B f6ecf0c7d5bda2e9442636d7482b4c0d6dad309646f7b8a3763ddf905063f3427a79ffacaa70d80b9e85fbe7c0160afe12a5b85011c5c5ad735420c5c419dd71 SHA512 c450db63c1cc834a024acf9e8bfa144d76e1797b354a1f6368be9fdd98fbe4d5602b7431c2d91a0a70a8efa3b3edb09ae666431bb197897263741aa148cd90f4
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
index 12245be3e466..fbb29883fe2f 100644
--- a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
@@ -1,11 +1,21 @@
---- openvdb-4.0.2/openvdb/python/CMakeLists.txt.orig 2018-07-12 20:29:50.745624805 +0200
-+++ openvdb-4.0.2/openvdb/python/CMakeLists.txt 2018-07-12 20:30:10.452305180 +0200
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2017-07-31 19:16:32.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-11 12:37:40.179360277 +0100
@@ -3,7 +3,7 @@
FIND_PACKAGE ( PythonInterp REQUIRED )
FIND_PACKAGE ( PythonLibs REQUIRED )
-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} )
++FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
IF ( NOT OPENVDB_BUILD_CORE )
+@@ -92,7 +92,7 @@
+ ${GLFW_LINK_LIBRARY}
+ ${GLFW_DEPENDENT_LIBRARIES}
+ ${GLEW_GLEW_LIBRARY}
+- ${Boost_PYTHON_LIBRARY}
++ ${Boost_LIBRARIES}
+ ${PYTHON_LIBRARY}
+ ${Ilmbase_HALF_LIBRARY}
+ )
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
new file mode 100644
index 000000000000..791e05578729
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
@@ -0,0 +1,327 @@
+diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+--- a/cmake/FindBlosc.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindBlosc.cmake 2018-08-07 21:01:16.869879255 +0100
+@@ -37,7 +37,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( BLOSC_LOCATION include/blosc.h
++FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
+ "$ENV{BLOSC_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -49,7 +49,7 @@
+
+ IF ( BLOSC_FOUND )
+
+- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
++ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ CACHE STRING "Blosc library directories")
+
+ SET ( _blosc_library_name "blosc" )
+@@ -75,6 +75,6 @@
+ SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
+ ENDIF()
+
+- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
++ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
+
+ ENDIF ( BLOSC_FOUND )
+diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
+--- a/cmake/FindCPPUnit.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindCPPUnit.cmake 2018-08-07 21:02:15.421037954 +0100
+@@ -38,7 +38,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
++FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
+ "$ENV{CPPUNIT_ROOT}"
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -53,13 +53,13 @@
+
+ IF ( CPPUNIT_FOUND )
+
+- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
++ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
+ IF (CPPUnit_USE_STATIC_LIBS)
+ SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
+ ELSE ()
+ SET( CPPUNIT_LIBRARY_NAME cppunit)
+ ENDIF ()
+ FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
+- PATHS ${CPPUNIT_LOCATION}/lib )
++ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
+
+ ENDIF ( CPPUNIT_FOUND )
+diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
+--- a/cmake/FindGLEW.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindGLEW.cmake 2018-08-07 21:04:32.804431135 +0100
+@@ -39,7 +39,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( GLEW_LOCATION include/GL/glew.h
++FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
+ "$ENV{GLEW_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -51,7 +51,7 @@
+
+ IF ( GLEW_LOCATION )
+
+- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
++ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
+
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF (GLEW_USE_STATIC_LIBS)
+@@ -74,11 +74,11 @@
+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
+ ELSE (APPLE)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+@@ -107,11 +107,11 @@
+ )
+ ELSE (APPLE)
+ # Unices
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
+--- a/cmake/FindGLFW3.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindGLFW3.cmake 2018-08-07 21:07:24.458954825 +0100
+@@ -39,7 +39,7 @@
+
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+
+-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
++FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
+ "$ENV{GLFW3_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -50,9 +50,9 @@
+ )
+
+ IF (GLFW3_FOUND)
+- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
++ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
+ IF (GLFW3_USE_STATIC_LIBS)
+- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/lib
++ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+@@ -60,7 +60,7 @@
+ NO_CMAKE_SYSTEM_PATH
+ )
+ ELSE (GLFW3_USE_STATIC_LIBS)
+- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/lib
++ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
+--- a/cmake/FindGLFW.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindGLFW.cmake 2018-08-07 21:06:26.358774164 +0100
+@@ -38,12 +38,12 @@
+
+ SET ( GLFW_FOUND FALSE )
+
+-FIND_PATH( GLFW_LOCATION include/GL/glfw.h
++FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
+ "$ENV{GLFW_ROOT}"
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+
+-SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
++SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
+
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ IF (GLFW_USE_STATIC_LIBS)
+@@ -61,7 +61,7 @@
+ FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
+ ELSE (APPLE)
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+@@ -84,7 +84,7 @@
+ )
+ ELSE (APPLE)
+ # Unices
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+ ENDIF (APPLE)
+diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+--- a/cmake/FindOpenVDB.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindOpenVDB.cmake 2018-08-07 21:10:41.640588458 +0100
+@@ -45,7 +45,7 @@
+
+ FIND_PACKAGE( PackageHandleStandardArgs )
+
+-FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h
++FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h
+ "$ENV{OPENVDB_ROOT}"
+ NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+@@ -56,10 +56,10 @@
+ )
+
+ IF( OpenVDB_FOUND )
+- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
++ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
+ CACHE PATH "OpenVDB include directory")
+
+- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
++ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+ CACHE PATH "OpenVDB library directory" )
+
+ FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
+diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
+--- a/cmake/FindTBB.cmake 2018-04-10 19:22:17.000000000 +0100
++++ b/cmake/FindTBB.cmake 2018-08-07 21:11:48.477809067 +0100
+@@ -42,7 +42,7 @@
+
+ # SET ( TBB_FOUND FALSE )
+
+-FIND_PATH( TBB_LOCATION include/tbb/tbb.h
++FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
+ "$ENV{TBB_ROOT}"
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+@@ -57,7 +57,7 @@
+
+ IF ( TBB_FOUND )
+
+- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
++ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
+
+ IF (APPLE)
+ IF (TBB_FOR_CLANG)
+@@ -86,7 +86,7 @@
+ LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
+ ELSE (APPLE)
+ # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
++ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
+ IF (${CMAKE_COMPILER_IS_GNUCXX})
+ IF ( TBB_MATCH_COMPILER_VERSION )
+ STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
+diff -urN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
++++ b/CMakeLists.txt 2018-08-07 20:59:54.149613568 +0100
+@@ -32,6 +32,8 @@
+
+ ENABLE_TESTING()
+
++INCLUDE ( GNUInstallDirs )
++
+ find_program(CCACHE_FOUND ccache)
+ if(CCACHE_FOUND)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
++++ b/openvdb/CMakeLists.txt 2018-08-07 21:21:02.352705838 +0100
+@@ -414,7 +414,7 @@
+ )
+
+ INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)")
+- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
++ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ ENDIF ()
+
+@@ -423,37 +423,37 @@
+ INSTALL ( TARGETS
+ vdb_view
+ DESTINATION
+- bin
++ ${CMAKE_INSTALL_BINDIR}
+ )
+ ENDIF ()
+ INSTALL ( TARGETS
+ vdb_print
+ vdb_render
+ DESTINATION
+- bin
++ ${CMAKE_INSTALL_BINDIR}
+ )
+
+ INSTALL ( TARGETS
+ openvdb_static
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+
+ IF (WIN32)
+ INSTALL ( TARGETS
+ openvdb_shared
+- RUNTIME DESTINATION bin COMPONENT Runtime
+- ARCHIVE DESTINATION lib COMPONENT Runtime
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+ )
+ ELSE()
+ INSTALL ( TARGETS
+ openvdb_shared
+ DESTINATION
+- lib
++ ${CMAKE_INSTALL_LIBDIR}
+ )
+ ENDIF ()
+
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN "python" EXCLUDE
+ PATTERN "cmd" EXCLUDE
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.549685541 +0100
+@@ -54,10 +54,12 @@
+ pyVec3Grid.cc
+ )
+
+-SET ( PYOPENVDB_INSTALL_DIRECTORY
+- lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
+- CACHE STRING "The directory to install the pyopenvdb.so module."
+- )
++IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
++ SET ( PYOPENVDB_INSTALL_DIRECTORY
++ lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
++ CACHE STRING "The directory to install the pyopenvdb.so module."
++ )
++ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
+
+ SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_PYTHON_MODULE_SOURCE_FILES}
+ PROPERTIES
+@@ -110,6 +112,6 @@
+ ${PYOPENVDB_INSTALL_DIRECTORY}
+ )
+
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ )
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
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 806981efae06..71a04b9d558d 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer restrict="&gt;=media-gfx/openvdb-3.1.0" type="person">
+ <maintainer type="person">
<email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
- <maintainer restrict="&gt;=media-gfx/openvdb-3.1.0" type="person">
+ <maintainer type="person">
<email>agrigo2001@yahoo.com.au</email>
<name>Adrian Grigo</name>
</maintainer>
@@ -19,9 +19,8 @@
Chance of Meatballs2' and 'How to Train Your Dragon 2'.
</longdescription>
<use>
- <flag restrict="&gt;=media-gfx/openvdb-4.0.0" name="abi3-compat">
- Enables compatibility with the old 3.x ABI.
- enabled by dfault.
+ <flag restrict="&lt;media-gfx/openvdb-5.0.0" name="abi3-compat">
+ Disables newer features to maintain compatibility with ABI3. Enabled by default.
</flag>
</use>
<upstream>
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 82941626ec77..73415cb7ea20 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -10,12 +10,12 @@ inherit cmake-utils flag-o-matic python-single-r1
DESCRIPTION="Libs for the efficient manipulation of volumetric data"
HOMEPAGE="http://www.openvdb.org"
SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
+ https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+abi3-compat doc python"
+IUSE="+abi3-compat doc python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
@@ -38,14 +38,13 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-cpp/tbb
virtual/pkgconfig
- doc? ( app-doc/doxygen[latex] )"
-
-RESTRICT="test"
+ doc? ( app-doc/doxygen[latex] )
+ test? ( dev-util/cppunit )"
PATCHES=(
- "${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch"
- "${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch"
- "${WORKDIR}/0003-Boost-1.65-NumPy-support.patch"
+ "${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
+ "${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
+ "${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
"${FILESDIR}/${P}-findboost-fix.patch"
)
@@ -62,18 +61,18 @@ src_configure() {
local mycmakeargs=(
-DBLOSC_LOCATION="${myprefix}"
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DGLEW_LOCATION="${myprefix}"
-DGLFW3_LOCATION="${myprefix}"
-DOPENVDB_BUILD_DOCS=$(usex doc)
-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
- -DOPENVDB_BUILD_UNITTESTS=OFF
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-DOPENVDB_ENABLE_RPATH=OFF
-DTBB_LOCATION="${myprefix}"
-DUSE_GLFW3=ON
)
- use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} )
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
cmake-utils_src_configure
}
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
index 24ec7fce3e5b..97720b303f01 100644
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-utils flag-o-matic python-single-r1 versionator
+inherit cmake-utils flag-o-matic python-single-r1
DESCRIPTION="Libs for the efficient manipulation of volumetric data"
HOMEPAGE="http://www.openvdb.org"
diff --git a/media-gfx/openvdb/openvdb-5.1.0.ebuild b/media-gfx/openvdb/openvdb-5.1.0.ebuild
new file mode 100644
index 000000000000..c93ccbfb9404
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-5.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit cmake-utils flag-o-matic python-single-r1
+
+DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+HOMEPAGE="http://www.openvdb.org"
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
+ >=dev-libs/c-blosc-1.5.0
+ dev-libs/jemalloc
+ dev-libs/log4cplus
+ media-libs/glfw:=
+ media-libs/openexr:=
+ sys-libs/zlib:=
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ dev-cpp/tbb
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[latex] )
+ test? ( dev-util/cppunit )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.2-findboost-fix.patch"
+ "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local mycmakeargs=(
+ -DBLOSC_LOCATION="${myprefix}"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DGLFW3_LOCATION="${myprefix}"
+ -DOPENVDB_BUILD_DOCS=$(usex doc)
+ -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test)
+ -DOPENVDB_ENABLE_RPATH=OFF
+ -DTBB_LOCATION="${myprefix}"
+ -DUSE_GLFW3=ON
+ )
+
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+ cmake-utils_src_configure
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 08:11:57 +0000