diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
| commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
| tree | b9791a06ab3284e27b568412c59316c66240c682 /media-gfx/openvdb | |
| parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) | |
gentoo resync : 22.12.2021
Diffstat (limited to 'media-gfx/openvdb')
| -rw-r--r-- | media-gfx/openvdb/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch | 57 | ||||
| -rw-r--r-- | media-gfx/openvdb/openvdb-9.0.0.ebuild | 1 |
3 files changed, 28 insertions, 34 deletions
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index e45b4cb90d01..84314810fb10 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -6,7 +6,7 @@ AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a850 AUX openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch 1351 BLAKE2B 0a63f9c2c3fd44cfe8013e2c73c3f311d92fee2b6828801175969a0f7123401c21ad11325788ba8b38716a6d21ccf9bd0e685e0c3bb51d6c3f0a0bd3fcdb409b SHA512 5443a3204c9f8b6b8ae9e533ee8c18d6e82463cb3c5be1e3664ab2067a7ba2c9d99f17263204d6be940db3dcd1d8721b359ac0de698f760d23ba05a68e03f1e9 AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 58e1ed82abe0e2a50ba7861188d65baa48e6c6273bcdbacccf92923de88359d6b08fa52eb6bc8d0b4f144b360680f52a94c696abcfcbb3e1c9045ba830c03646 SHA512 ddedfeae9a68c57c4de14ffdf05f952611fe72fd089320fba5f432d5562a09c661750eca4d0e256be1a3f0ac3e141b26db8d738df5b3a2ddb58a747331c90729 AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc -AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1558 BLAKE2B eec71d9e4436ff141a85c9fdfd50b4e4883cfda9e8819ff02acf976c5e4e74aa2f44a57353600256b52806be8fe577e705900c2216cbd68945df3175831415cd SHA512 2ea6cbd9d7497ea06e0766c1b311905bb26908df43f1960bb0c3e676257b8793fd024d615c532c38ae53c0fa313a15e4cd214bd1d174f19ba4de31244c0f970a +AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1471 BLAKE2B e13ad11bfcb13a763bc73f2a26dbc11d1967098942d6f685cbd9fa2de467ac64c71d093e267db1d2d15e40ac3ab25d9b3995e40cc58d069109ded5abdd8ecb3f SHA512 137f96d8d906f2ea321670823c6fb80256b98179e7d4e044e78e62417d7489eae464f9596f13e80fd2dcafbcd946cf94e192965de48d900e061418f39f16c39c 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 @@ -18,5 +18,5 @@ EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2 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-8.2.0-r1.ebuild 3474 BLAKE2B 650cde4a8f46ef313025bbaba7f7f9698c1f0fa8347fa6aa1e2e3afb05904da49974d695e6578d2ce39c6bb8d2a331a3a7188837d85a3f090690c98797469527 SHA512 be60e550c9a334a05092bc95090ee5044f07d777484cc6efef050237c9b5f337182b4e1b1219b3290bc4d214a37fc83cb9baca3b2bb7872c3a0efe13bc968810 -EBUILD openvdb-9.0.0.ebuild 3382 BLAKE2B a2b5ecaabb519d92d23e2c5a6411f4c0c6ef5f806583f44f938a0cce97763f2bd4987636d6de0bdbe42e4ed27cd5e327910fbb1b2c1b5d207dd58a6e1f39585b SHA512 0e22e8b90ab0fa2a8fee36f16b5d649984b9ea489832c107879876073bd6c884d3cb9a1892171895849e477e5d49a59bd581f31ffb4ba01ecdf1356453257a75 +EBUILD openvdb-9.0.0.ebuild 3347 BLAKE2B e2bf412d66dfd7b8b4fdaa356a61381bcad5311d759902e007d8d66dbe7f5bfc3ae878f7a93983c592ffccc54db6f3f8378ddab2c2fa5f31a8a08c7427bc7e85 SHA512 5ce547ff60fe80d650dcb7674b2c42e457f56203208e1fc521ce3c475b08e7e5c202575a0d730528c6b3d1ef5596434fc921a4943b34bd44dc7857d049153c4f MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch index 66c50b485d70..1a24f4c535c3 100644 --- a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch +++ b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch @@ -1,40 +1,35 @@ -From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 2 Dec 2021 02:16:15 +0000 -Subject: [PATCH] cmake: unconditionally search for Python interpreter +https://bugs.gentoo.org/790350 +https://github.com/AcademySoftwareFoundation/openvdb/pull/1275 -When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with: -``` --- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9") -CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message): - Could NOT find Python::Module (Required is at least version "2.7") -Call Stack (most recent call first): - openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version) -``` +From 86cbe16b5f8bf9df2c3825d7d7d90c58bc0d3391 Mon Sep 17 00:00:00 2001 +From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> +Date: Wed, 8 Dec 2021 16:57:58 +0000 +Subject: [PATCH] Fixed an issue with find_python and cmake 3.18 -It seems like we always need to search for the interpreter. - -Bug: https://bugs.gentoo.org/790350 -Signed-off-by: Sam James <sam@gentoo.org> +Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> --- - openvdb/openvdb/python/CMakeLists.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + openvdb/openvdb/python/CMakeLists.txt | 10 +++++++++- + pendingchanges/cmake_python.txt | 2 ++ + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt -index 2821efb5..af93976a 100644 +index 2821efb5d..179c0c57d 100644 --- a/openvdb/openvdb/python/CMakeLists.txt +++ b/openvdb/openvdb/python/CMakeLists.txt -@@ -98,9 +98,7 @@ endfunction() +@@ -97,7 +97,15 @@ endfunction() + # target but this was only added in CMake 3.15. See: # https://github.com/AcademySoftwareFoundation/openvdb/issues/886 set(OPENVDB_PYTHON_DEPS) - set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) --if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) -- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) --endif() -+list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) - - if(USE_NUMPY) - list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy) --- -2.34.1 - +-set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) ++ ++# @note explicitly only search for Development.Module from 3.18 as searching ++# Development.Embed can cause issues on linux systems where it doesn't exist ++if(${CMAKE_VERSION} VERSION_LESS 3.18) ++ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) ++else() ++ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development.Module) ++endif() ++ + if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) + list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) + endif() diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild index 60c18372ac5d..e40833eff061 100644 --- a/media-gfx/openvdb/openvdb-9.0.0.ebuild +++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild @@ -121,7 +121,6 @@ src_configure() { -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 |