From 7c1ac01728d0156998ee45be74f80b378d96c31d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Nov 2022 12:48:53 +0000 Subject: gentoo auto-resync : 13:11:2022 - 12:48:53 --- sci-libs/Manifest.gz | Bin 44397 -> 44395 bytes sci-libs/pcl/Manifest | 6 +- ....12.1-allow-configuration-of-install-dirs.patch | 32 ++++++ ...ve-directory-of-the-installed-cmake-files.patch | 22 +++++ sci-libs/pcl/pcl-1.12.1-r1.ebuild | 83 ---------------- sci-libs/pcl/pcl-1.12.1-r2.ebuild | 107 +++++++++++++++++++++ sci-libs/pcl/pcl-9999.ebuild | 36 +++++-- 7 files changed, 195 insertions(+), 91 deletions(-) create mode 100644 sci-libs/pcl/files/pcl-1.12.1-allow-configuration-of-install-dirs.patch create mode 100644 sci-libs/pcl/files/pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch delete mode 100644 sci-libs/pcl/pcl-1.12.1-r1.ebuild create mode 100644 sci-libs/pcl/pcl-1.12.1-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 7a2db611fdc6..e96bc577ef6d 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 88f2c81d21ce..d9eee7fd68b4 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,8 +1,10 @@ AUX pcl-1.12.0-cmake-targets.patch 818 BLAKE2B 6d0592ce47444514763719754670415f21098f4654756057cf384777572a2adf59d170d06c9800ba0a526c5b6a0349d90ece5fce1b5a8daeb895a0b75b2650dc SHA512 f619d1cebef985c74093020792c9fb58e820830b96060cc218292e7d96d41154b00b441eaf1394ecbe0dddf6c5cad4601a95d8afcd4b22b219f0970f62df7bd5 +AUX pcl-1.12.1-allow-configuration-of-install-dirs.patch 1188 BLAKE2B 5ffc3c22c10df8a14270ce1e6a3b0c2db0ed3c5e9154bfed366b87faf8a13546fbf78a88f0d52c4ca09e345ba9add384dad86a08963e0b496a2944293f38516b SHA512 ab4cb57d5d1e494501412d5fcd662f8d75f74a7cf768e948abc1270d11b7ec2bc90901630fa7ac6e96237507c9bfa4214594fc76c58f505bcf2f40e4e37487a8 +AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch 832 BLAKE2B e7095163cba68ee7487251506e19434050c4c7d4bb5feb6d0946356a607dad5555c7327dc1ba68761086b3708ad653256337a110983d9d656fa863dbf9a75896 SHA512 5581df74c9f6f0bd9613b7f158d0d799a4fdea512101001aafdf8eaa91c31e4570f4ce04f1b828730c9fa8082d00000e78055da87427301f04807c1087f1b8b2 DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b EBUILD pcl-1.12.0.ebuild 2202 BLAKE2B e9effe2dec08f45da94e6d749366bc95bfa1a36a24d183b8594612be4809140519ca98da18dbd05e58d4204a42d74155d1a642804ad86117faf4f8226a749548 SHA512 3d643fa885d1e42d3d65db743cca6d38dea426cc11e991b4d989498273363082acdd6abdfae660cd56943b599c6a681189afd2ae2917eb8de524fb4eb52e9da2 -EBUILD pcl-1.12.1-r1.ebuild 2148 BLAKE2B 568eace61a42c615184eb347bd5826ec73b992398b7dc37c03985e736e5bc253fb4d37025a8938f365aafe09ef6c87441c46848898440aebaa8a72db081d5c3d SHA512 1ad1eab06aa0e24c588e86d681d0a3dbc6b73beb97d110f9e39b9fa92fac1ae2c88d1f1cf7ee2222c8c8816ede1c564696a60939474f38d427c7098433fd57d3 +EBUILD pcl-1.12.1-r2.ebuild 2596 BLAKE2B 18dab4708074ec10d12a03b6967a0c3a3e7d991f385f908756c22576080c4a459525486cccbaaff78f3f44047c330c9dfc1b37a4b5a396aad11897f58d0b2756 SHA512 3504a33fe1ad1a3151663d67a6f4fb4942c3822eb24625f71155351ab9352a6fccaa3ecdf0e64ea3b4358120d1a7c55dd9bada407ac06acced5170e1f182618c EBUILD pcl-1.12.1.ebuild 2142 BLAKE2B f7b6612812bb74b69ca3a038fe209dc4689e9ac5535613ce9f17114da57cca429508dd1f34afa8c4ca4095308d3b9c7e7f8e287dd4a20f254f2e81458a7d1db1 SHA512 7612fad1bee914a0b11a3516a7cb005c72fbafff4124ba4454e0f0ea75d2efb0c70f38bbd1369d47b78312e648ee5aa97b6e00e93fdbdd6c5ee63283b68a7057 -EBUILD pcl-9999.ebuild 2148 BLAKE2B 568eace61a42c615184eb347bd5826ec73b992398b7dc37c03985e736e5bc253fb4d37025a8938f365aafe09ef6c87441c46848898440aebaa8a72db081d5c3d SHA512 1ad1eab06aa0e24c588e86d681d0a3dbc6b73beb97d110f9e39b9fa92fac1ae2c88d1f1cf7ee2222c8c8816ede1c564696a60939474f38d427c7098433fd57d3 +EBUILD pcl-9999.ebuild 2596 BLAKE2B 18dab4708074ec10d12a03b6967a0c3a3e7d991f385f908756c22576080c4a459525486cccbaaff78f3f44047c330c9dfc1b37a4b5a396aad11897f58d0b2756 SHA512 3504a33fe1ad1a3151663d67a6f4fb4942c3822eb24625f71155351ab9352a6fccaa3ecdf0e64ea3b4358120d1a7c55dd9bada407ac06acced5170e1f182618c MISC metadata.xml 1126 BLAKE2B 3e04d24d862e13d5c89bfe4099660df099f1d498c376292f7984be6064953cdc972455c99cf4f7819bab537ee99f367269f593f266b5d517be9808b00a86b965 SHA512 2afabfca4c5a7f3da157e59e07015132c91b1b24e464a1fcfd0505ca51f27b53f3256657d0a5b8a8698f8136aecd3790e7e7f70de7c58cbf3017389bbb2cb6a1 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 +Date: Thu, 27 Oct 2022 09:48:15 +0200 +Subject: [PATCH] allow configuration of install dirs + +Signed-off-by: Bernd Waibel +--- 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 +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 +--- 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-r1.ebuild deleted file mode 100644 index 1edbb0cd7140..000000000000 --- a/sci-libs/pcl/pcl-1.12.1-r1.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,views] ) - 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 -} diff --git a/sci-libs/pcl/pcl-1.12.1-r2.ebuild b/sci-libs/pcl/pcl-1.12.1-r2.ebuild new file mode 100644 index 000000000000..a1c4d5880153 --- /dev/null +++ b/sci-libs/pcl/pcl-1.12.1-r2.ebuild @@ -0,0 +1,107 @@ +# 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 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-doc/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-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild index 1edbb0cd7140..a1c4d5880153 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-9999.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 } -- cgit v1.2.3