commit: 5b8392590babd084c1ad3bab35dddb3d9f87758e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 3 19:26:15 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 3 20:29:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b839259
sci-libs/pcl: drop 1.12.0, 1.12.1 Closes: https://bugs.gentoo.org/892395 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/pcl/Manifest | 1 - sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch | 26 ------- sci-libs/pcl/pcl-1.12.0.ebuild | 87 ----------------------- sci-libs/pcl/pcl-1.12.1.ebuild | 83 --------------------- 4 files changed, 197 deletions(-) diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 903fc851c93b..0799e6bc9bbc 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,2 +1 @@ -DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b 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 deleted file mode 100644 index 408216747792..000000000000 --- a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/PointCloudLibrary/pcl/pull/5012 -https://bugs.gentoo.org/810853 - -From: Maarten de Vries <[email protected]> -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 deleted file mode 100644 index 5733df559779..000000000000 --- a/sci-libs/pcl/pcl-1.12.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"; -fi - -inherit ${SCM} cmake multilib - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - KEYWORDS="amd64 ~arm" - SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"; - S="${WORKDIR}/${PN}-${P}" -fi - -HOMEPAGE="https://pointclouds.org/"; -DESCRIPTION="2D/3D image and point cloud processing" -LICENSE="BSD" -SLOT="0/1.12" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=sci-libs/flann-1.7.1 - dev-libs/boost:= - dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) - openni? ( dev-libs/OpenNI ) - openni2? ( dev-libs/OpenNI2 ) - pcap? ( net-libs/libpcap ) - png? ( media-libs/libpng:0= ) - qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - ) - usb? ( virtual/libusb:1 ) - vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) -" -DEPEND="${RDEPEND} - !!dev-cpp/metslib - test? ( >=dev-cpp/gtest-1.6.0 ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) - tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) - virtual/pkgconfig" - -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.0-cmake-targets.patch -) - -src_configure() { - local mycmakeargs=( - "-DLIB_INSTALL_DIR=$(get_libdir)" - "-DWITH_CUDA=$(usex cuda TRUE FALSE)" - "-DWITH_LIBUSB=$(usex usb TRUE FALSE)" - "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" - "-DWITH_PNG=$(usex png TRUE FALSE)" - "-DWITH_QHULL=$(usex qhull TRUE FALSE)" - "-DWITH_QT=$(usex qt5 TRUE FALSE)" - "-DWITH_VTK=$(usex vtk TRUE FALSE)" - "-DWITH_PCAP=$(usex pcap TRUE FALSE)" - "-DWITH_OPENNI=$(usex openni TRUE FALSE)" - "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)" - "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)" - "-DWITH_DOCS=$(usex doc TRUE FALSE)" - "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" - "-DBUILD_TESTS=$(usex test TRUE FALSE)" - ) - cmake_src_configure -} diff --git a/sci-libs/pcl/pcl-1.12.1.ebuild b/sci-libs/pcl/pcl-1.12.1.ebuild deleted file mode 100644 index a8ef973a1640..000000000000 --- a/sci-libs/pcl/pcl-1.12.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"; -fi - -inherit ${SCM} cmake multilib - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"; - S="${WORKDIR}/${PN}-${P}" -fi - -HOMEPAGE="https://pointclouds.org/"; -DESCRIPTION="2D/3D image and point cloud processing" -LICENSE="BSD" -SLOT="0/1.12" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=sci-libs/flann-1.7.1 - dev-libs/boost:= - dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) - openni? ( dev-libs/OpenNI ) - openni2? ( dev-libs/OpenNI2 ) - pcap? ( net-libs/libpcap ) - png? ( media-libs/libpng:0= ) - qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - ) - usb? ( virtual/libusb:1 ) - vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) -" -DEPEND="${RDEPEND} - !!dev-cpp/metslib - test? ( >=dev-cpp/gtest-1.6.0 ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) - tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) - virtual/pkgconfig" - -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - -src_configure() { - local mycmakeargs=( - "-DLIB_INSTALL_DIR=$(get_libdir)" - "-DWITH_CUDA=$(usex cuda TRUE FALSE)" - "-DWITH_LIBUSB=$(usex usb TRUE FALSE)" - "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" - "-DWITH_PNG=$(usex png TRUE FALSE)" - "-DWITH_QHULL=$(usex qhull TRUE FALSE)" - "-DWITH_QT=$(usex qt5 TRUE FALSE)" - "-DWITH_VTK=$(usex vtk TRUE FALSE)" - "-DWITH_PCAP=$(usex pcap TRUE FALSE)" - "-DWITH_OPENNI=$(usex openni TRUE FALSE)" - "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)" - "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)" - "-DWITH_DOCS=$(usex doc TRUE FALSE)" - "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" - "-DBUILD_TESTS=$(usex test TRUE FALSE)" - ) - cmake_src_configure -}
