diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-11-03 06:47:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-03 06:47:15 +0000 |
commit | fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch) | |
tree | f834bdc9a67923ce75297c09d00d1e7b90791d26 /media-gfx/openvdb | |
parent | 162945d2a91899b637bbb9e163b406350de12906 (diff) |
gentoo resync : 03.11.2021
Diffstat (limited to 'media-gfx/openvdb')
-rw-r--r-- | media-gfx/openvdb/Manifest | 15 | ||||
-rw-r--r-- | media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch | 21 | ||||
-rw-r--r-- | media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch | 21 | ||||
-rw-r--r-- | media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch | 151 | ||||
-rw-r--r-- | media-gfx/openvdb/metadata.xml | 3 | ||||
-rw-r--r-- | media-gfx/openvdb/openvdb-7.0.0-r4.ebuild (renamed from media-gfx/openvdb/openvdb-7.0.0-r3.ebuild) | 2 | ||||
-rw-r--r-- | media-gfx/openvdb/openvdb-7.1.0-r5.ebuild (renamed from media-gfx/openvdb/openvdb-7.1.0-r3.ebuild) | 14 | ||||
-rw-r--r-- | media-gfx/openvdb/openvdb-8.0.1-r4.ebuild (renamed from media-gfx/openvdb/openvdb-8.0.1-r2.ebuild) | 13 | ||||
-rw-r--r-- | media-gfx/openvdb/openvdb-8.1.0.ebuild | 130 | ||||
-rw-r--r-- | media-gfx/openvdb/openvdb-9.0.0.ebuild | 135 |
10 files changed, 489 insertions, 16 deletions
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index ee2a16ea5ac4..15683e6124f1 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1,10 +1,17 @@ AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7 +AUX openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch 836 BLAKE2B e04fe9f6e3a1a44a7b4274dd328f88c0dffe14493bad68c4e30807f44330a4328776eefe600e2f9b6565ee363f1db4228f36da995e18556e678672925f5f89ec SHA512 0599bc38a4e74ecede3d174ecee0f207dd8edd2a6f99f68fdb46488505ff093e9e1a6842fe58e94e5bee93f7c79a72bd043b3d7ca070b26895919b57a808a784 AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fcbcb50e24d1965a783d8f2cec07ef8737ee6287018f40fed4ea4520c2c6be20b5936bdf0bd95ab07f277e728b6fccbb07 SHA512 29cd8d4dfd24f262c8e03a4d55502839a99bdac8eae1738b99cd667292034ea5cddec60303daf3a0c0d76a68021b3b4d6fc2f0e5be108d94243f5c11308c194d +AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a8504f6116ee22c46247f72802a9d412df43603b79b9620d0be2efe9745c30d962d1404325f3b09cae4ac9fe1e3bc0052d42 SHA512 beebad98890dc05c7c34594155fcdb163353b3a92c1571c7b017481b1fa167735ec54df019ed5d154e7d0973d3c1d9fd779508d2360f3306eefa6e45d3240d0b +AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 1440366ffcc9f62e8c6974aa82b290053c359986789f019e05f718b44c4af60112328283367e92b06cd2a36d3b6ddc6c9cc6fe2cd6360cf43a1f9a33cbcaebe9 SHA512 a8568effcfa0bb10ad23b574a727311f10add7cdb046d94f40842f9a41e8127c8571ae494950730d898c78900917402a793d1433a44eb4eb322edd3ff97133d6 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2 -EBUILD openvdb-7.0.0-r3.ebuild 2921 BLAKE2B 8dda84383521b9c30b6822f7a0d2e116268a2d9ca847896efc3de7129a1d8a01d0c6151b412fbe9f6c53467a0864017f6102244932337ff94fb03afc33646a9d SHA512 5c20bbcfbede429d0c8d0867300dafec3f7cb6daed7701a658721f6e00f8e50c6891e8e47d75b57279701a18c29e2df1e06e948a2e79fa4ad2ef8798ffee2642 -EBUILD openvdb-7.1.0-r3.ebuild 2851 BLAKE2B 785765666df7bd40dbf5f0de169b0454c22bb77d0fec317f001dd765e46342e95eb8b1fe2c134a7207d0a78795d2e60141bac3f03df03fe0677bb567dadeaa07 SHA512 bb72634c7b42751ccb8083b3a63435032329adf2139c324abb2029ff3fe98546d20200c9000d111781878ca751da28ff3413a43fbf22820e2d401c9c41c5f12d -EBUILD openvdb-8.0.1-r2.ebuild 2878 BLAKE2B 51105fa0f2eb3d1e48dcf3d902d6dd69b9a580bf8e4f7e82b570681e309a50b1a2ca3309b113ef03ca24d5c1da6586fc37750267596f4f1eb4806fb6977c676e SHA512 99ceaa5ab2f9125a945401bd8657b32854807cd56b2bd278b59f3f22922f0eb6a7f10fd8fdff2939e623c4615125ec770c27c7d25279e06c791cb16ca9dda377 -MISC metadata.xml 1549 BLAKE2B e8d5f0ca6156371ff45898efcb217d008db1cb9dd041d818da55f2668af2cd53560d9b5c2ccaf1aed4da88f567294fe52940999d658db67a7372161cadb781a6 SHA512 2ba75c98a8cbf0212d4d24f85f8c3c5f8ee3a98be7dc2749acba4c37de14b489d88276608424290406f3a0bf31fc1298b7844320f6ac607b9f033e0f6ad14d46 +DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0 SHA512 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5 +DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194 +EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba37959fd92573ff824d92f7768674a231ba4d4e88a81eb3c332deb730fc0fe4c38c383c482f151babb1091752cf062 SHA512 2e268d1892ed9b3c8eaf89d27a7c559327756f26c8f5830d113b404c8c6100536626371b32eb4844da3a7e85c0d9e110cd92dc5dc84957d16c139649fe02f42a +EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c +EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6 +EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf +EBUILD openvdb-9.0.0.ebuild 3307 BLAKE2B 13d77210f9a543719340d622a92d2fb33b0f10c9d5d9c89e4f119a1bef1ce2b420428a8bf9dcd22fa4990481b9673613fa44e7dced0233b4cdd0c43ccebd5371 SHA512 7dd1e5ba218c6be718bf477fcacdb55ddfb0ee7677454f85504ee9643575fbbdce5633b85e2d3f5b4b8594154c04fa738a1d09bd457ee4bb25396e8d9b272c30 +MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch new file mode 100644 index 000000000000..87d1d24755b4 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch @@ -0,0 +1,21 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Thu, 28 Oct 2021 11:34:16 +0200 +Subject: [PATCH] add consistency for NumPy find_package call + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> + +diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt +index b473beb..b468d4f 100644 +--- a/openvdb/openvdb/python/CMakeLists.txt ++++ b/openvdb/openvdb/python/CMakeLists.txt +@@ -94,7 +94,7 @@ else() + OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) + + if(USE_NUMPY) +- find_package(Python QUIET COMPONENTS NumPy) ++ find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS} NumPy) + if(NOT TARGET Python::NumPy) + message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " + "\"${MINIMUM_NUMPY_VERSION}\")" +-- +2.33.1 diff --git a/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch b/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch new file mode 100644 index 000000000000..412785fb0e14 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch @@ -0,0 +1,21 @@ +Custom cmake file used to find GLFW always looks at lib/cmake first +ignoring alternate libdirs and leads to using wrong libraries. + +https://bugs.gentoo.org/800200 +[rebased by sam] +--- a/cmake/OpenVDBGLFW3Setup.cmake ++++ b/cmake/OpenVDBGLFW3Setup.cmake +@@ -83,10 +83,10 @@ endif() + + list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS}) + +-set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3") ++set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3") + + # GLFW 3.1 installs CMake modules into glfw instead of glfw3 +-list(APPEND _GLFW3_PATH_SUFFIXES "lib/cmake/glfw" "cmake/glfw" "glfw") ++list(APPEND _GLFW3_PATH_SUFFIXES "cmake/glfw" "glfw") + + find_path(GLFW3_CMAKE_LOCATION glfw3Config.cmake + ${_FIND_GLFW3_ADDITIONAL_OPTIONS} + diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch new file mode 100644 index 000000000000..972db42b3556 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch @@ -0,0 +1,151 @@ +Grabbed relevant parts from upstream PR for 9.x; it's a variant +of https://github.com/gentoo/gentoo/pull/22738 which wa sfor earlier versions. + +https://github.com/AcademySoftwareFoundation/openvdb/pull/1237 + +From 3c5f69efeacca762406a80d74b39b970c7023bd6 Mon Sep 17 00:00:00 2001 +From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> +Date: Thu, 28 Oct 2021 16:54:10 +0100 +Subject: [PATCH 1/3] Improvements to find_package Python usage. Primarily + fixes an issues where NumPy needs to be specified along with the Development + and Interpreter components in a single call + +Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> +--- + openvdb/openvdb/python/CMakeLists.txt | 97 +++++++++++++-------------- + 1 file changed, 46 insertions(+), 51 deletions(-) + +diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt +index 7b36379f9..5e9141e8c 100644 +--- a/openvdb/openvdb/python/CMakeLists.txt ++++ b/openvdb/openvdb/python/CMakeLists.txt +@@ -55,25 +55,39 @@ endif() + # be provided to find_package(Python) with differing major versions. e.g. + # calls to find_package(Python 2.7) fails if python3 is found on the system. + function(OPENVDB_CHECK_PYTHON_VERSION) +- set(_PY_VERSION ${ARGV0}) +- set(_PY_PATH ${ARGV1}) +- if(NOT _PY_VERSION) +- message(FATAL_ERROR "Could NOT find Python (Required is at least version " +- "\"${MINIMUM_PYTHON_VERSION}\")" +- ) +- elseif(_PY_VERSION VERSION_LESS MINIMUM_PYTHON_VERSION) +- message(FATAL_ERROR "Could NOT find Python: Found unsuitable version \"${_PY_VERSION}\"" +- "but required is at least \"${MINIMUM_PYTHON_VERSION}\" (found ${_PY_PATH})" +- ) +- else() +- message(STATUS "Found Python: ${_PY_PATH}) (found suitable version \"${_PY_VERSION}\", " +- "minimum required is \"${MINIMUM_PYTHON_VERSION}\")" ++ set(PY_TARGET ${ARGV0}) ++ set(PY_TARGET_VERSION ${ARGV1}) ++ set(PY_TARGET_INCLUDES ${ARGV2}) ++ set(MIN_VERSION ${ARGV3}) ++ set(FUTURE_MIN_VERSION ${ARGV4}) ++ ++ if(NOT TARGET ${PY_TARGET}) ++ message(FATAL_ERROR "Could NOT find ${PY_TARGET} (Required is at least version " ++ "\"${MIN_VERSION}\")" + ) + endif() ++ ++ if(PY_TARGET_VERSION AND MIN_VERSION) ++ if(PY_TARGET_VERSION VERSION_LESS MIN_VERSION) ++ message(FATAL_ERROR "Could NOT find ${PY_TARGET}: Found unsuitable version " ++ "\"${PY_TARGET_VERSION}\" but required is at least \"${MIN_VERSION}\" (found ${PY_TARGET_INCLUDES})" ++ ) ++ endif() ++ endif() ++ ++ message(STATUS "Found ${PY_TARGET}: ${PY_TARGET_INCLUDES}) (found suitable " ++ "version \"${PY_TARGET_VERSION}\", minimum required is \"${MIN_VERSION}\")" ++ ) ++ ++ if(OPENVDB_FUTURE_DEPRECATION AND PY_TARGET_VERSION AND FUTURE_MIN_VERSION) ++ if(PY_TARGET_VERSION VERSION_LESS FUTURE_MIN_VERSION) ++ message(DEPRECATION "Support for ${PY_TARGET} versions < ${FUTURE_MIN_VERSION} " ++ "is deprecated and will be removed.") ++ endif() ++ endif() + endfunction() + + # Configure Python and Numpy. Note that: +-# - find_package(Python NumPy) requires CMake >= 3.14 + # - find_package(Python Development) target Python::Module requires CMake >= 3.15 + # - find_package(Python Development.Module) requires CMake >= 3.18 + # To ensure consistent versions between components Interpreter, Compiler, +@@ -85,38 +99,30 @@ endfunction() + set(OPENVDB_PYTHON_DEPS) + set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) + if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) +- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) ++ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) + endif() + +-find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) +-OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) +- + if(USE_NUMPY) +- find_package(Python QUIET COMPONENTS NumPy) +- if(NOT TARGET Python::NumPy) +- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " +- "\"${MINIMUM_NUMPY_VERSION}\")" +- ) +- elseif(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION) +- message(FATAL_ERROR "Could NOT find NumPy: Found unsuitable version \"${Python_NumPy_VERSION}\"" +- "but required is at least \"${MINIMUM_NUMPY_VERSION}\" (found ${Python_NumPy_INCLUDE_DIRS})" +- ) +- else() +- message(STATUS "Found NumPy: ${Python_NumPy_INCLUDE_DIRS} (found suitable " +- "version \"${Python_NumPy_VERSION}\", minimum required is " +- "\"${MINIMUM_NUMPY_VERSION}\")" +- ) +- endif() +- list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) ++ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy) + endif() + ++# Make sure find_package(Python) is only ever invoked once with all required components ++find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) ++ ++openvdb_check_python_version(Python::Module ++ "${Python_VERSION}" ++ "${Python_INCLUDE_DIRS}" ++ "${MINIMUM_PYTHON_VERSION}" ++ "${FUTURE_MINIMUM_PYTHON_VERSION}") ++list(APPEND OPENVDB_PYTHON_DEPS Python::Module) ++ + if(USE_NUMPY) +- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_NUMPY_VERSION) +- if(Python_NumPy_VERSION VERSION_LESS FUTURE_MINIMUM_NUMPY_VERSION) +- message(DEPRECATION "Support for NumPy versions < ${FUTURE_MINIMUM_NUMPY_VERSION} " +- "is deprecated and will be removed.") +- endif() +- endif() ++ openvdb_check_python_version(Python::NumPy ++ "${Python_NumPy_VERSION}" ++ "${Python_NumPy_INCLUDE_DIRS}" ++ "${MINIMUM_NUMPY_VERSION}" ++ "${FUTURE_MINIMUM_NUMPY_VERSION}") ++ list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) + endif() + + if(TARGET openvdb_shared AND NOT Boost_USE_STATIC_LIBS) +@@ -230,17 +236,6 @@ elseif(WIN32) + set_target_properties(pyopenvdb PROPERTIES SUFFIX ".pyd") # .pyd on windows + endif() + +-if(TARGET Python::Module) +- list(APPEND OPENVDB_PYTHON_DEPS Python::Module) +-else() +- if(APPLE) +- target_include_directories(pyopenvdb SYSTEM PUBLIC ${Python_INCLUDE_DIRS}) +- target_link_options(pyopenvdb PUBLIC -undefined dynamic_lookup) +- else() +- list(APPEND OPENVDB_PYTHON_DEPS Python::Python) +- endif() +-endif() +- + target_link_libraries(pyopenvdb PUBLIC + ${OPENVDB_LIB} + ${OPENVDB_PYTHON_DEPS} + diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index e1602ec0aa5f..a4302c6004d8 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -15,6 +15,9 @@ Chance of Meatballs2' and 'How to Train Your Dragon 2'. </longdescription> <use> + <flag name="blosc"> + Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg> + </flag> <flag restrict=">=media-gfx/openvdb-7.0.0" name="numpy"> Build pyopenvdb with support for <pkg>dev-python/numpy</pkg> </flag> diff --git a/media-gfx/openvdb/openvdb-7.0.0-r3.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild index 2d5fa8ff3512..f9b159f4213b 100644 --- a/media-gfx/openvdb/openvdb-7.0.0-r3.ebuild +++ b/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.openvdb.org" SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0" +SLOT="0/7" KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat" RESTRICT="!test? ( test )" diff --git a/media-gfx/openvdb/openvdb-7.1.0-r3.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild index 2c6c85a3efc3..ddf724c720fd 100644 --- a/media-gfx/openvdb/openvdb-7.1.0-r3.ebuild +++ b/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild @@ -5,15 +5,15 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake flag-o-matic python-single-r1 +inherit cmake python-single-r1 DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org" SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +SLOT="0/7" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat" RESTRICT="!test? ( test )" @@ -91,9 +91,9 @@ src_configure() { -DOPENVDB_ABI_VERSION_NUMBER="${version}" -DOPENVDB_BUILD_DOCS=$(usex doc) -DOPENVDB_BUILD_UNITTESTS=$(usex test) - -DOPENVDB_BUILD_VDB_LOD=$(usex !utils) - -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) - -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) -DOPENVDB_CORE_SHARED=ON -DOPENVDB_CORE_STATIC=$(usex static-libs) -DOPENVDB_ENABLE_RPATH=OFF @@ -109,6 +109,8 @@ src_configure() { -DUSE_NUMPY=$(usex numpy) -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + -DPython_LIBRARY="$(python_get_library_path)" ) fi diff --git a/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild index fc19c87ea4c8..2e3f87c1aa79 100644 --- a/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild +++ b/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild @@ -5,14 +5,14 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake flag-o-matic python-single-r1 +inherit cmake python-single-r1 DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org" SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0" +SLOT="0/8" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat abi7-compat +abi8-compat" RESTRICT="!test? ( test )" @@ -66,6 +66,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" "${FILESDIR}/${P}-glfw-libdir.patch" + "${FILESDIR}/${P}-add-consistency-for-NumPy-find_package-call.patch" ) pkg_setup() { @@ -92,9 +93,9 @@ src_configure() { -DOPENVDB_ABI_VERSION_NUMBER="${version}" -DOPENVDB_BUILD_DOCS=$(usex doc) -DOPENVDB_BUILD_UNITTESTS=$(usex test) - -DOPENVDB_BUILD_VDB_LOD=$(usex !utils) - -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) - -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) -DOPENVDB_CORE_SHARED=ON -DOPENVDB_CORE_STATIC=$(usex static-libs) -DOPENVDB_ENABLE_RPATH=OFF @@ -108,8 +109,10 @@ src_configure() { mycmakeargs+=( -DOPENVDB_BUILD_PYTHON_MODULE=ON -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" ) fi diff --git a/media-gfx/openvdb/openvdb-8.1.0.ebuild b/media-gfx/openvdb/openvdb-8.1.0.ebuild new file mode 100644 index 000000000000..5042d7339314 --- /dev/null +++ b/media-gfx/openvdb/openvdb-8.1.0.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Library for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/8" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + numpy? ( python ) + ^^ ( abi6-compat abi7-compat abi8-compat ) + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Check if newer releases work with newer TBB, bug #820788 +RDEPEND=" + <dev-cpp/tbb-2021.4.0:= + dev-libs/boost:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + media-libs/glfw + media-libs/glu + media-libs/ilmbase:= + media-libs/openexr:0= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + blosc? ( dev-libs/c-blosc:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) + zlib? ( sys-libs/zlib ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-util/cmake-3.16.2-r1 + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" + "${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch" + "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local version + if use abi6-compat; then + version=6 + elif use abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + else + die "OpenVDB ABI version is not compatible" + fi + + local mycmakeargs=( + -DCHOST="${CHOST}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_BLOSC=$(usex blosc) + -DUSE_ZLIB=$(usex zlib) + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + # Off for now until 9.0.0 for OpenEXR 3 support + -DUSE_IMATH_HALF=OFF + -DUSE_LOG4CPLUS=ON + ) + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild new file mode 100644 index 000000000000..898e80d496d6 --- /dev/null +++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Library for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/9" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + numpy? ( python ) + ^^ ( abi6-compat abi7-compat abi8-compat ) + python? ( ${PYTHON_REQUIRED_USE} ) +" +RDEPEND=" + >=dev-cpp/tbb-2021.4.0:= + dev-libs/boost:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + dev-libs/imath:= + media-libs/glfw + media-libs/glu + media-libs/openexr:3= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + blosc? ( dev-libs/c-blosc:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) + zlib? ( sys-libs/zlib ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" + "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" + "${FILESDIR}/${PN}-9.0.0-numpy.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # Make sure we find our renamed Imath headers + # bug #820929 + sed -i -e 's:#include <Imath/half.h>:#include <Imath-3/half.h>:' openvdb/openvdb/Types.h || die + + cmake_src_prepare +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local version + if use abi6-compat; then + version=6 + elif use abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + else + die "OpenVDB ABI version is not compatible" + fi + + # TODO: add NanoVDB? + # https://academysoftwarefoundation.github.io/openvdb/NanoVDB_HowToBuild.html + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_BLOSC=$(usex blosc) + -DUSE_ZLIB=$(usex zlib) + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + -DUSE_IMATH_HALF=ON + -DUSE_LOG4CPLUS=ON + ) + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} |