diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
| commit | e9d044d4b9b71200a96adfa280848858c0f468c9 (patch) | |
| tree | 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /sci-libs/pcl | |
| parent | fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff) | |
gentoo resync : 13.11.2021
Diffstat (limited to 'sci-libs/pcl')
| -rw-r--r-- | sci-libs/pcl/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch | 26 | ||||
| -rw-r--r-- | sci-libs/pcl/pcl-1.12.0.ebuild | 4 |
3 files changed, 32 insertions, 1 deletions
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index d0869d65c33d..84ea3e107bc0 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,4 +1,5 @@ +AUX pcl-1.12.0-cmake-targets.patch 818 BLAKE2B 6d0592ce47444514763719754670415f21098f4654756057cf384777572a2adf59d170d06c9800ba0a526c5b6a0349d90ece5fce1b5a8daeb895a0b75b2650dc SHA512 f619d1cebef985c74093020792c9fb58e820830b96060cc218292e7d96d41154b00b441eaf1394ecbe0dddf6c5cad4601a95d8afcd4b22b219f0970f62df7bd5 DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f -EBUILD pcl-1.12.0.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f +EBUILD pcl-1.12.0.ebuild 2215 BLAKE2B 6cb97a8ba3ef0b6fb14d38c799744295df07eab1ee6b4c0945dc7bb1c27dce980739fd1eee3d99bdb6a01aa214c514c1f4ebbd62789d0d79a95d1a5faa737ef9 SHA512 06290666f42c1e4c84df6671f54776b2126d743c294c92736c1371e684c6431ba95917455d5810bb61c1a70057bc06f8208e10aeb40cca04fcf7d34c5f81ef98 EBUILD pcl-9999.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f MISC metadata.xml 1126 BLAKE2B 3e04d24d862e13d5c89bfe4099660df099f1d498c376292f7984be6064953cdc972455c99cf4f7819bab537ee99f367269f593f266b5d517be9808b00a86b965 SHA512 2afabfca4c5a7f3da157e59e07015132c91b1b24e464a1fcfd0505ca51f27b53f3256657d0a5b8a8698f8136aecd3790e7e7f70de7c58cbf3017389bbb2cb6a1 diff --git a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch b/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch new file mode 100644 index 000000000000..408216747792 --- /dev/null +++ b/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch @@ -0,0 +1,26 @@ +https://github.com/PointCloudLibrary/pcl/pull/5012 +https://bugs.gentoo.org/810853 + +From: Maarten de Vries <maarten@de-vri.es> +Date: Wed, 3 Nov 2021 21:40:19 +0100 +Subject: [PATCH] Limit VTK_LIBRARIES to wanted components for VTK 9.0. + +--- a/cmake/pcl_find_vtk.cmake ++++ b/cmake/pcl_find_vtk.cmake +@@ -119,6 +119,15 @@ else() + unset(HAVE_QVTK) + endif() + ++# Overwrite VTK_LIBRARIES with only the set we actually want for VTK >= 9.0. ++# Otherwise, it will contain ALL available components. ++if(NOT (VTK_VERSION VERSION_LESS 9.0)) ++ set(VTK_LIBRARIES) ++ foreach(vtkComponent ${PCL_VTK_COMPONENTS}) ++ list(APPEND VTK_LIBRARIES VTK::${vtkComponent}) ++ endforeach() ++endif() ++ + if(PCL_SHARED_LIBS OR (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS))) + if(VTK_VERSION VERSION_LESS 9.0) + if(VTK_USE_FILE) + diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild index 1ab0b8e362ff..e3cd374256f5 100644 --- a/sci-libs/pcl/pcl-1.12.0.ebuild +++ b/sci-libs/pcl/pcl-1.12.0.ebuild @@ -61,6 +61,10 @@ REQUIRED_USE=" tutorials? ( doc ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.12.0-cmake-targets.patch +) + src_configure() { local mycmakeargs=( "-DLIB_INSTALL_DIR=$(get_libdir)" |