Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/files/, sci-libs/pcl/
Date: Fri, 03 Mar 2023 20:29:58
Message-Id: 1677875386.5b8392590babd084c1ad3bab35dddb3d9f87758e.asturm@gentoo
1 commit: 5b8392590babd084c1ad3bab35dddb3d9f87758e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 3 19:26:15 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 3 20:29:46 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b839259
7
8 sci-libs/pcl: drop 1.12.0, 1.12.1
9
10 Closes: https://bugs.gentoo.org/892395
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-libs/pcl/Manifest | 1 -
14 sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch | 26 -------
15 sci-libs/pcl/pcl-1.12.0.ebuild | 87 -----------------------
16 sci-libs/pcl/pcl-1.12.1.ebuild | 83 ---------------------
17 4 files changed, 197 deletions(-)
18
19 diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
20 index 903fc851c93b..0799e6bc9bbc 100644
21 --- a/sci-libs/pcl/Manifest
22 +++ b/sci-libs/pcl/Manifest
23 @@ -1,2 +1 @@
24 -DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
25 DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
26
27 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
28 deleted file mode 100644
29 index 408216747792..000000000000
30 --- a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
31 +++ /dev/null
32 @@ -1,26 +0,0 @@
33 -https://github.com/PointCloudLibrary/pcl/pull/5012
34 -https://bugs.gentoo.org/810853
35 -
36 -From: Maarten de Vries <maarten@××××××.es>
37 -Date: Wed, 3 Nov 2021 21:40:19 +0100
38 -Subject: [PATCH] Limit VTK_LIBRARIES to wanted components for VTK 9.0.
39 -
40 ---- a/cmake/pcl_find_vtk.cmake
41 -+++ b/cmake/pcl_find_vtk.cmake
42 -@@ -119,6 +119,15 @@ else()
43 - unset(HAVE_QVTK)
44 - endif()
45 -
46 -+# Overwrite VTK_LIBRARIES with only the set we actually want for VTK >= 9.0.
47 -+# Otherwise, it will contain ALL available components.
48 -+if(NOT (VTK_VERSION VERSION_LESS 9.0))
49 -+ set(VTK_LIBRARIES)
50 -+ foreach(vtkComponent ${PCL_VTK_COMPONENTS})
51 -+ list(APPEND VTK_LIBRARIES VTK::${vtkComponent})
52 -+ endforeach()
53 -+endif()
54 -+
55 - if(PCL_SHARED_LIBS OR (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS)))
56 - if(VTK_VERSION VERSION_LESS 9.0)
57 - if(VTK_USE_FILE)
58 -
59
60 diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
61 deleted file mode 100644
62 index 5733df559779..000000000000
63 --- a/sci-libs/pcl/pcl-1.12.0.ebuild
64 +++ /dev/null
65 @@ -1,87 +0,0 @@
66 -# Copyright 1999-2022 Gentoo Authors
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=7
70 -
71 -SCM=""
72 -if [ "${PV#9999}" != "${PV}" ] ; then
73 - SCM="git-r3"
74 - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
75 -fi
76 -
77 -inherit ${SCM} cmake multilib
78 -
79 -if [ "${PV#9999}" != "${PV}" ] ; then
80 - SRC_URI=""
81 -else
82 - KEYWORDS="amd64 ~arm"
83 - SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
84 - S="${WORKDIR}/${PN}-${P}"
85 -fi
86 -
87 -HOMEPAGE="https://pointclouds.org/"
88 -DESCRIPTION="2D/3D image and point cloud processing"
89 -LICENSE="BSD"
90 -SLOT="0/1.12"
91 -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
92 -RESTRICT="!test? ( test )"
93 -
94 -RDEPEND="
95 - >=sci-libs/flann-1.7.1
96 - dev-libs/boost:=
97 - dev-cpp/eigen:3
98 - opengl? ( virtual/opengl media-libs/freeglut )
99 - openni? ( dev-libs/OpenNI )
100 - openni2? ( dev-libs/OpenNI2 )
101 - pcap? ( net-libs/libpcap )
102 - png? ( media-libs/libpng:0= )
103 - qhull? ( media-libs/qhull:= )
104 - qt5? (
105 - dev-qt/qtgui:5
106 - dev-qt/qtcore:5
107 - dev-qt/qtconcurrent:5
108 - dev-qt/qtopengl:5
109 - )
110 - usb? ( virtual/libusb:1 )
111 - vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
112 - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
113 -"
114 -DEPEND="${RDEPEND}
115 - !!dev-cpp/metslib
116 - test? ( >=dev-cpp/gtest-1.6.0 )
117 -"
118 -BDEPEND="
119 - doc? ( app-doc/doxygen )
120 - tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
121 - virtual/pkgconfig"
122 -
123 -REQUIRED_USE="
124 - openni? ( usb )
125 - openni2? ( usb )
126 - tutorials? ( doc )
127 -"
128 -
129 -PATCHES=(
130 - "${FILESDIR}"/${PN}-1.12.0-cmake-targets.patch
131 -)
132 -
133 -src_configure() {
134 - local mycmakeargs=(
135 - "-DLIB_INSTALL_DIR=$(get_libdir)"
136 - "-DWITH_CUDA=$(usex cuda TRUE FALSE)"
137 - "-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
138 - "-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
139 - "-DWITH_PNG=$(usex png TRUE FALSE)"
140 - "-DWITH_QHULL=$(usex qhull TRUE FALSE)"
141 - "-DWITH_QT=$(usex qt5 TRUE FALSE)"
142 - "-DWITH_VTK=$(usex vtk TRUE FALSE)"
143 - "-DWITH_PCAP=$(usex pcap TRUE FALSE)"
144 - "-DWITH_OPENNI=$(usex openni TRUE FALSE)"
145 - "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
146 - "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
147 - "-DWITH_DOCS=$(usex doc TRUE FALSE)"
148 - "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
149 - "-DBUILD_TESTS=$(usex test TRUE FALSE)"
150 - )
151 - cmake_src_configure
152 -}
153
154 diff --git a/sci-libs/pcl/pcl-1.12.1.ebuild b/sci-libs/pcl/pcl-1.12.1.ebuild
155 deleted file mode 100644
156 index a8ef973a1640..000000000000
157 --- a/sci-libs/pcl/pcl-1.12.1.ebuild
158 +++ /dev/null
159 @@ -1,83 +0,0 @@
160 -# Copyright 1999-2022 Gentoo Authors
161 -# Distributed under the terms of the GNU General Public License v2
162 -
163 -EAPI=7
164 -
165 -SCM=""
166 -if [ "${PV#9999}" != "${PV}" ] ; then
167 - SCM="git-r3"
168 - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
169 -fi
170 -
171 -inherit ${SCM} cmake multilib
172 -
173 -if [ "${PV#9999}" != "${PV}" ] ; then
174 - SRC_URI=""
175 -else
176 - KEYWORDS="~amd64 ~arm"
177 - SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
178 - S="${WORKDIR}/${PN}-${P}"
179 -fi
180 -
181 -HOMEPAGE="https://pointclouds.org/"
182 -DESCRIPTION="2D/3D image and point cloud processing"
183 -LICENSE="BSD"
184 -SLOT="0/1.12"
185 -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
186 -RESTRICT="!test? ( test )"
187 -
188 -RDEPEND="
189 - >=sci-libs/flann-1.7.1
190 - dev-libs/boost:=
191 - dev-cpp/eigen:3
192 - opengl? ( virtual/opengl media-libs/freeglut )
193 - openni? ( dev-libs/OpenNI )
194 - openni2? ( dev-libs/OpenNI2 )
195 - pcap? ( net-libs/libpcap )
196 - png? ( media-libs/libpng:0= )
197 - qhull? ( media-libs/qhull:= )
198 - qt5? (
199 - dev-qt/qtgui:5
200 - dev-qt/qtcore:5
201 - dev-qt/qtconcurrent:5
202 - dev-qt/qtopengl:5
203 - )
204 - usb? ( virtual/libusb:1 )
205 - vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
206 - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
207 -"
208 -DEPEND="${RDEPEND}
209 - !!dev-cpp/metslib
210 - test? ( >=dev-cpp/gtest-1.6.0 )
211 -"
212 -BDEPEND="
213 - doc? ( app-doc/doxygen )
214 - tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
215 - virtual/pkgconfig"
216 -
217 -REQUIRED_USE="
218 - openni? ( usb )
219 - openni2? ( usb )
220 - tutorials? ( doc )
221 -"
222 -
223 -src_configure() {
224 - local mycmakeargs=(
225 - "-DLIB_INSTALL_DIR=$(get_libdir)"
226 - "-DWITH_CUDA=$(usex cuda TRUE FALSE)"
227 - "-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
228 - "-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
229 - "-DWITH_PNG=$(usex png TRUE FALSE)"
230 - "-DWITH_QHULL=$(usex qhull TRUE FALSE)"
231 - "-DWITH_QT=$(usex qt5 TRUE FALSE)"
232 - "-DWITH_VTK=$(usex vtk TRUE FALSE)"
233 - "-DWITH_PCAP=$(usex pcap TRUE FALSE)"
234 - "-DWITH_OPENNI=$(usex openni TRUE FALSE)"
235 - "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
236 - "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
237 - "-DWITH_DOCS=$(usex doc TRUE FALSE)"
238 - "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
239 - "-DBUILD_TESTS=$(usex test TRUE FALSE)"
240 - )
241 - cmake_src_configure
242 -}