* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/, sci-libs/octomap/files/
@ 2016-10-07 16:16 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-10-07 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 4e395289d603a579eb9f18fd02975b37e4e3ac87
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 16:08:04 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 16:16:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e395289
ci-libs/octomap: install package.xml in /usr/share/ros_packages/$PN
Package-Manager: portage-2.3.1
sci-libs/octomap/files/gentoo.patch | 39 ++++++++++++++++++++++
...map-1.8.0-r1.ebuild => octomap-1.8.0-r2.ebuild} | 1 +
sci-libs/octomap/octomap-9999.ebuild | 1 +
3 files changed, 41 insertions(+)
diff --git a/sci-libs/octomap/files/gentoo.patch b/sci-libs/octomap/files/gentoo.patch
new file mode 100644
index 00000000..0fe7426
--- /dev/null
+++ b/sci-libs/octomap/files/gentoo.patch
@@ -0,0 +1,39 @@
+Index: octomap-1.8.0/dynamicEDT3D/CMakeLists.txt
+===================================================================
+--- octomap-1.8.0.orig/dynamicEDT3D/CMakeLists.txt
++++ octomap-1.8.0/dynamicEDT3D/CMakeLists.txt
+@@ -62,7 +62,7 @@ file(GLOB dynamicEDT3D_HDRS ${PROJECT_SO
+ install(FILES ${dynamicEDT3D_HDRS} DESTINATION include/dynamicEDT3D)
+
+ # Install catkin package.xml, attention package.xml names the catkin package "dynamic_edt_3d", so this is also the location where it needs to be installed to (and not "dynamicEDT3D")
+-install(FILES package.xml DESTINATION share/dynamic_edt_3d)
++install(FILES package.xml DESTINATION share/ros_packages/dynamic_edt_3d)
+
+ #TODO: this conflicts with the octomap uninstall
+ #it is not only a target name problem, also both will use the same manifest file
+Index: octomap-1.8.0/octomap/CMakeLists.txt
+===================================================================
+--- octomap-1.8.0.orig/octomap/CMakeLists.txt
++++ octomap-1.8.0/octomap/CMakeLists.txt
+@@ -65,7 +65,7 @@ file(GLOB octomap_math_HDRS ${PROJECT_SO
+ install(FILES ${octomap_math_HDRS} DESTINATION include/octomap/math)
+
+ # Install catkin package.xml
+-install(FILES package.xml DESTINATION share/octomap)
++install(FILES package.xml DESTINATION share/ros_packages/octomap)
+
+ # uninstall target
+ configure_file(
+Index: octomap-1.8.0/octovis/CMakeLists.txt
+===================================================================
+--- octomap-1.8.0.orig/octovis/CMakeLists.txt
++++ octomap-1.8.0/octovis/CMakeLists.txt
+@@ -126,7 +126,7 @@ IF(BUILD_VIEWER)
+ install(FILES ${octovis_HDRS} DESTINATION include/octovis)
+
+ # Install catkin package.xml
+- install(FILES package.xml DESTINATION share/octovis)
++ install(FILES package.xml DESTINATION share/ros_packages/octovis)
+
+ ELSE()
+ MESSAGE ( "Unfortunately, the viewer (octovis) can not be built because some requirements are missing.")
diff --git a/sci-libs/octomap/octomap-1.8.0-r1.ebuild b/sci-libs/octomap/octomap-1.8.0-r2.ebuild
similarity index 97%
rename from sci-libs/octomap/octomap-1.8.0-r1.ebuild
rename to sci-libs/octomap/octomap-1.8.0-r2.ebuild
index 2b3509c..19df370 100644
--- a/sci-libs/octomap/octomap-1.8.0-r1.ebuild
+++ b/sci-libs/octomap/octomap-1.8.0-r2.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
media-gfx/graphviz
)
"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
src_prepare() {
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
index 2b3509c..19df370 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-9999.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
media-gfx/graphviz
)
"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
src_prepare() {
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/, sci-libs/octomap/files/
@ 2017-02-28 11:27 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: c21b9fe833b34c7bd3c3f75ea51995f279b790a9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:54:06 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21b9fe8
sci-libs/octomap: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/octomap/Manifest | 1 -
sci-libs/octomap/files/gentoo.patch | 39 ---------------
sci-libs/octomap/octomap-1.8.0-r2.ebuild | 82 --------------------------------
3 files changed, 122 deletions(-)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 228b4b3140..20840feed3 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,2 +1 @@
-DIST octomap-1.8.0.tar.gz 1584799 SHA256 158f66af55bb660a2aa7d0a00c60c9e5320f6594bd0924748af1471d315d5633 SHA512 61ceeee80de8bcdcfde69c3dd30a218ec7f9e4362b1bae8e80d29dde74875a717cc1cbcfba1a7c3ee7ec0ee954297796ac35052782b98af36448f5c3305bdfa9 WHIRLPOOL 12d1dd64d0b7999aa41c5ed878af63385f25536a32a38b28d168a10560dc6de5ce1148d6f20c310082da765066a8f3f826860f481ae11e1669aa9a15f6365b71
DIST octomap-1.8.1.tar.gz 1679526 SHA256 8b18ef7693e87f1400b9a8bc41f86e3b28259ac98c0b458037232652380aa6af SHA512 e35567da0d6741747abbc87de49733d0e92bae8aedfe66a63766740cc6566f3cfdbc3c986369177497cc9a8fb208ed9b727da496cec48e2ad23328df06fbc8d6 WHIRLPOOL 7bad33e4bb01ef0d0599d4e7ea6b323e4aacb06d9f5e8d4a05b52aa0be72d205735402ed25f2ff3fcad6636f838124453f61bff1808fbe75154a4e7d32d1ded3
diff --git a/sci-libs/octomap/files/gentoo.patch b/sci-libs/octomap/files/gentoo.patch
deleted file mode 100644
index 0fe7426c28..0000000000
--- a/sci-libs/octomap/files/gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: octomap-1.8.0/dynamicEDT3D/CMakeLists.txt
-===================================================================
---- octomap-1.8.0.orig/dynamicEDT3D/CMakeLists.txt
-+++ octomap-1.8.0/dynamicEDT3D/CMakeLists.txt
-@@ -62,7 +62,7 @@ file(GLOB dynamicEDT3D_HDRS ${PROJECT_SO
- install(FILES ${dynamicEDT3D_HDRS} DESTINATION include/dynamicEDT3D)
-
- # Install catkin package.xml, attention package.xml names the catkin package "dynamic_edt_3d", so this is also the location where it needs to be installed to (and not "dynamicEDT3D")
--install(FILES package.xml DESTINATION share/dynamic_edt_3d)
-+install(FILES package.xml DESTINATION share/ros_packages/dynamic_edt_3d)
-
- #TODO: this conflicts with the octomap uninstall
- #it is not only a target name problem, also both will use the same manifest file
-Index: octomap-1.8.0/octomap/CMakeLists.txt
-===================================================================
---- octomap-1.8.0.orig/octomap/CMakeLists.txt
-+++ octomap-1.8.0/octomap/CMakeLists.txt
-@@ -65,7 +65,7 @@ file(GLOB octomap_math_HDRS ${PROJECT_SO
- install(FILES ${octomap_math_HDRS} DESTINATION include/octomap/math)
-
- # Install catkin package.xml
--install(FILES package.xml DESTINATION share/octomap)
-+install(FILES package.xml DESTINATION share/ros_packages/octomap)
-
- # uninstall target
- configure_file(
-Index: octomap-1.8.0/octovis/CMakeLists.txt
-===================================================================
---- octomap-1.8.0.orig/octovis/CMakeLists.txt
-+++ octomap-1.8.0/octovis/CMakeLists.txt
-@@ -126,7 +126,7 @@ IF(BUILD_VIEWER)
- install(FILES ${octovis_HDRS} DESTINATION include/octovis)
-
- # Install catkin package.xml
-- install(FILES package.xml DESTINATION share/octovis)
-+ install(FILES package.xml DESTINATION share/ros_packages/octovis)
-
- ELSE()
- MESSAGE ( "Unfortunately, the viewer (octovis) can not be built because some requirements are missing.")
diff --git a/sci-libs/octomap/octomap-1.8.0-r2.ebuild b/sci-libs/octomap/octomap-1.8.0-r2.ebuild
deleted file mode 100644
index 19df370fdb..0000000000
--- a/sci-libs/octomap/octomap-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/OctoMap/octomap"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm"
- SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
-HOMEPAGE="http://octomap.github.io/"
-IUSE="qt4 dynamicEDT3D doc"
-LICENSE="BSD qt4? ( GPL-2 )"
-SLOT="0"
-
-RDEPEND="
- qt4? (
- virtual/opengl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- x11-libs/libQGLViewer:=
- )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-src_prepare() {
- sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
- -i */CMakeLists.txt \
- -i */CMakeModules/InstallPkgConfigFile.cmake || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
- "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc ; then
- cd "${BUILD_DIR}/octomap"
- emake docs
- if use dynamicEDT3D ; then
- cd "${BUILD_DIR}/dynamicEDT3D"
- emake docs_dynamicEDT3D
- fi
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- if use doc ; then
- insinto /usr/share/doc/${PF}/html/octomap
- doins -r "${S}/octomap/doc/html/"*
- if use dynamicEDT3D ; then
- insinto /usr/share/doc/${PF}/html/dynamicEDT3D
- doins -r "${S}/dynamicEDT3D/doc/html/"*
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/, sci-libs/octomap/files/
@ 2018-01-13 12:16 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2018-01-13 12:16 UTC (permalink / raw
To: gentoo-commits
commit: f542cb05a15eb621c5fab56789558cd29955ac4b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 09:51:50 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 12:16:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f542cb05
sci-libs/octomap: bump to 1.9.0 and port to qt5
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-libs/octomap/Manifest | 1 +
sci-libs/octomap/files/qglqt5.patch | 231 +++++++++++++++++++++
.../{octomap-9999.ebuild => octomap-1.9.0.ebuild} | 24 ++-
sci-libs/octomap/octomap-9999.ebuild | 22 +-
4 files changed, 260 insertions(+), 18 deletions(-)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 815e4e9dde5..b1420dcc0f1 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1 +1,2 @@
DIST octomap-1.8.1.tar.gz 1679526 BLAKE2B 89d71ca43ce4e353d8cf758420907c8bb1e11aa42854178174594d03aaf04ed753a35c6e4ffc60a5ebe0297307aedee92bd69138af8598a8b5ae7ac716193c44 SHA512 e35567da0d6741747abbc87de49733d0e92bae8aedfe66a63766740cc6566f3cfdbc3c986369177497cc9a8fb208ed9b727da496cec48e2ad23328df06fbc8d6
+DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237
diff --git a/sci-libs/octomap/files/qglqt5.patch b/sci-libs/octomap/files/qglqt5.patch
new file mode 100644
index 00000000000..3fad0a0fc63
--- /dev/null
+++ b/sci-libs/octomap/files/qglqt5.patch
@@ -0,0 +1,231 @@
+Index: octomap-1.9.0/octovis/src/ViewerGui.cpp
+===================================================================
+--- octomap-1.9.0.orig/octovis/src/ViewerGui.cpp
++++ octomap-1.9.0/octovis/src/ViewerGui.cpp
+@@ -286,7 +286,7 @@ void ViewerGui::showOcTree() {
+ m_mapSizeStatus->setText(size);
+ //}
+
+- m_glwidget->updateGL();
++ m_glwidget->update();
+
+ // generate cubes -> display
+ // timeval start;
+@@ -299,7 +299,7 @@ void ViewerGui::showOcTree() {
+ // gettimeofday(&stop, NULL); // stop timer
+ // double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec);
+ // fprintf(stderr, "setOcTree took %f sec\n", time_to_generate);
+- m_glwidget->updateGL();
++ m_glwidget->update();
+ }
+
+
+@@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_t
+ m_glwidget->enableSelectionBox(checked);
+
+
+- m_glwidget->updateGL();
++ m_glwidget->update();
+ }
+
+ void ViewerGui::on_actionHeight_map_toggled(bool checked){
+@@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bo
+ it != m_octrees.end(); ++it) {
+ it->second.octree_drawer->enableAxes(checked);
+ }
+- m_glwidget->updateGL();
++ m_glwidget->update();
+ }
+
+ void ViewerGui::on_actionHideBackground_toggled(bool checked) {
+@@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_
+ if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) {
+ if (checked) m_glwidget->removeSceneObject(r->octree_drawer);
+ else m_glwidget->addSceneObject(r->octree_drawer);
+- m_glwidget->updateGL();
++ m_glwidget->update();
+ }
+ }
+
+@@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_to
+ it != m_octrees.end(); ++it) {
+ it->second.octree_drawer->enableOcTreeCells(enabled);
+ }
+- m_glwidget->updateGL();
++ m_glwidget->update();
+ }
+
+ void ViewerGui::on_actionOctree_structure_toggled(bool enabled) {
+@@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structur
+ it != m_octrees.end(); ++it) {
+ it->second.octree_drawer->enableOcTree(enabled);
+ }
+- m_glwidget->updateGL();
++ m_glwidget->update();
+ }
+
+ void ViewerGui::on_actionFree_toggled(bool enabled) {
+@@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bo
+ it != m_octrees.end(); ++it) {
+ it->second.octree_drawer->enableFreespace(enabled);
+ }
+- m_glwidget->updateGL();
++ m_glwidget->update();
+
+ }
+
+@@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggle
+ // } else{
+ // m_octreeDrawer->clearOcTreeSelection();
+ // }
+- // m_glwidget->updateGL();
++ // m_glwidget->update();
+ // }
+ }
+
+
+ void ViewerGui::on_action_bg_black_triggered() {
+ m_glwidget->setBackgroundColor( QColor(0,0,0) );
+- m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
+ }
+
+ void ViewerGui::on_action_bg_white_triggered() {
+ m_glwidget->setBackgroundColor( QColor(255,255,255) );
+- m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
+ }
+
+ void ViewerGui::on_action_bg_gray_triggered() {
+ m_glwidget->setBackgroundColor( QColor(117,117,117) );
+- m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
+ }
+
+ void ViewerGui::on_savecampose_triggered() {
+Index: octomap-1.9.0/octovis/src/ViewerWidget.cpp
+===================================================================
+--- octomap-1.9.0.orig/octovis/src/ViewerWidget.cpp
++++ octomap-1.9.0/octovis/src/ViewerWidget.cpp
+@@ -67,13 +67,12 @@ void ViewerWidget::init() {
+
+ // background color defaults to white
+ this->setBackgroundColor( QColor(255,255,255) );
+- this->qglClearColor( this->backgroundColor() );
+ }
+
+ void ViewerWidget::resetView(){
+ this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2);
+ this->showEntireScene();
+- updateGL();
++ update();
+ }
+
+
+@@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode
+ for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
+ (*it)->enableHeightColorMode(enabled);
+ }
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::enablePrintoutMode(bool enabled) {
+@@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bo
+ for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
+ (*it)->enablePrintoutMode(enabled);
+ }
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::enableSemanticColoring (bool enabled) {
+@@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColorin
+ for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
+ (*it)->enableSemanticColoring(enabled);
+ }
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::enableSelectionBox(bool enabled) {
+ m_drawSelectionBox = enabled;
+- updateGL();
++ update();
+ }
+
+
+@@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double
+ camera()->setPosition(qglviewer::Vec(x, y, z));
+ camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ));
+ camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0));
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::setCamPose(const octomath::Pose6D& pose){
+@@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id
+ } else {
+ std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl;
+ }
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::deleteCameraPath(int id) {
+ if(camera()->keyFrameInterpolator(id)) {
+- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL()));
++ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update()));
+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+ camera()->deletePath(id);
+@@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id
+ m_current_camera_frame = start_frame;
+ kfi->setInterpolationTime(kfi->keyFrameTime(start_frame));
+ std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl;
+- connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL()));
++ connect(kfi, SIGNAL(interpolated()), this, SLOT(update()));
+ connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+ connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+ kfi->startInterpolation();
+@@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id
+
+ void ViewerWidget::stopCameraPath(int id) {
+ if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) {
+- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL()));
++ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update()));
+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+ camera()->keyFrameInterpolator(id)->stopInterpolation();
+@@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id
+
+ void ViewerWidget::cameraPathFinished() {
+ if(camera()->keyFrameInterpolator(m_current_camera_path)) {
+- disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL()));
++ disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update()));
+ disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+ disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+ emit cameraPathStopped(m_current_camera_path);
+@@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(c
+ void ViewerWidget::addSceneObject(SceneObject* obj){
+ assert (obj);
+ m_sceneObjects.push_back(obj);
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::removeSceneObject(SceneObject* obj){
+@@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(Sce
+ else
+ ++it;
+ }
+- updateGL();
++ update();
+ }
+
+ void ViewerWidget::clearAll(){
+@@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){
+ glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+ glDisable(GL_COLOR_MATERIAL);
+- qglColor(foregroundColor());
+
+ if (gridIsDrawn()){
+ glLineWidth(1.0);
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-1.9.0.ebuild
similarity index 80%
copy from sci-libs/octomap/octomap-9999.ebuild
copy to sci-libs/octomap/octomap-1.9.0.ebuild
index 30141845c39..0472eb73728 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,15 +21,16 @@ fi
DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
HOMEPAGE="http://octomap.github.io/"
-IUSE="qt4 dynamicEDT3D doc"
-LICENSE="BSD qt4? ( GPL-2 )"
-SLOT="0"
+IUSE="qt5 dynamicEDT3D doc"
+LICENSE="BSD qt5? ( GPL-2 )"
+SLOT="0/19"
RDEPEND="
- qt4? (
+ qt5? (
virtual/opengl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
x11-libs/libQGLViewer:=
)
"
@@ -40,16 +41,21 @@ DEPEND="${RDEPEND}
)
"
+PATCHES=( "${FILESDIR}/qglqt5.patch" )
+
src_prepare() {
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
-i */CMakeLists.txt \
-i */CMakeModules/InstallPkgConfigFile.cmake || die
+ sed -e 's/iewer-qt4/iewer-qt5/g' \
+ -i octovis/CMakeModules/FindQGLViewer.cmake || die
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
+ "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
+ "-DOCTOVIS_QT5=TRUE"
"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
)
cmake-utils_src_configure
@@ -80,7 +86,7 @@ src_install() {
insinto /usr/share/ros_packages/${PN}
doins "${ED}/usr/share/${PN}/package.xml"
- if use qt4; then
+ if use qt5; then
insinto /usr/share/ros_packages/octovis
doins "${ED}/usr/share/octovis/package.xml"
fi
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
index 30141845c39..f5c2b0c615a 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,15 +21,16 @@ fi
DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
HOMEPAGE="http://octomap.github.io/"
-IUSE="qt4 dynamicEDT3D doc"
-LICENSE="BSD qt4? ( GPL-2 )"
-SLOT="0"
+IUSE="qt5 dynamicEDT3D doc"
+LICENSE="BSD qt5? ( GPL-2 )"
+SLOT="0/19"
RDEPEND="
- qt4? (
+ qt5? (
virtual/opengl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
x11-libs/libQGLViewer:=
)
"
@@ -44,12 +45,15 @@ src_prepare() {
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
-i */CMakeLists.txt \
-i */CMakeModules/InstallPkgConfigFile.cmake || die
+ sed -e 's/iewer-qt4/iewer-qt5/g' \
+ -i octovis/CMakeModules/FindQGLViewer.cmake || die
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
+ "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
+ "-DOCTOVIS_QT5=TRUE"
"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
)
cmake-utils_src_configure
@@ -80,7 +84,7 @@ src_install() {
insinto /usr/share/ros_packages/${PN}
doins "${ED}/usr/share/${PN}/package.xml"
- if use qt4; then
+ if use qt5; then
insinto /usr/share/ros_packages/octovis
doins "${ED}/usr/share/octovis/package.xml"
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/, sci-libs/octomap/files/
@ 2025-03-28 17:25 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-03-28 17:25 UTC (permalink / raw
To: gentoo-commits
commit: ec86568a3fb6ee37be869bd606194343da0770fa
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Mar 28 09:15:22 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 28 17:23:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec86568a
sci-libs/octomap: add 1.10.0, qt6
bump EAPI8
switch to qt6 by default (see trivial patch with a PR in upstream)
use soname 1.10 for subslot, instead of expected 110 (19 in tree)
patches:
* cmake_min bump to 3.10
* fix destdir
* filter -Werror and -O3
* use pkgconf for libGQLViewer
* switch qt4/qt5 to qt5/qt6
tests passed here without jobs restriction
open bugs for 1.9.8 are hopefully addressed
Bug: https://bugs.gentoo.org/801232
Bug: https://bugs.gentoo.org/890433
Bug: https://bugs.gentoo.org/890489
Bug: https://bugs.gentoo.org/928853
Closes: https://bugs.gentoo.org/949090
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/41342
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/octomap/Manifest | 1 +
.../octomap/files/octomap-1.10.0-cmake_bump.patch | 42 ++++++
.../files/octomap-1.10.0-destdir_edt3d.patch | 18 +++
.../files/octomap-1.10.0-filter_flags.patch | 16 +++
.../octomap-1.10.0-pkgconf_libqglviewer.patch | 32 +++++
.../octomap/files/octomap-1.10.0-qt5_qt6.patch | 143 +++++++++++++++++++++
sci-libs/octomap/octomap-1.10.0.ebuild | 91 +++++++++++++
7 files changed, 343 insertions(+)
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 1b96b736d561..4e41334e1f6b 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1 +1,2 @@
+DIST octomap-1.10.0.tar.gz 1694103 BLAKE2B 0415ee5e961ea456b9d497b35aeadd0d21a742a3f252eac67c717536e1d9f39fa4117170e259a3762ab6101b776afe65dec6fcff5a6e8d66f1957ea0b0ea5552 SHA512 1cbee4f6b3569587986774447ad9ec4190f597310c4d6865ffa7cd8865ece2492e4a42fa369b633d9d7a9da782560d49deaa62a18601ea4f56396bdf1a6a5f52
DIST octomap-1.9.8.tar.gz 1693311 BLAKE2B 476e4a644287e5ebcaa36de3051b7a2079b733bee3cd80b192fecfab0a85c5de70e3ad087a6cb499141167c735692de72ba2a7b1fb8b318e461f8f21f20020ae SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e
diff --git a/sci-libs/octomap/files/octomap-1.10.0-cmake_bump.patch b/sci-libs/octomap/files/octomap-1.10.0-cmake_bump.patch
new file mode 100644
index 000000000000..7afef4bc95a7
--- /dev/null
+++ b/sci-libs/octomap/files/octomap-1.10.0-cmake_bump.patch
@@ -0,0 +1,42 @@
+https://github.com/OctoMap/octomap/pull/432.patch
+bump cmake_minimum to prepare cmake-4
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1eb31f3..63498f5b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+ PROJECT( octomap-distribution )
+
+ ENABLE_TESTING() # enable CTest environment of subprojects
+diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt
+index 7edfdde9..3dfd2399 100644
+--- a/dynamicEDT3D/CMakeLists.txt
++++ b/dynamicEDT3D/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+ PROJECT(dynamicEDT3D)
+
+ include(CTest)
+diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
+index 87a78e9c..148a1332 100644
+--- a/octomap/CMakeLists.txt
++++ b/octomap/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+ PROJECT( octomap )
+
+ include(CTest)
+diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt
+index 84fa3675..79e6978f 100644
+--- a/octovis/CMakeLists.txt
++++ b/octovis/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+ PROJECT( octovis )
+
+ include(CTest)
diff --git a/sci-libs/octomap/files/octomap-1.10.0-destdir_edt3d.patch b/sci-libs/octomap/files/octomap-1.10.0-destdir_edt3d.patch
new file mode 100644
index 000000000000..2d44dd5954e5
--- /dev/null
+++ b/sci-libs/octomap/files/octomap-1.10.0-destdir_edt3d.patch
@@ -0,0 +1,18 @@
+use cmake variables
+diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt
+index 7edfdde..14bdf49 100644
+--- a/dynamicEDT3D/CMakeLists.txt
++++ b/dynamicEDT3D/CMakeLists.txt
+@@ -46,9 +46,9 @@ LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+ # Installation
+
+ set(INSTALL_TARGETS_DEFAULT_ARGS
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+
+ find_package(octomap REQUIRED
diff --git a/sci-libs/octomap/files/octomap-1.10.0-filter_flags.patch b/sci-libs/octomap/files/octomap-1.10.0-filter_flags.patch
new file mode 100644
index 000000000000..7358009c0766
--- /dev/null
+++ b/sci-libs/octomap/files/octomap-1.10.0-filter_flags.patch
@@ -0,0 +1,16 @@
+delete -Werror and -O3
+diff --git a/octomap/CMakeModules/CompilerSettings.cmake b/octomap/CMakeModules/CompilerSettings.cmake
+index bae0cc4..a4920fd 100644
+--- a/octomap/CMakeModules/CompilerSettings.cmake
++++ b/octomap/CMakeModules/CompilerSettings.cmake
+@@ -10,8 +10,8 @@ MESSAGE (STATUS "${PROJECT_NAME} building as ${CMAKE_BUILD_TYPE}")
+ # COMPILER FLAGS
+ IF (CMAKE_COMPILER_IS_GNUCC)
+ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-error ")
+- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wpedantic")
+- SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -funroll-loops -DNDEBUG")
++ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
++ SET (CMAKE_CXX_FLAGS_RELEASE "-funroll-loops -DNDEBUG")
+ SET (CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
+ # Shared object compilation under 64bit (vtable)
+ ADD_DEFINITIONS(-fPIC)
diff --git a/sci-libs/octomap/files/octomap-1.10.0-pkgconf_libqglviewer.patch b/sci-libs/octomap/files/octomap-1.10.0-pkgconf_libqglviewer.patch
new file mode 100644
index 000000000000..70817fb3d1ed
--- /dev/null
+++ b/sci-libs/octomap/files/octomap-1.10.0-pkgconf_libqglviewer.patch
@@ -0,0 +1,32 @@
+Prefer pkgconfig for QGLViewer, easier than findcmake file and it avoids call of 3rd library
+diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt
+index 84fa367..bc54f36 100644
+--- a/octovis/CMakeLists.txt
++++ b/octovis/CMakeLists.txt
+@@ -77,7 +77,8 @@ endif(NOT OCTOVIS_QT5)
+ IF (OpenGL-NOTFOUND OR Qt4-NOTFOUND)
+ MESSAGE ( "OpenGL and QT4 are required for octovis but could not be found.")
+ ELSE()
+- FIND_PACKAGE(QGLViewer)
++ FIND_PACKAGE(PkgConfig REQUIRED)
++ pkg_check_modules(QGLViewer libQGLViewer)
+ IF(QGLViewer_FOUND)
+ SET( BUILD_VIEWER 1)
+ ELSE()
+diff --git a/octovis/CMakeLists_src.txt b/octovis/CMakeLists_src.txt
+index 35bc1f2..85fd61a 100644
+--- a/octovis/CMakeLists_src.txt
++++ b/octovis/CMakeLists_src.txt
+@@ -57,11 +57,8 @@ else(OCTOVIS_QT5)
+ QT4_ADD_RESOURCES(viewer_RES src/icons.qrc)
+ endif(OCTOVIS_QT5)
+
+-#found QGLViewer lib dir
+-link_directories(${QGLViewer_LIBRARY_DIR})
+-
+ INCLUDE_DIRECTORIES(
+- ${QGLViewer_INCLUDE_DIR}
++ ${QGLViewer_INCLUDE_DIRS}
+ )
+
+ SET(viewer_MOC_HDRS
diff --git a/sci-libs/octomap/files/octomap-1.10.0-qt5_qt6.patch b/sci-libs/octomap/files/octomap-1.10.0-qt5_qt6.patch
new file mode 100644
index 000000000000..7c6b871679aa
--- /dev/null
+++ b/sci-libs/octomap/files/octomap-1.10.0-qt5_qt6.patch
@@ -0,0 +1,143 @@
+https://github.com/OctoMap/octomap/pull/433.patch
+switch qt4/qt5 to qt5/qt6
+qt6 just works as is
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1eb31f3..6a4db7eb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,7 +6,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # enables -fPIC in applicable compilers
+
+ option(BUILD_OCTOVIS_SUBPROJECT "Build targets from subproject octovis" ON)
+ option(BUILD_DYNAMICETD3D_SUBPROJECT "Build targets from subproject dynamicEDT3D" ON)
+-option(OCTOVIS_QT5 "Link Octovis against Qt5?" ON)
++option(OCTOVIS_QT6 "Link Octovis against Qt6?" ON)
+
+ set(CMAKE_CXX_STANDARD 11)
+
+diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt
+index 84fa3675..e6dd604c 100644
+--- a/octovis/CMakeLists.txt
++++ b/octovis/CMakeLists.txt
+@@ -65,17 +65,14 @@ set(INSTALL_TARGETS_DEFAULT_ARGS
+ # libQGLViewer, if dependencies available
+ SET( BUILD_VIEWER 0)
+
+-option(OCTOVIS_QT5 "Link Octovis against Qt5?" ON)
++option(OCTOVIS_QT6 "Link Octovis against Qt6?" ON)
+
+ # Look for required libraries:
+ set(OpenGL_GL_PREFERENCE LEGACY)
+ FIND_PACKAGE(OpenGL)
+-if(NOT OCTOVIS_QT5)
+- FIND_PACKAGE(Qt4)
+-endif(NOT OCTOVIS_QT5)
+
+-IF (OpenGL-NOTFOUND OR Qt4-NOTFOUND)
+- MESSAGE ( "OpenGL and QT4 are required for octovis but could not be found.")
++IF (OpenGL-NOTFOUND)
++ MESSAGE ( "OpenGL is required for octovis but could not be found.")
+ ELSE()
+ FIND_PACKAGE(QGLViewer)
+ IF(QGLViewer_FOUND)
+diff --git a/octovis/CMakeLists_src.txt b/octovis/CMakeLists_src.txt
+index 35bc1f20..6eaa31ad 100644
+--- a/octovis/CMakeLists_src.txt
++++ b/octovis/CMakeLists_src.txt
+@@ -1,5 +1,8 @@
+
+-if(OCTOVIS_QT5)
++if(OCTOVIS_QT6)
++ find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGLWidgets Widgets Xml)
++ set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::OpenGLWidgets Qt6::Widgets Qt6::Xml "${OPENGL_gl_LIBRARY}" "${OPENGL_glu_LIBRARY}")
++else(OCTOVIS_QT6)
+ find_package(Qt5Core REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5OpenGL REQUIRED)
+@@ -13,14 +16,7 @@ if(OCTOVIS_QT5)
+ "${Qt5Widgets_INCLUDE_DIRS}"
+ "${Qt5Xml_INCLUDE_DIRS}"
+ )
+-else(OCTOVIS_QT5)
+- # Qt4-support (more info: http://qtnode.net/wiki?title=Qt_with_cmake)
+- find_package(Qt4 REQUIRED)
+- set(QT_USE_QTOPENGL TRUE)
+- set(QT_USE_QTXML TRUE)
+- # include the files enabled above
+- include(${QT_USE_FILE})
+-endif(OCTOVIS_QT5)
++endif(OCTOVIS_QT6)
+
+ # Mac OS X seems to require special linker flags:
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -51,11 +47,11 @@ set(viewer_SRCS
+ )
+
+ # Resource files (icons, ...)
+-if(OCTOVIS_QT5)
++if(OCTOVIS_QT6)
++ QT6_ADD_RESOURCES(viewer_RES src/icons.qrc)
++else(OCTOVIS_QT6)
+ QT5_ADD_RESOURCES(viewer_RES src/icons.qrc)
+-else(OCTOVIS_QT5)
+- QT4_ADD_RESOURCES(viewer_RES src/icons.qrc)
+-endif(OCTOVIS_QT5)
++endif(OCTOVIS_QT6)
+
+ #found QGLViewer lib dir
+ link_directories(${QGLViewer_LIBRARY_DIR})
+@@ -74,11 +70,11 @@ SET(viewer_MOC_HDRS
+ )
+
+ # generate list of MOC srcs:
+-if(OCTOVIS_QT5)
++if(OCTOVIS_QT6)
++ QT6_WRAP_CPP(viewer_MOC_SRCS ${viewer_MOC_HDRS})
++else(OCTOVIS_QT6)
+ QT5_WRAP_CPP(viewer_MOC_SRCS ${viewer_MOC_HDRS})
+-else(OCTOVIS_QT5)
+- QT4_WRAP_CPP(viewer_MOC_SRCS ${viewer_MOC_HDRS})
+-endif(OCTOVIS_QT5)
++endif(OCTOVIS_QT6)
+
+ # let cmake generate ui*.h files from .ui files (Qt Designer):
+ SET(viewer_UIS
+@@ -87,11 +83,11 @@ SET(viewer_UIS
+ ${PROJECT_SOURCE_DIR}/include/octovis/ViewerSettingsPanel.ui
+ ${PROJECT_SOURCE_DIR}/include/octovis/ViewerSettingsPanelCamera.ui
+ )
+-if(OCTOVIS_QT5)
++if(OCTOVIS_QT6)
++ QT6_WRAP_UI(viewer_UIS_H ${viewer_UIS})
++else(OCTOVIS_QT6)
+ QT5_WRAP_UI(viewer_UIS_H ${viewer_UIS})
+-else(OCTOVIS_QT5)
+- QT4_WRAP_UI(viewer_UIS_H ${viewer_UIS})
+-endif(OCTOVIS_QT5)
++endif(OCTOVIS_QT6)
+
+ # Don't forget to include output directory, otherwise
+ # the UI file won't be wrapped!
+@@ -101,6 +97,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR})
+ # Library target
+ add_library(octovis-static STATIC ${viewerlib_SRCS})
+ target_link_libraries(octovis-static
++ ${QT_LIBRARIES}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OCTOMAP_LIBRARIES}
+@@ -110,6 +107,7 @@ set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis)
+
+ add_library(octovis-shared SHARED ${viewerlib_SRCS})
+ target_link_libraries(octovis-shared
++ ${QT_LIBRARIES}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OCTOMAP_LIBRARIES}
+@@ -135,7 +133,6 @@ add_executable(octovis ${viewer_SRCS} ${viewer_UIS_H} ${viewer_MOC_SRCS} ${viewe
+
+ target_link_libraries(octovis
+ # ${QGLViewer_LIBRARIES}
+- ${QT_LIBRARIES}
+ ${OCTOMAP_LIBRARIES}
+ octovis-shared
+ )
diff --git a/sci-libs/octomap/octomap-1.10.0.ebuild b/sci-libs/octomap/octomap-1.10.0.ebuild
new file mode 100644
index 000000000000..6fb6dba3d556
--- /dev/null
+++ b/sci-libs/octomap/octomap-1.10.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Efficient Probabilistic 3D Mapping Framework Based on Octrees"
+HOMEPAGE="https://octomap.github.io/"
+SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD qt6? ( GPL-2 )"
+SLOT="0/1.10"
+KEYWORDS="~amd64 ~arm"
+IUSE="doc dynamicEDT3D qt6"
+
+RDEPEND="
+ qt6? (
+ dev-qt/qtbase:6[gui,widgets,xml]
+ >=x11-libs/libQGLViewer-2.9.1
+ virtual/glu
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/doxygen[dot] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.10.0-cmake_bump.patch
+ "${FILESDIR}"/${PN}-1.10.0-destdir_edt3d.patch
+ "${FILESDIR}"/${PN}-1.10.0-filter_flags.patch
+ "${FILESDIR}"/${PN}-1.10.0-pkgconf_libqglviewer.patch
+ "${FILESDIR}"/${PN}-1.10.0-qt5_qt6.patch
+)
+
+src_prepare() {
+ if use doc; then
+ doxygen -u octomap/octomap.dox.in 2>/dev/null || die
+ doxygen -u dynamicEDT3D/dynamicEDT3D.dox 2>/dev/null || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ -DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D)
+ -DBUILD_OCTOVIS_SUBPROJECT=$(usex qt6)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cmake_build docs
+ use dynamicEDT3D && cmake_build docs_dynamicEDT3D
+ # remove doxygen working files
+ find "${S}" \( \
+ -iname '*.map' -o \
+ -iname '*.md5' \
+ \) -delete || die
+ fi
+}
+
+src_test() {
+ local -x LD_LIBRARY_PATH="${S}/lib"
+ cmake_src_test
+}
+
+src_install() {
+ if use doc; then
+ # use docinto to preserve one subdirectory by project in html dir
+ docinto html/octomap
+ dodoc -r octomap/doc/html/.
+ if use dynamicEDT3D; then
+ docinto html/dynamicEDT3D
+ dodoc -r dynamicEDT3D/doc/html/.
+ fi
+ fi
+
+ cmake_src_install
+
+ # dir with empty files
+ rm -r "${ED}"/usr/share/ament_index || die
+
+ find "${ED}" -name '*.a' -delete || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-28 17:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-28 17:25 [gentoo-commits] repo/gentoo:master commit in: sci-libs/octomap/, sci-libs/octomap/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-01-13 12:16 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2016-10-07 16:16 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox