* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/, sci-libs/pcl/files/
@ 2022-11-13 0:01 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-11-13 0:01 UTC (permalink / raw
To: gentoo-commits
commit: 88d595aade44b6b1dcc26ce0329bb9b4e6ddb0d3
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Nov 13 00:01:24 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 00:01:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d595aa
sci-libs/pcl: fix several issues
- enable cuda sandbox to avoid sandbox violation, #869674
- patch the code for several installation directories to conform to FHS. This
is just a hack and should be done using GNUInstallDirs and provided upstream
to solve it properly, #853886
- add a dependency on virtual/latex-base to avoid an additional QA issue
on latex not found, because the doxyfile uses LaTeX by default. Also depend
on doxygen[dot] to avoid a cmake warning about missing doxygen component
- change test related cmake option to new value to avoid undefined cmake
variables, #738996
- depend on dev-python/sphinx_rtd_theme to properly build tutorial docs
with USE=tutorials, #849002
- restrict test, because it needs the gtest sources to be provided, the
package alone seems not be enough.
- fix hardcoded path for cmake files to be installed into /usr/share/cmake/
Closes: https://bugs.gentoo.org/869674
Closes: https://bugs.gentoo.org/853886
Closes: https://bugs.gentoo.org/738996
Closes: https://bugs.gentoo.org/849002
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
....12.1-allow-configuration-of-install-dirs.patch | 32 +++++++++++++++++++
...ve-directory-of-the-installed-cmake-files.patch | 22 +++++++++++++
.../{pcl-1.12.1-r1.ebuild => pcl-1.12.1-r2.ebuild} | 36 ++++++++++++++++++----
3 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/sci-libs/pcl/files/pcl-1.12.1-allow-configuration-of-install-dirs.patch b/sci-libs/pcl/files/pcl-1.12.1-allow-configuration-of-install-dirs.patch
new file mode 100644
index 000000000000..c9cb3e35f9d6
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.12.1-allow-configuration-of-install-dirs.patch
@@ -0,0 +1,32 @@
+From c052f26112c17068ece2f52058e3130dd328269b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 27 Oct 2022 09:48:15 +0200
+Subject: [PATCH] allow configuration of install dirs
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/cmake/pcl_utils.cmake
++++ b/cmake/pcl_utils.cmake
+@@ -101,14 +101,18 @@ macro(SET_INSTALL_DIRS)
+ set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
+ endif()
+ set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
+- set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
++ if(NOT DEFINED DOC_INSTALL_DIR)
++ set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
++ endif()
+ set(BIN_INSTALL_DIR "bin")
+ set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
+- if(WIN32 AND NOT MINGW)
++ if(NOT DEFINED PCLCONFIG_INSTALL_DIR)
++ if(WIN32 AND NOT MINGW)
+ set(PCLCONFIG_INSTALL_DIR "cmake")
+ else()
+ set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+ endif()
++ endif()
+ endmacro()
+
+
+--
+2.38.1
+
diff --git a/sci-libs/pcl/files/pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch b/sci-libs/pcl/files/pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
new file mode 100644
index 000000000000..fe171c0b21df
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
@@ -0,0 +1,22 @@
+From efb56391957ee0f64a407fe419c25122404a53e2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 27 Oct 2022 13:59:15 +0200
+Subject: [PATCH] fix hardcoded relative directory of the installed cmake files
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/PCLConfig.cmake.in
++++ b/PCLConfig.cmake.in
+@@ -389,8 +389,8 @@ if(WIN32 AND NOT MINGW)
+ set(PCL_ALL_IN_ONE_INSTALLER ON)
+ endif()
+ else()
+-# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+- get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
++# PCLConfig.cmake is installed to PCL_ROOT/share/cmake/pcl-x.y
++ get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
+ endif()
+
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
+--
+2.38.1
+
diff --git a/sci-libs/pcl/pcl-1.12.1-r1.ebuild b/sci-libs/pcl/pcl-1.12.1-r2.ebuild
similarity index 74%
rename from sci-libs/pcl/pcl-1.12.1-r1.ebuild
rename to sci-libs/pcl/pcl-1.12.1-r2.ebuild
index 1edbb0cd7140..a1c4d5880153 100644
--- a/sci-libs/pcl/pcl-1.12.1-r1.ebuild
+++ b/sci-libs/pcl/pcl-1.12.1-r2.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
fi
-inherit ${SCM} cmake multilib
+inherit ${SCM} cmake cuda
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
@@ -24,7 +24,8 @@ 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 )"
+# tests need the gtest sources to be available at build time
+RESTRICT="test"
RDEPEND="
>=sci-libs/flann-1.7.1
@@ -48,11 +49,17 @@ RDEPEND="
"
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 )
+ doc? (
+ app-doc/doxygen[dot]
+ virtual/latex-base
+ )
+ tutorials? (
+ dev-python/sphinx
+ dev-python/sphinx_rtd_theme
+ dev-python/sphinxcontrib-doxylink
+ )
virtual/pkgconfig"
REQUIRED_USE="
@@ -61,9 +68,25 @@ REQUIRED_USE="
tutorials? ( doc )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
+ "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
+)
+
+src_prepare() {
+ if use cuda; then
+ cuda_src_prepare
+ cuda_add_sandbox -w
+ fi
+
+ cmake_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
+ "-DDOC_INSTALL_DIR=share/doc/${PF}"
"-DLIB_INSTALL_DIR=$(get_libdir)"
+ "-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
@@ -77,7 +100,8 @@ src_configure() {
"-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)"
+ "-DBUILD_global_tests=FALSE"
)
+
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/, sci-libs/pcl/files/
@ 2024-01-04 10:43 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2024-01-04 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 9fa202e51778ae156570f9b9191eca455b1f8067
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 10:36:01 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 10:43:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa202e5
sci-libs/pcl: add 1.13.1, EAPI bump, boost compat fix
Co-authored-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://bugs.gentoo.org/921289
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/pcl/Manifest | 1 +
sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch | 12 ++++++++++++
sci-libs/pcl/{pcl-9999.ebuild => pcl-1.13.1.ebuild} | 21 +++++++++------------
sci-libs/pcl/pcl-9999.ebuild | 19 +++++++------------
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 0799e6bc9bbc..9996d4fb3683 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1 +1,2 @@
DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
+DIST pcl-1.13.1.tar.gz 68647700 BLAKE2B e14e4d971a8c52b375887421eced62fd443b11c48146216e4e6898a53f775656c80520514956c51a0853a14c2788a7f19d87d44580569156d39c41a95285f03d SHA512 f6860b2103cb033839d044c3fed1fc3e8a989cd4f9776ae9d20e7d381b05eff8efde33dd06316ce419b44d877877ed21735d80b09d1daf64b0f94cdd302374fb
diff --git a/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch b/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch
new file mode 100644
index 000000000000..ee9904b78eb9
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch
@@ -0,0 +1,12 @@
+diff --git a/io/src/ply/ply_parser.cpp b/io/src/ply/ply_parser.cpp
+index 335c0fb1808..7e79d2d6162 100644
+--- a/io/src/ply/ply_parser.cpp
++++ b/io/src/ply/ply_parser.cpp
+@@ -40,6 +40,7 @@
+
+ #include <pcl/io/ply/ply_parser.h>
+
++#include <algorithm> // for find_if
+ #include <fstream> // for ifstream
+ #include <sstream> // for istringstream
+
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-1.13.1.ebuild
similarity index 89%
copy from sci-libs/pcl/pcl-9999.ebuild
copy to sci-libs/pcl/pcl-1.13.1.ebuild
index cc8d925c4502..6e465addd769 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-1.13.1.ebuild
@@ -1,18 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
+inherit cmake cuda
-inherit ${SCM} cmake cuda
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
else
KEYWORDS="~amd64 ~arm"
SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
@@ -22,7 +17,7 @@ fi
HOMEPAGE="https://pointclouds.org/"
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
-SLOT="0/1.12"
+SLOT="0/$(ver_cut 1-2)"
IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
# tests need the gtest sources to be available at build time
RESTRICT="test"
@@ -71,6 +66,8 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
+ # https://github.com/PointCloudLibrary/pcl/commit/c750d074cdc5fbb5382ff302ba9afe43ce51a101
+ "${FILESDIR}"/${PN}-1.13.1-boost-1.84.patch
)
src_prepare() {
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index cc8d925c4502..9de81c659155 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,18 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
+inherit cmake cuda
-inherit ${SCM} cmake cuda
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
else
KEYWORDS="~amd64 ~arm"
SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
@@ -22,7 +17,7 @@ fi
HOMEPAGE="https://pointclouds.org/"
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
-SLOT="0/1.12"
+SLOT="0/$(ver_cut 1-2)"
IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
# tests need the gtest sources to be available at build time
RESTRICT="test"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/, sci-libs/pcl/files/
@ 2024-02-20 20:49 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-02-20 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 90d44d38dbc651ea1e8fd9c4126772d8c3676b71
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 19:34:07 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 20:48:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d44d38
sci-libs/pcl: drop 1.12.1-r2, 1.13.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/pcl/Manifest | 2 -
sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch | 12 ---
sci-libs/pcl/pcl-1.12.1-r2.ebuild | 107 -------------------------
sci-libs/pcl/pcl-1.13.1.ebuild | 104 ------------------------
4 files changed, 225 deletions(-)
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 521a0897efe1..62ffefd253d6 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,3 +1 @@
-DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
-DIST pcl-1.13.1.tar.gz 68647700 BLAKE2B e14e4d971a8c52b375887421eced62fd443b11c48146216e4e6898a53f775656c80520514956c51a0853a14c2788a7f19d87d44580569156d39c41a95285f03d SHA512 f6860b2103cb033839d044c3fed1fc3e8a989cd4f9776ae9d20e7d381b05eff8efde33dd06316ce419b44d877877ed21735d80b09d1daf64b0f94cdd302374fb
DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B 5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f
diff --git a/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch b/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch
deleted file mode 100644
index ee9904b78eb9..000000000000
--- a/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/io/src/ply/ply_parser.cpp b/io/src/ply/ply_parser.cpp
-index 335c0fb1808..7e79d2d6162 100644
---- a/io/src/ply/ply_parser.cpp
-+++ b/io/src/ply/ply_parser.cpp
-@@ -40,6 +40,7 @@
-
- #include <pcl/io/ply/ply_parser.h>
-
-+#include <algorithm> // for find_if
- #include <fstream> // for ifstream
- #include <sstream> // for istringstream
-
diff --git a/sci-libs/pcl/pcl-1.12.1-r2.ebuild b/sci-libs/pcl/pcl-1.12.1-r2.ebuild
deleted file mode 100644
index 1a317074dad4..000000000000
--- a/sci-libs/pcl/pcl-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 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 cuda
-
-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"
-# tests need the gtest sources to be available at build time
-RESTRICT="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,views] )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
- !!dev-cpp/metslib
-"
-BDEPEND="
- doc? (
- app-text/doxygen[dot]
- virtual/latex-base
- )
- tutorials? (
- dev-python/sphinx
- dev-python/sphinx-rtd-theme
- dev-python/sphinxcontrib-doxylink
- )
- virtual/pkgconfig"
-
-REQUIRED_USE="
- openni? ( usb )
- openni2? ( usb )
- tutorials? ( doc )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
- "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
-)
-
-src_prepare() {
- if use cuda; then
- cuda_src_prepare
- cuda_add_sandbox -w
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DDOC_INSTALL_DIR=share/doc/${PF}"
- "-DLIB_INSTALL_DIR=$(get_libdir)"
- "-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
- "-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_global_tests=FALSE"
- )
-
- cmake_src_configure
-}
diff --git a/sci-libs/pcl/pcl-1.13.1.ebuild b/sci-libs/pcl/pcl-1.13.1.ebuild
deleted file mode 100644
index 622e21e7b178..000000000000
--- a/sci-libs/pcl/pcl-1.13.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake cuda
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-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/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-# tests need the gtest sources to be available at build time
-RESTRICT="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,views] )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
- !!dev-cpp/metslib
-"
-BDEPEND="
- doc? (
- app-text/doxygen[dot]
- virtual/latex-base
- )
- tutorials? (
- dev-python/sphinx
- dev-python/sphinx-rtd-theme
- dev-python/sphinxcontrib-doxylink
- )
- virtual/pkgconfig"
-
-REQUIRED_USE="
- openni? ( usb )
- openni2? ( usb )
- tutorials? ( doc )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
- "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
- # https://github.com/PointCloudLibrary/pcl/commit/c750d074cdc5fbb5382ff302ba9afe43ce51a101
- "${FILESDIR}"/${PN}-1.13.1-boost-1.84.patch
-)
-
-src_prepare() {
- if use cuda; then
- cuda_src_prepare
- cuda_add_sandbox -w
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DDOC_INSTALL_DIR=share/doc/${PF}"
- "-DLIB_INSTALL_DIR=$(get_libdir)"
- "-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
- "-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_global_tests=FALSE"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/, sci-libs/pcl/files/
@ 2024-08-25 15:41 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-08-25 15:41 UTC (permalink / raw
To: gentoo-commits
commit: f5cdd67d42ee05752c649a7c7225f8841cb71213
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Aug 23 18:38:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 15:40:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cdd67d
sci-libs/pcl: enable tests
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38269
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/pcl/files/pcl-1.14.1-tests.patch | 26 ++++++++++++++++++++++++++
sci-libs/pcl/pcl-1.14.1.ebuild | 16 +++++++++++-----
sci-libs/pcl/pcl-9999.ebuild | 16 +++++++++++-----
3 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/sci-libs/pcl/files/pcl-1.14.1-tests.patch b/sci-libs/pcl/files/pcl-1.14.1-tests.patch
new file mode 100644
index 000000000000..83919b0c0c07
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-tests.patch
@@ -0,0 +1,26 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 22 Aug 2024 17:40:21 +0200
+Subject: [PATCH] enable tests
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -8,11 +8,12 @@ if(NOT build)
+ return()
+ endif()
+
+-find_package(GTestSource REQUIRED)
+-include_directories(SYSTEM ${GTEST_INCLUDE_DIRS} ${GTEST_SRC_DIR})
+-
+-add_library(pcl_gtest STATIC ${GTEST_SRC_DIR}/src/gtest-all.cc)
+-target_include_directories(pcl_gtest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
++find_package(GTest REQUIRED)
++add_library(pcl_gtest INTERFACE IMPORTED)
++set_target_properties(pcl_gtest PROPERTIES
++ INTERFACE_LINK_LIBRARIES GTest::gtest
++ INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include
++)
+
+ enable_testing()
+
+
diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1.ebuild
index a9c716c2e295..b5d59362af57 100644
--- a/sci-libs/pcl/pcl-1.14.1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1.ebuild
@@ -14,13 +14,12 @@ else
S="${WORKDIR}/${PN}-${P}"
fi
-HOMEPAGE="https://pointclouds.org/"
DESCRIPTION="2D/3D image and point cloud processing"
+HOMEPAGE="https://pointclouds.org/"
LICENSE="BSD"
SLOT="0/$(ver_cut 1-2)"
IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
-# tests need the gtest sources to be available at build time
-RESTRICT="test"
+RESTRICT="!test? ( test )"
RDEPEND="
>=sci-libs/flann-1.7.1
@@ -51,6 +50,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
!!dev-cpp/metslib
+ test? ( dev-cpp/gtest )
"
BDEPEND="
doc? (
@@ -62,7 +62,8 @@ BDEPEND="
dev-python/sphinx-rtd-theme
dev-python/sphinxcontrib-doxylink
)
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
REQUIRED_USE="
openni? ( usb )
@@ -74,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
"${FILESDIR}/${PN}-1.14.1-gcc15.patch"
+ "${FILESDIR}/${PN}-1.14.1-tests.patch"
)
src_prepare() {
@@ -102,7 +104,7 @@ src_configure() {
"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
"-DWITH_DOCS=$(usex doc TRUE FALSE)"
"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
- "-DBUILD_global_tests=FALSE"
+ -DBUILD_global_tests="$(usex test)"
)
if use qt5; then
@@ -115,3 +117,7 @@ src_configure() {
cmake_src_configure
}
+
+src_test() {
+ BUILD_DIR="${BUILD_DIR}/test" cmake_src_test
+}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index a9c716c2e295..b5d59362af57 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -14,13 +14,12 @@ else
S="${WORKDIR}/${PN}-${P}"
fi
-HOMEPAGE="https://pointclouds.org/"
DESCRIPTION="2D/3D image and point cloud processing"
+HOMEPAGE="https://pointclouds.org/"
LICENSE="BSD"
SLOT="0/$(ver_cut 1-2)"
IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
-# tests need the gtest sources to be available at build time
-RESTRICT="test"
+RESTRICT="!test? ( test )"
RDEPEND="
>=sci-libs/flann-1.7.1
@@ -51,6 +50,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
!!dev-cpp/metslib
+ test? ( dev-cpp/gtest )
"
BDEPEND="
doc? (
@@ -62,7 +62,8 @@ BDEPEND="
dev-python/sphinx-rtd-theme
dev-python/sphinxcontrib-doxylink
)
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
REQUIRED_USE="
openni? ( usb )
@@ -74,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
"${FILESDIR}/${PN}-1.14.1-gcc15.patch"
+ "${FILESDIR}/${PN}-1.14.1-tests.patch"
)
src_prepare() {
@@ -102,7 +104,7 @@ src_configure() {
"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
"-DWITH_DOCS=$(usex doc TRUE FALSE)"
"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
- "-DBUILD_global_tests=FALSE"
+ -DBUILD_global_tests="$(usex test)"
)
if use qt5; then
@@ -115,3 +117,7 @@ src_configure() {
cmake_src_configure
}
+
+src_test() {
+ BUILD_DIR="${BUILD_DIR}/test" cmake_src_test
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-25 15:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-20 20:49 [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/, sci-libs/pcl/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-25 15:41 Sam James
2024-01-04 10:43 Andrew Ammerlaan
2022-11-13 0:01 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox