summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2024-11-13 16:24:57 +0100
committerAlexis Ballier <aballier@gentoo.org>2024-11-18 09:01:01 +0100
commita8c9a8c8040258ec66828ac3082c8dec5a0b4b18 (patch)
tree2c8c9576cb98b797fce2bf9346760b3ba60f5f1c /sci-libs
parentdev-ruby/roadie-rails: add 3.3.0 (diff)
downloadgentoo-a8c9a8c8040258ec66828ac3082c8dec5a0b4b18.tar.gz
gentoo-a8c9a8c8040258ec66828ac3082c8dec5a0b4b18.tar.bz2
gentoo-a8c9a8c8040258ec66828ac3082c8dec5a0b4b18.zip
sci-libs/pcl: add upstream patch for latest boost compat
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/pcl/files/pcl-1.14.1-boost.patch31
-rw-r--r--sci-libs/pcl/pcl-1.14.1.ebuild1
2 files changed, 32 insertions, 0 deletions
diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost.patch b/sci-libs/pcl/files/pcl-1.14.1-boost.patch
new file mode 100644
index 000000000000..8f99023f741a
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-boost.patch
@@ -0,0 +1,31 @@
+From c6bbf02a084a39a02d9e2fc318a59fe2f1ff55c1 Mon Sep 17 00:00:00 2001
+From: Transporter <OgreTransporter@users.noreply.github.com>
+Date: Sun, 26 May 2024 10:37:57 +0200
+Subject: [PATCH] Fix boost hash data type (#6053)
+
+* Fix boost hash data type
+
+* Change file name generation.
+---
+ visualization/src/pcl_visualizer.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
+index 5f073646ac1..bc9b959c246 100644
+--- a/visualization/src/pcl_visualizer.cpp
++++ b/visualization/src/pcl_visualizer.cpp
+@@ -4591,10 +4591,12 @@ pcl::visualization::PCLVisualizer::getUniqueCameraFile (int argc, char **argv)
+ // Build camera filename
+ if (valid)
+ {
+- unsigned int digest[5];
++ boost::uuids::detail::sha1::digest_type digest;
+ sha1.get_digest (digest);
+ sstream << ".";
+- sstream << std::hex << digest[0] << digest[1] << digest[2] << digest[3] << digest[4];
++ for (int i = 0; i < 5; ++i) {
++ sstream << std::hex << *(reinterpret_cast<unsigned int*>(&digest[0]) + i);
++ }
+ sstream << ".cam";
+ }
+ }
diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1.ebuild
index b5d59362af57..268c4f378197 100644
--- a/sci-libs/pcl/pcl-1.14.1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
"${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"
+ "${FILESDIR}/${PN}-1.14.1-boost.patch"
)
src_prepare() {